Separate multiline Go statements

[onechat] / whatsapp_test.go

diff --git a/whatsapp_test.go b/whatsapp_test.go
index f098c908012013298260094afa083c716ea4217b..05ea123dea3c577b9d6c7575cd1c1bbad6d64b61 100644 (file)
--- a/whatsapp_test.go
+++ b/whatsapp_test.go
@@ -2,6 +2,7 @@ package main
 
 import (
        "errors"
 
 import (
        "errors"

+       "log/slog"

        "os"
        "path/filepath"
        "strings"
        "os"
        "path/filepath"
        "strings"


@@ -123,6 +124,7 @@ func TestWhatsAppLinkedPairRequestKeepsFirstConnectionRetries(t *testing.T) {
                test.whatsapp.Command("pair 15550001111", func(text string) {
                        answers <- text
                })
                test.whatsapp.Command("pair 15550001111", func(text string) {
                        answers <- text
                })

+

                require.Equal(t, "WhatsApp is linked already. Run /whatsapp unlink first.", <-answers)
                synctest.Wait()
                test.fake.mutex.Lock()
                require.Equal(t, "WhatsApp is linked already. Run /whatsapp unlink first.", <-answers)
                synctest.Wait()
                test.fake.mutex.Lock()


@@ -193,6 +195,7 @@ func TestWhatsAppPairsAfterFirstConnectionRetriesStop(t *testing.T) {
                synctest.Wait()
                test.whatsapp.Command("unlink", func(_ string) {
                })
                synctest.Wait()
                test.whatsapp.Command("unlink", func(_ string) {
                })

+

                synctest.Wait()
                require.False(t, test.whatsapp.isLinked())
 
                synctest.Wait()
                require.False(t, test.whatsapp.isLinked())
 


@@ -249,12 +252,12 @@ func TestWhatsAppLongFirstConnectionOutageGivesOneNotice(t *testing.T) {
 
                since := time.Now().Format(whatsappTimeLayout)
 
 
                since := time.Now().Format(whatsappTimeLayout)
 

-               time.Sleep(whatsappNoticeDelay)
+               time.Sleep(whatsappOutageNoticeDelay)

                synctest.Wait()
                require.Equal(t, 1, test.events.Count("notice"))
                require.Equal(t, "WhatsApp is disconnected since "+since+". OneChat tries again.", test.events.Last("notice"))
 
                synctest.Wait()
                require.Equal(t, 1, test.events.Count("notice"))
                require.Equal(t, "WhatsApp is disconnected since "+since+". OneChat tries again.", test.events.Last("notice"))
 

-               time.Sleep(whatsappNoticeDelay)
+               time.Sleep(whatsappOutageNoticeDelay)

                synctest.Wait()
                require.Equal(t, 1, test.events.Count("notice"))
                test.fake.mutex.Lock()
                synctest.Wait()
                require.Equal(t, 1, test.events.Count("notice"))
                test.fake.mutex.Lock()


@@ -315,6 +318,7 @@ func TestWhatsAppLogsEachChangeOfTheConnectionOnce(t *testing.T) {
                "<4>disconnected, retrying",
                "<6>connected again after=1m25s",
        }, strings.Split(strings.TrimSuffix(logs.String(), "\n"), "\n"))
                "<4>disconnected, retrying",
                "<6>connected again after=1m25s",
        }, strings.Split(strings.TrimSuffix(logs.String(), "\n"), "\n"))

+

        require.NotContains(t, logs.String(), whatsappTestNumber)
        require.NotContains(t, logs.String(), whatsappTestLID)
 }
        require.NotContains(t, logs.String(), whatsappTestNumber)
        require.NotContains(t, logs.String(), whatsappTestLID)
 }


@@ -613,18 +617,18 @@ func TestWhatsAppLongDisconnectionGivesOneNotice(t *testing.T) {
                require.True(t, test.fake.Emit(&events.Connected{}))
                require.True(t, test.fake.Emit(&events.Disconnected{}))
                require.True(t, test.fake.Emit(&events.Connected{}))
                require.True(t, test.fake.Emit(&events.Connected{}))
                require.True(t, test.fake.Emit(&events.Disconnected{}))
                require.True(t, test.fake.Emit(&events.Connected{}))

-               time.Sleep(whatsappNoticeDelay + time.Second)
+               time.Sleep(whatsappOutageNoticeDelay + time.Second)

                synctest.Wait()
                require.Zero(t, test.events.Count("notice"))
 
                require.True(t, test.fake.Emit(&events.Disconnected{}))
                require.True(t, test.fake.Emit(&events.Disconnected{}))
                synctest.Wait()
                require.Zero(t, test.events.Count("notice"))
 
                require.True(t, test.fake.Emit(&events.Disconnected{}))
                require.True(t, test.fake.Emit(&events.Disconnected{}))

-               time.Sleep(whatsappNoticeDelay)
+               time.Sleep(whatsappOutageNoticeDelay)

                synctest.Wait()
                require.Equal(t, 1, test.events.Count("notice"))
                require.Contains(t, test.events.Last("notice"), "OneChat tries again.")
                require.True(t, test.fake.Emit(&events.Disconnected{}))
                synctest.Wait()
                require.Equal(t, 1, test.events.Count("notice"))
                require.Contains(t, test.events.Last("notice"), "OneChat tries again.")
                require.True(t, test.fake.Emit(&events.Disconnected{}))

-               time.Sleep(whatsappNoticeDelay)
+               time.Sleep(whatsappOutageNoticeDelay)

                synctest.Wait()
                require.Equal(t, 1, test.events.Count("notice"))
 
                synctest.Wait()
                require.Equal(t, 1, test.events.Count("notice"))
 


@@ -662,6 +666,7 @@ func TestWhatsAppLogsNoOwnNumber(t *testing.T) {
        require.Eventually(t, func() bool {
                return logs.String() != ""
        }, 10*time.Second, time.Millisecond)
        require.Eventually(t, func() bool {
                return logs.String() != ""
        }, 10*time.Second, time.Millisecond)

+

        require.Equal(t, "<4>first connect failed, retrying: no route for OWN@s.whatsapp.net and OWN@lid\n", logs.String())
 }
 
        require.Equal(t, "<4>first connect failed, retrying: no route for OWN@s.whatsapp.net and OWN@lid\n", logs.String())
 }
 


@@ -753,3 +758,8 @@ func TestSubagentHasNoWhatsAppTools(t *testing.T) {
        require.Equal(t, `error: unknown tool "whatsapp_find"`, box.run(t.Context(), "whatsapp_find", `{"name":"ana"}`))
        require.Equal(t, `error: unknown tool "whatsapp_send"`, box.run(t.Context(), "whatsapp_send", `{"id":"a","chat":"15550002222@s.whatsapp.net","text":"hi"}`))
 }
        require.Equal(t, `error: unknown tool "whatsapp_find"`, box.run(t.Context(), "whatsapp_find", `{"name":"ana"}`))
        require.Equal(t, `error: unknown tool "whatsapp_send"`, box.run(t.Context(), "whatsapp_send", `{"id":"a","chat":"15550002222@s.whatsapp.net","text":"hi"}`))
 }

+
+// whatsappDiscardLog is a logger for a WhatsApp whose log a test does not read.
+func whatsappDiscardLog() *slog.Logger {
+       return slog.New(slog.DiscardHandler)
+}