X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/087d725b5ab41ad34ffd24938482d45a8b99a080..5a93b6124068c2a8748fc0bfbb2a2d151815bcf0:/whatsapp_fake_helper_test.go diff --git a/whatsapp_fake_helper_test.go b/whatsapp_fake_helper_test.go index 8e1da13..d8bb9bb 100644 --- a/whatsapp_fake_helper_test.go +++ b/whatsapp_fake_helper_test.go @@ -3,8 +3,7 @@ package main import ( "context" "fmt" - "io" - "log" + "log/slog" "os" "path/filepath" "slices" @@ -93,6 +92,7 @@ type WhatsAppFake struct { // ConnectContext keeps ctx and tells the test that the daemon connected. func (f *WhatsAppFake) ConnectContext(ctx context.Context) error { f.mutex.Lock() + f.connections = append(f.connections, ctx) f.connectTimes = append(f.connectTimes, time.Now()) f.mutex.Unlock() @@ -105,6 +105,7 @@ func (f *WhatsAppFake) ConnectContext(ctx context.Context) error { if len(f.connectErrors) > 0 { err := f.connectErrors[0] f.connectErrors = f.connectErrors[1:] + return err } @@ -222,6 +223,7 @@ func (f *WhatsAppFake) Logouts() int { // Emit gives event to the handler of the daemon and returns its answer. func (f *WhatsAppFake) Emit(event any) bool { f.mutex.Lock() + handle := f.handle f.mutex.Unlock() @@ -258,7 +260,7 @@ func whatsappStartTest(t *testing.T, dir string, clock *TestClock) (*WhatsApp, * } logs := &SyncBuffer{} - whatsapp, err := openWhatsApp(t.Context(), dir, clock.Now, log.New(logs, "", 0), fake.newClient) + whatsapp, err := openWhatsApp(t.Context(), dir, clock.Now, daemonTestLogger(logs), fake.newClient) require.NoError(t, err) t.Cleanup(func() { @@ -303,8 +305,8 @@ func whatsappTestSession(t *testing.T, dir string, linked bool) { } // whatsappDiscardLog is a logger for a WhatsApp whose log a test does not read. -func whatsappDiscardLog() *log.Logger { - return log.New(io.Discard, "", 0) +func whatsappDiscardLog() *slog.Logger { + return slog.New(slog.DiscardHandler) } // whatsappTestMessage returns the event of the text message id of sender in @@ -337,6 +339,7 @@ func whatsappTestLogTexts(t *testing.T, memory *Memory) []string { }, 10*time.Second, time.Millisecond) var texts []string + for id := range memory.Len() { message, err := memory.Message(id) require.NoError(t, err) @@ -354,6 +357,7 @@ func whatsappStartTestLinked(t *testing.T) (*WhatsApp, *WhatsAppFake) { dir := t.TempDir() whatsappTestSession(t, dir, true) + whatsapp, fake, _ := whatsappStartTest(t, dir, newTestClock()) whatsapp.state.quiet = 50 * time.Millisecond @@ -378,6 +382,7 @@ func whatsappTestContacts(t *testing.T, whatsapp *WhatsApp) { contacts := whatsapp.device.Contacts require.NoError(t, contacts.PutContactName(t.Context(), whatsappTestAna, "Ana", "Ana Souza")) require.NoError(t, contacts.PutContactName(t.Context(), types.NewJID("15550004444", types.DefaultUserServer), "João", "João Silva")) + _, _, err := contacts.PutBusinessName(t.Context(), types.NewJID("15550005555", types.DefaultUserServer), "Corner Bakery") require.NoError(t, err) require.NoError(t, contacts.PutContactName(t.Context(), whatsappTestOwn, "Me", "Me Souza"))