From 13086b8da3a8894f7e62f9dc8f3525ff4c49dc23 Mon Sep 17 00:00:00 2001
From: Chris Rhodes <iopred@gmail.com>
Date: Wed, 20 Jan 2016 23:14:42 -0800
Subject: [PATCH] Fix tests. :ok_hand:

---
 discord_test.go | 42 +++++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/discord_test.go b/discord_test.go
index a9ddc50..77620d7 100644
--- a/discord_test.go
+++ b/discord_test.go
@@ -76,10 +76,13 @@ func TestNew(t *testing.T) {
 
 // TestInvalidToken tests the New() function with an invalid token
 func TestInvalidToken(t *testing.T) {
+	d, err := New("asjkldhflkjasdh")
+	if err != nil {
+		t.Fatalf("New(InvalidToken) returned error: %+v", err)
+	}
 
-	_, err := New("asjkldhflkjasdh")
-	if err == nil {
-		t.Errorf("New(InvalidToken) returned nil error.")
+	if err = d.OpenAndListen(); err == nil {
+		t.Fatalf("New(InvalidToken), d.OpenAndListen did not fail.")
 	}
 
 }
@@ -130,6 +133,10 @@ func TestNewUserPass(t *testing.T) {
 		t.Fatal("New(user,pass), d.Token is empty, should be a valid Token.")
 	}
 
+	if err = d.OpenAndListen(); err != nil {
+		t.Fatalf("New(user,pass), d.OpenAndListen failed: %+v", err)
+	}
+
 	if !waitBoolEqual(10*time.Second, &d.DataReady, true) {
 		t.Fatal("New(user,pass), d.DataReady is false after 10 seconds.  Should be true.")
 	}
@@ -141,12 +148,6 @@ func TestNewUserPass(t *testing.T) {
 	}
 }
 
-func TestClose(t *testing.T) {
-	if dg != nil {
-		dg.Close()
-	}
-}
-
 // TestNewToken tests the New() function with a Token.  This should return
 // the same as the TestNewUserPass function.
 func TestNewToken(t *testing.T) {
@@ -168,6 +169,10 @@ func TestNewToken(t *testing.T) {
 		t.Fatal("New(envToken), d.Token is empty, should be a valid Token.")
 	}
 
+	if err = d.OpenAndListen(); err != nil {
+		t.Fatalf("New(envToken), d.OpenAndListen failed: %+v", err)
+	}
+
 	if !waitBoolEqual(10*time.Second, &d.DataReady, true) {
 		t.Fatal("New(envToken), d.DataReady is false after 10 seconds.  Should be true.")
 	}
@@ -176,3 +181,22 @@ func TestNewToken(t *testing.T) {
 	dg = d
 
 }
+
+func TestClose(t *testing.T) {
+	if envToken == "" {
+		t.Skip("Skipping TestClose, DG_TOKEN not set")
+	}
+
+	d, err := New(envToken)
+	if err != nil {
+		t.Fatalf("TestClose, New(envToken) returned error: %+v", err)
+	}
+
+	if err = d.OpenAndListen(); err != nil {
+		t.Fatalf("TestClose, d.OpenAndListen failed: %+v", err)
+	}
+
+	if err = d.Close(); err != nil {
+		t.Fatalf("TestClose, d.Close failed: %+v", err)
+	}
+}