Move tests around a bit more

store/auth_test.go

@@ -1,7 +1,6 @@
 package store
 
 import (
-	"strings"
 	"testing"
 
 	"orblivion/lbry-id/auth"
@@ -75,42 +74,8 @@ func TestStoreGetUserId(t *testing.T) {
 	}
 }
 
-// Make sure we're saving in UTC. Make sure we have no weird timezone issues.
-func TestStoreTokenUTC(t *testing.T) {
-	s, sqliteTmpFile := StoreTestInit(t)
-	defer StoreTestCleanup(sqliteTmpFile)
-
-	authToken := auth.AuthToken{
-		Token:    "seekrit-1",
-		DeviceId: "dId",
-		Scope:    "*",
-		UserId:   123,
-	}
-
-	if err := s.SaveToken(&authToken); err != nil {
-		t.Fatalf("Unexpected error in SaveToken: %+v", err)
-	}
-
-	rows, err := s.db.Query("SELECT expiration FROM auth_tokens LIMIT 1")
-	defer rows.Close()
-
-	if err != nil {
-		t.Fatalf("Unexpected error getting expiration from db: %+v", err)
-	}
-
-	var expirationString string
-	for rows.Next() {
-
-		err := rows.Scan(
-			&expirationString,
-		)
-
-		if err != nil {
-			t.Fatalf("Unexpected error parsing expiration from db: %+v", err)
-		}
-	}
-
-	if !strings.HasSuffix(expirationString, "Z") {
-		t.Fatalf("Expected expiration timezone to be UTC (+00:00). Got %s", expirationString)
-	}
+// TODO - Tests each db method. Check for missing "NOT NULL" fields. Do the loop thing, and always just check for null error.
+func TestStoreAccountEmptyFields(t *testing.T) {
+	// Make sure expiration doesn't get set if sanitization fails
+	t.Fatalf("Test me")
 }

store/store_test.go

@@ -30,10 +30,3 @@ func StoreTestCleanup(tmpFile *os.File) {
 		os.Remove(tmpFile.Name())
 	}
 }
-
-// TODO - New tests for each db method, checking for missing "NOT NULL" fields. Can do the loop thing, and always just check for null error or whatever
-// TODO maybe split to different files now. Or maybe a helper here?
-func TestStoreSanitizeEmptyFields(t *testing.T) {
-	// Make sure expiration doesn't get set if sanitization fails
-	t.Fatalf("Test me")
-}

store/token_test.go

@@ -1,6 +1,7 @@
 package store
 
 import (
+	"strings"
 	"testing"
 	"reflect"
 	"time"
@@ -251,3 +252,49 @@ func TestStoreGetToken(t *testing.T) {
 		t.Fatalf("Expected ErrNoToken, for expired token. token: %+v err: %+v", gotToken, err)
 	}
 }
+
+// Make sure we're saving in UTC. Make sure we have no weird timezone issues.
+func TestStoreTokenUTC(t *testing.T) {
+	s, sqliteTmpFile := StoreTestInit(t)
+	defer StoreTestCleanup(sqliteTmpFile)
+
+	authToken := auth.AuthToken{
+		Token:    "seekrit-1",
+		DeviceId: "dId",
+		Scope:    "*",
+		UserId:   123,
+	}
+
+	if err := s.SaveToken(&authToken); err != nil {
+		t.Fatalf("Unexpected error in SaveToken: %+v", err)
+	}
+
+	rows, err := s.db.Query("SELECT expiration FROM auth_tokens LIMIT 1")
+	defer rows.Close()
+
+	if err != nil {
+		t.Fatalf("Unexpected error getting expiration from db: %+v", err)
+	}
+
+	var expirationString string
+	for rows.Next() {
+
+		err := rows.Scan(
+			&expirationString,
+		)
+
+		if err != nil {
+			t.Fatalf("Unexpected error parsing expiration from db: %+v", err)
+		}
+	}
+
+	if !strings.HasSuffix(expirationString, "Z") {
+		t.Fatalf("Expected expiration timezone to be UTC (+00:00). Got %s", expirationString)
+	}
+}
+
+// TODO - Tests each db method. Check for missing "NOT NULL" fields. Do the loop thing, and always just check for null error.
+func TestStoreTokenEmptyFields(t *testing.T) {
+	// Make sure expiration doesn't get set if sanitization fails
+	t.Fatalf("Test me")
+}

store/wallet_test.go

@@ -196,4 +196,8 @@ func TestStoreGetWallet(t *testing.T) {
 	}
 }
 
-
+// TODO - Tests each db method. Check for missing "NOT NULL" fields. Do the loop thing, and always just check for null error.
+func TestStoreWalletEmptyFields(t *testing.T) {
+	// Make sure expiration doesn't get set if sanitization fails
+	t.Fatalf("Test me")
+}