Fix tests. 👌

This commit is contained in:
Chris Rhodes 2016-01-20 23:14:42 -08:00
parent 2a9538e9f1
commit 13086b8da3

View file

@ -76,10 +76,13 @@ func TestNew(t *testing.T) {
// TestInvalidToken tests the New() function with an invalid token // TestInvalidToken tests the New() function with an invalid token
func TestInvalidToken(t *testing.T) { 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 = d.OpenAndListen(); err == nil {
if err == nil { t.Fatalf("New(InvalidToken), d.OpenAndListen did not fail.")
t.Errorf("New(InvalidToken) returned nil error.")
} }
} }
@ -130,6 +133,10 @@ func TestNewUserPass(t *testing.T) {
t.Fatal("New(user,pass), d.Token is empty, should be a valid Token.") 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) { if !waitBoolEqual(10*time.Second, &d.DataReady, true) {
t.Fatal("New(user,pass), d.DataReady is false after 10 seconds. Should be 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 // TestNewToken tests the New() function with a Token. This should return
// the same as the TestNewUserPass function. // the same as the TestNewUserPass function.
func TestNewToken(t *testing.T) { 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.") 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) { if !waitBoolEqual(10*time.Second, &d.DataReady, true) {
t.Fatal("New(envToken), d.DataReady is false after 10 seconds. Should be 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 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)
}
}