From ad1d0fac606c3eb3555fa083aef959257bab728f Mon Sep 17 00:00:00 2001 From: Bruce Marriner Date: Fri, 22 Jan 2016 17:17:06 -0600 Subject: [PATCH] Tiny bit more test. --- discord_test.go | 17 +++++++++++++++++ restapi_test.go | 46 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 57 insertions(+), 6 deletions(-) diff --git a/discord_test.go b/discord_test.go index deed4f4..be16899 100644 --- a/discord_test.go +++ b/discord_test.go @@ -203,6 +203,23 @@ func TestOpenClose(t *testing.T) { t.Fatalf("TestClose, d.Open failed: %+v", err) } + if !waitBoolEqual(10*time.Second, &d.DataReady, true) { + t.Fatal("DataReady never became true.") + } + + // TODO find a better way + // Add a small sleep here to make sure heartbeat and other events + // have enough time to get fired. Need a way to actually check + // those events. + time.Sleep(2 * time.Second) + + // UpdateStatus - maybe we move this into wsapi_test.go but the websocket + // created here is needed. This helps tests that the websocket was setup + // and it is working. + if err = d.UpdateStatus(0, time.Now().String()); err != nil { + t.Errorf("UpdateStatus error: %+v", err) + } + if err = d.Close(); err != nil { t.Fatalf("TestClose, d.Close failed: %+v", err) } diff --git a/restapi_test.go b/restapi_test.go index d0f3e80..4c2ea50 100644 --- a/restapi_test.go +++ b/restapi_test.go @@ -7,16 +7,20 @@ import ( ////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////// START OF TESTS -// TestLogout tests the Logout() function. This should not return an error. -func TestLogout(t *testing.T) { +// TestChannelMessageSend tests the ChannelMessageSend() function. This should not return an error. +func TestChannelMessageSend(t *testing.T) { - if dg == nil { - t.Skip("Cannot TestLogout, dg not set.") + if envChannel == "" { + t.Skip("Skipping, DG_CHANNEL not set.") } - err := dg.Logout() + if dg == nil { + t.Skip("Skipping, dg not set.") + } + + _, err := dg.ChannelMessageSend(envChannel, "Running REST API Tests!") if err != nil { - t.Errorf("Logout() returned error: %+v", err) + t.Errorf("ChannelMessageSend returned error: %+v", err) } } @@ -115,3 +119,33 @@ func TestUserSettings(t *testing.T) { t.Errorf(err.Error()) } } + +// TestLogout tests the Logout() function. This should not return an error. +func TestLogout(t *testing.T) { + + if dg == nil { + t.Skip("Cannot TestLogout, dg not set.") + } + + err := dg.Logout() + if err != nil { + t.Errorf("Logout() returned error: %+v", err) + } +} + +// TestChannelMessageSend2 tests the ChannelMessageSend() function. This should not return an error. +func TestChannelMessageSend2(t *testing.T) { + + if envChannel == "" { + t.Skip("Skipping, DG_CHANNEL not set.") + } + + if dg == nil { + t.Skip("Skipping, dg not set.") + } + + _, err := dg.ChannelMessageSend(envChannel, "All done running REST API Tests!") + if err != nil { + t.Errorf("ChannelMessageSend returned error: %+v", err) + } +}