Name private helpers for their owning feature

[onechat] / telegram_fake_helper_test.go

diff --git a/telegram_fake_helper_test.go b/telegram_fake_helper_test.go
index b71eee038ebf084da3481bd63c3643cda8600c0d..6ca755e6545383cefe0b4a3d4066aea784587283 100644 (file)
--- a/telegram_fake_helper_test.go
+++ b/telegram_fake_helper_test.go
@@ -50,67 +50,41 @@ type TelegramFake struct {
        images  map[string][]byte
 }
 
        images  map[string][]byte
 }
 

-// Add makes update available to getUpdates.
-func (f *TelegramFake) Add(update TelegramUpdate) {
-       f.mutex.Lock()
-
-       f.updates = append(f.updates, update)
-       f.mutex.Unlock()
+// newTelegramFake starts a fake Bot API server that stops at the end of the
+// test.
+func newTelegramFake(t *testing.T) *TelegramFake {
+       t.Helper()

 
 

-       select {
-       case f.added <- struct{}{}:
-       default:
+       f := &TelegramFake{
+               added:   make(chan struct{}, 1),
+               stopped: make(chan struct{}),

        }
        }

-}

 
 

-// Calls returns the calls so far.
-func (f *TelegramFake) Calls() []TelegramFakeCall {
-       f.mutex.Lock()
-       defer f.mutex.Unlock()
-
-       return append([]TelegramFakeCall(nil), f.calls...)
-}
-
-// Sent returns the texts of the sendMessage calls and the Markdown of the
-// sendRichMessage calls that succeeded, in order.
-func (f *TelegramFake) Sent() []string {
-       var texts []string
-
-       for _, call := range f.Calls() {
-               switch {
-               case !call.ok:
-               case call.method == "sendMessage":
-                       texts = append(texts, call.params["text"].(string))
-               case call.method == "sendRichMessage":
-                       texts = append(texts, call.params["rich_message"].(map[string]any)["markdown"].(string))
-               }
-       }
+       f.Server = httptest.NewServer(http.HandlerFunc(f.serve))
+       t.Cleanup(f.Close)
+       t.Cleanup(func() {
+               close(f.stopped)
+       })

 
 

-       return texts
+       return f

 }
 
 }
 

-func (f *TelegramFake) Image(id string, data []byte) {
-       f.mutex.Lock()
-       defer f.mutex.Unlock()
+// newTelegramLocalFake returns the same fake API without network goroutines.
+// Its RoundTrip handles requests directly for tests with fake time.
+func newTelegramLocalFake(t *testing.T) *TelegramFake {
+       t.Helper()

 
 

-       if f.images == nil {
-               f.images = make(map[string][]byte)
+       f := &TelegramFake{
+               Server:  &httptest.Server{URL: "https://example.com"},
+               added:   make(chan struct{}, 1),
+               stopped: make(chan struct{}),

        }
 
        }
 

-       f.images[id] = data
-}
-
-// RoundTrip handles a request in memory, so synctest can control its timers.
-func (f *TelegramFake) RoundTrip(request *http.Request) (*http.Response, error) {
-       response := httptest.NewRecorder()
-       f.serve(response, request)
-
-       ctx := request.Context()
-       if ctx.Err() != nil {
-               return nil, ctx.Err()
-       }
+       t.Cleanup(func() {
+               close(f.stopped)
+       })

 
 

-       return response.Result(), nil
+       return f

 }
 
 func (f *TelegramFake) serve(w http.ResponseWriter, r *http.Request) {
 }
 
 func (f *TelegramFake) serve(w http.ResponseWriter, r *http.Request) {


@@ -283,40 +257,67 @@ func (f *TelegramFake) from(offset int64) []TelegramUpdate {
        return updates
 }
 
        return updates
 }
 

-// newTelegramFake starts a fake Bot API server that stops at the end of the
-// test.
-func newTelegramFake(t *testing.T) *TelegramFake {
-       t.Helper()
+// Add makes update available to getUpdates.
+func (f *TelegramFake) Add(update TelegramUpdate) {
+       f.mutex.Lock()

 
 

-       f := &TelegramFake{
-               added:   make(chan struct{}, 1),
-               stopped: make(chan struct{}),
+       f.updates = append(f.updates, update)
+       f.mutex.Unlock()
+
+       select {
+       case f.added <- struct{}{}:
+       default:

        }
        }

+}

 
 

-       f.Server = httptest.NewServer(http.HandlerFunc(f.serve))
-       t.Cleanup(f.Close)
-       t.Cleanup(func() {
-               close(f.stopped)
-       })
+// Sent returns the texts of the sendMessage calls and the Markdown of the
+// sendRichMessage calls that succeeded, in order.
+func (f *TelegramFake) Sent() []string {
+       var texts []string

 
 

-       return f
+       for _, call := range f.Calls() {
+               switch {
+               case !call.ok:
+               case call.method == "sendMessage":
+                       texts = append(texts, call.params["text"].(string))
+               case call.method == "sendRichMessage":
+                       texts = append(texts, call.params["rich_message"].(map[string]any)["markdown"].(string))
+               }
+       }
+
+       return texts

 }
 
 }
 

-// newTelegramLocalFake returns the same fake API without network goroutines.
-// Its RoundTrip handles requests directly for tests with fake time.
-func newTelegramLocalFake(t *testing.T) *TelegramFake {
-       t.Helper()
+// Calls returns the calls so far.
+func (f *TelegramFake) Calls() []TelegramFakeCall {
+       f.mutex.Lock()
+       defer f.mutex.Unlock()

 
 

-       f := &TelegramFake{
-               Server:  &httptest.Server{URL: "https://example.com"},
-               added:   make(chan struct{}, 1),
-               stopped: make(chan struct{}),
+       return append([]TelegramFakeCall(nil), f.calls...)
+}
+
+func (f *TelegramFake) Image(id string, data []byte) {
+       f.mutex.Lock()
+       defer f.mutex.Unlock()
+
+       if f.images == nil {
+               f.images = make(map[string][]byte)

        }
        }

-       t.Cleanup(func() {
-               close(f.stopped)
-       })

 
 

-       return f
+       f.images[id] = data
+}
+
+// RoundTrip handles a request in memory, so synctest can control its timers.
+func (f *TelegramFake) RoundTrip(request *http.Request) (*http.Response, error) {
+       response := httptest.NewRecorder()
+       f.serve(response, request)
+
+       ctx := request.Context()
+       if ctx.Err() != nil {
+               return nil, ctx.Err()
+       }
+
+       return response.Result(), nil

 }
 
 // telegramOwnerMessage returns a text message of the owner in the private chat.
 }
 
 // telegramOwnerMessage returns a text message of the owner in the private chat.