about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorBen Morrison <ben@gbmor.dev>2019-06-04 23:36:55 -0400
committerBen Morrison <ben@gbmor.dev>2019-06-05 00:12:52 -0400
commit35e31f00e82762aec1d849d691f28b534214201d (patch)
tree7b56d9eee8c6c54d906cf9315b234fbaf0e93aa4
parentfdbc01d69563f1f851eccc101be5cc06039e2f80 (diff)
downloadgetwtxt-35e31f00e82762aec1d849d691f28b534214201d.tar.gz
moved db test funcs to db_test.go
-rw-r--r--cache_test.go86
-rw-r--r--db_test.go91
2 files changed, 91 insertions, 86 deletions
diff --git a/cache_test.go b/cache_test.go
index 2fef6be..00f0ddf 100644
--- a/cache_test.go
+++ b/cache_test.go
@@ -1,10 +1,7 @@
 package main
 
 import (
-	"net"
 	"testing"
-
-	"github.com/getwtxt/registry"
 )
 
 func Test_refreshCache(t *testing.T) {
@@ -33,86 +30,3 @@ func Benchmark_refreshCache(b *testing.B) {
 		refreshCache()
 	}
 }
-
-func Test_pushpullDatabase(t *testing.T) {
-	initTestConf()
-	initDatabase()
-	out, _, err := registry.GetTwtxt("https://gbmor.dev/twtxt.txt")
-	if err != nil {
-		t.Errorf("Couldn't set up test: %v\n", err)
-	}
-	statusmap, err := registry.ParseUserTwtxt(out, "gbmor", "https://gbmor.dev/twtxt.txt")
-	if err != nil {
-		t.Errorf("Couldn't set up test: %v\n", err)
-	}
-	twtxtCache.AddUser("gbmor", "https://gbmor.dev/twtxt.txt", "", net.ParseIP("127.0.0.1"), statusmap)
-	remoteRegistries.Mu.Lock()
-	remoteRegistries.List = append(remoteRegistries.List, "https://twtxt.tilde.institute/api/plain/users")
-	remoteRegistries.Mu.Unlock()
-
-	t.Run("Push to Database", func(t *testing.T) {
-		err := pushDatabase()
-		if err != nil {
-			t.Errorf("%v\n", err)
-		}
-	})
-
-	t.Run("Clearing Registry", func(t *testing.T) {
-		err := twtxtCache.DelUser("https://gbmor.dev/twtxt.txt")
-		if err != nil {
-			t.Errorf("%v", err)
-		}
-	})
-
-	t.Run("Pulling from Database", func(t *testing.T) {
-		pullDatabase()
-		twtxtCache.Mu.RLock()
-		if _, ok := twtxtCache.Users["https://gbmor.dev/twtxt.txt"]; !ok {
-			t.Errorf("Missing user previously pushed to database\n")
-		}
-		twtxtCache.Mu.RUnlock()
-
-	})
-}
-
-func Benchmark_pushDatabase(b *testing.B) {
-	initTestConf()
-
-	if len(dbChan) < 1 {
-		initDatabase()
-	}
-
-	if _, ok := twtxtCache.Users["https://gbmor.dev/twtxt.txt"]; !ok {
-		out, _, err := registry.GetTwtxt("https://gbmor.dev/twtxt.txt")
-		if err != nil {
-			b.Errorf("Couldn't set up benchmark: %v\n", err)
-		}
-
-		statusmap, err := registry.ParseUserTwtxt(out, "gbmor", "https://gbmor.dev/twtxt.txt")
-		if err != nil {
-			b.Errorf("Couldn't set up benchmark: %v\n", err)
-		}
-
-		twtxtCache.AddUser("gbmor", "https://gbmor.dev/twtxt.txt", "", net.ParseIP("127.0.0.1"), statusmap)
-	}
-
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		err := pushDatabase()
-		if err != nil {
-			b.Errorf("%v\n", err)
-		}
-	}
-}
-func Benchmark_pullDatabase(b *testing.B) {
-	initTestConf()
-
-	if len(dbChan) < 1 {
-		initDatabase()
-	}
-
-	for i := 0; i < b.N; i++ {
-		pullDatabase()
-	}
-}
diff --git a/db_test.go b/db_test.go
new file mode 100644
index 0000000..d18433b
--- /dev/null
+++ b/db_test.go
@@ -0,0 +1,91 @@
+package main
+
+import (
+	"net"
+	"testing"
+
+	"github.com/getwtxt/registry"
+)
+
+func Test_pushpullDatabase(t *testing.T) {
+	initTestConf()
+	initDatabase()
+	out, _, err := registry.GetTwtxt("https://gbmor.dev/twtxt.txt")
+	if err != nil {
+		t.Errorf("Couldn't set up test: %v\n", err)
+	}
+	statusmap, err := registry.ParseUserTwtxt(out, "gbmor", "https://gbmor.dev/twtxt.txt")
+	if err != nil {
+		t.Errorf("Couldn't set up test: %v\n", err)
+	}
+	twtxtCache.AddUser("gbmor", "https://gbmor.dev/twtxt.txt", "", net.ParseIP("127.0.0.1"), statusmap)
+	remoteRegistries.Mu.Lock()
+	remoteRegistries.List = append(remoteRegistries.List, "https://twtxt.tilde.institute/api/plain/users")
+	remoteRegistries.Mu.Unlock()
+
+	t.Run("Push to Database", func(t *testing.T) {
+		err := pushDatabase()
+		if err != nil {
+			t.Errorf("%v\n", err)
+		}
+	})
+
+	t.Run("Clearing Registry", func(t *testing.T) {
+		err := twtxtCache.DelUser("https://gbmor.dev/twtxt.txt")
+		if err != nil {
+			t.Errorf("%v", err)
+		}
+	})
+
+	t.Run("Pulling from Database", func(t *testing.T) {
+		pullDatabase()
+		twtxtCache.Mu.RLock()
+		if _, ok := twtxtCache.Users["https://gbmor.dev/twtxt.txt"]; !ok {
+			t.Errorf("Missing user previously pushed to database\n")
+		}
+		twtxtCache.Mu.RUnlock()
+
+	})
+}
+
+func Benchmark_pushDatabase(b *testing.B) {
+	initTestConf()
+
+	if len(dbChan) < 1 {
+		initDatabase()
+	}
+
+	if _, ok := twtxtCache.Users["https://gbmor.dev/twtxt.txt"]; !ok {
+		out, _, err := registry.GetTwtxt("https://gbmor.dev/twtxt.txt")
+		if err != nil {
+			b.Errorf("Couldn't set up benchmark: %v\n", err)
+		}
+
+		statusmap, err := registry.ParseUserTwtxt(out, "gbmor", "https://gbmor.dev/twtxt.txt")
+		if err != nil {
+			b.Errorf("Couldn't set up benchmark: %v\n", err)
+		}
+
+		twtxtCache.AddUser("gbmor", "https://gbmor.dev/twtxt.txt", "", net.ParseIP("127.0.0.1"), statusmap)
+	}
+
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		err := pushDatabase()
+		if err != nil {
+			b.Errorf("%v\n", err)
+		}
+	}
+}
+func Benchmark_pullDatabase(b *testing.B) {
+	initTestConf()
+
+	if len(dbChan) < 1 {
+		initDatabase()
+	}
+
+	for i := 0; i < b.N; i++ {
+		pullDatabase()
+	}
+}