Name and order the terminal client code

[onechat] / telegram_test.go

diff --git a/telegram_test.go b/telegram_test.go
index 2f944fabddbb1b6117ab047da4b50cbf803a0b41..a1a1ed24bc42d842a1327e778e48bfde5a90f3a3 100644 (file)
--- a/telegram_test.go
+++ b/telegram_test.go
@@ -22,7 +22,7 @@ func TestOwnerTalksToTheAgentThroughTelegram(t *testing.T) {
        telegram := newTelegramFake(t)
        bot, _ := telegramStartTestBot(t, telegram)
        socket := startTestDaemonWithBot(t, server, bot)
        telegram := newTelegramFake(t)
        bot, _ := telegramStartTestBot(t, telegram)
        socket := startTestDaemonWithBot(t, server, bot)

-       terminal := startTestClient(t, socket)
+       terminal := terminalStartTestClient(t, socket)

        terminal.WaitFor(t, "[connected to OneChat]")
 
        telegram.Add(TelegramUpdate{
        terminal.WaitFor(t, "[connected to OneChat]")
 
        telegram.Add(TelegramUpdate{


@@ -44,7 +44,7 @@ func TestBotIgnoresEveryoneButTheOwner(t *testing.T) {
        telegram := newTelegramFake(t)
        bot, logs := telegramStartTestBot(t, telegram)
        socket := startTestDaemonWithBot(t, newModelFake(t), bot)
        telegram := newTelegramFake(t)
        bot, logs := telegramStartTestBot(t, telegram)
        socket := startTestDaemonWithBot(t, newModelFake(t), bot)

-       terminal := startTestClient(t, socket)
+       terminal := terminalStartTestClient(t, socket)

        terminal.WaitFor(t, "[connected to OneChat]")
 
        group := telegramOwnerMessage("secret in a group")
        terminal.WaitFor(t, "[connected to OneChat]")
 
        group := telegramOwnerMessage("secret in a group")


@@ -150,7 +150,7 @@ func TestBotStartsAtTheStoredOffset(t *testing.T) {
        })
 
        socket := startTestDaemonWithBot(t, server, bot)
        })
 
        socket := startTestDaemonWithBot(t, server, bot)

-       terminal := startTestClient(t, socket)
+       terminal := terminalStartTestClient(t, socket)

        terminal.WaitFor(t, "[connected to OneChat]")
        telegramWaitForSent(t, telegram, "ok")
 
        terminal.WaitFor(t, "[connected to OneChat]")
        telegramWaitForSent(t, telegram, "ok")
 


@@ -237,7 +237,7 @@ func TestRepliesGoAsRichMessages(t *testing.T) {
        telegram := newTelegramFake(t)
        bot, _ := telegramStartTestBot(t, telegram)
        socket := startTestDaemonWithBot(t, server, bot)
        telegram := newTelegramFake(t)
        bot, _ := telegramStartTestBot(t, telegram)
        socket := startTestDaemonWithBot(t, server, bot)

-       terminal := startTestClient(t, socket)
+       terminal := terminalStartTestClient(t, socket)

        terminal.WaitFor(t, "[connected to OneChat]")
 
        terminal.Type("make **it** so")
        terminal.WaitFor(t, "[connected to OneChat]")
 
        terminal.Type("make **it** so")


@@ -653,10 +653,10 @@ func TestLoadBotConfig(t *testing.T) {
 // telegramStartTestBot returns a bot of telegramTestOwner on server, with its
 // offset file in a temporary directory and short waits, and the buffer of its
 // log.
 // telegramStartTestBot returns a bot of telegramTestOwner on server, with its
 // offset file in a temporary directory and short waits, and the buffer of its
 // log.

-func telegramStartTestBot(t *testing.T, server *TelegramFake) (*TelegramBot, *syncBuffer) {
+func telegramStartTestBot(t *testing.T, server *TelegramFake) (*TelegramBot, *SyncBuffer) {

        t.Helper()
 
        t.Helper()
 

-       logs := &syncBuffer{}
+       logs := &SyncBuffer{}

        bot := newTelegramBot(newTelegramAPI(server.URL, telegramTestToken), telegramTestOwner, filepath.Join(t.TempDir(), telegramOffsetFileName), log.New(logs, "", 0))
        bot.minWait = time.Millisecond
        bot.maxWait = 10 * time.Millisecond
        bot := newTelegramBot(newTelegramAPI(server.URL, telegramTestToken), telegramTestOwner, filepath.Join(t.TempDir(), telegramOffsetFileName), log.New(logs, "", 0))
        bot.minWait = time.Millisecond
        bot.maxWait = 10 * time.Millisecond