From e8e692cbf64a86465eb7eb1b1b2cfda4da507aeb Mon Sep 17 00:00:00 2001
From: Justin Li <jli.justinli@gmail.com>
Date: Fri, 13 Dec 2013 11:48:47 -0500
Subject: [PATCH] Clean up tests a little

---
 server/query_test.go  |  9 ++---
 server/server_test.go | 82 +++++++++++++++++++++----------------------
 server/stats_test.go  | 12 ++-----
 3 files changed, 46 insertions(+), 57 deletions(-)

diff --git a/server/query_test.go b/server/query_test.go
index c9a2045..cf51fab 100644
--- a/server/query_test.go
+++ b/server/query_test.go
@@ -35,10 +35,7 @@ func mapArrayEqual(boxed map[string][]string, unboxed map[string]string) bool {
 	}
 	for mapKey, mapVal := range boxed {
 		// Always expect box to hold only one element
-		if len(mapVal) != 1 {
-			return false
-		}
-		if ub_mapVal, eleExists := unboxed[mapKey]; !eleExists || mapVal[0] != ub_mapVal {
+		if len(mapVal) != 1 || mapVal[0] != unboxed[mapKey] {
 			return false
 		}
 	}
@@ -61,10 +58,10 @@ func TestInvalidQueries(t *testing.T) {
 	for parseIndex, parseStr := range InvalidQueries {
 		parsedQueryObj, err := parseQuery(parseStr)
 		if err == nil {
-			t.Error("Should have produced error ", parseIndex)
+			t.Error("Should have produced error", parseIndex)
 		}
 		if parsedQueryObj != nil {
-			t.Error("Should be nil after error ", parsedQueryObj, parseIndex)
+			t.Error("Should be nil after error", parsedQueryObj, parseIndex)
 		}
 	}
 }
diff --git a/server/server_test.go b/server/server_test.go
index bd1b845..bd30c20 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -13,51 +13,49 @@ type PeerClientPair struct {
 	clientId string
 }
 
-var (
-	TestClients = []PeerClientPair{
-		{"-AZ3034-6wfG2wk6wWLc", "AZ3034"},
-		{"-AZ3042-6ozMq5q6Q3NX", "AZ3042"},
-		{"-BS5820-oy4La2MWGEFj", "BS5820"},
-		{"-AR6360-6oZyyMWoOOBe", "AR6360"},
-		{"-AG2083-s1hiF8vGAAg0", "AG2083"},
-		{"-AG3003-lEl2Mm4NEO4n", "AG3003"},
-		{"-MR1100-00HS~T7*65rm", "MR1100"},
-		{"-LK0140-ATIV~nbEQAMr", "LK0140"},
-		{"-KT2210-347143496631", "KT2210"},
-		{"-TR0960-6ep6svaa61r4", "TR0960"},
-		{"-XX1150-dv220cotgj4d", "XX1150"},
-		{"-AZ2504-192gwethivju", "AZ2504"},
-		{"-KT4310-3L4UvarKuqIu", "KT4310"},
-		{"-AZ2060-0xJQ02d4309O", "AZ2060"},
-		{"-BD0300-2nkdf08Jd890", "BD0300"},
-		{"-A~0010-a9mn9DFkj39J", "A~0010"},
-		{"-UT2300-MNu93JKnm930", "UT2300"},
-		{"-UT2300-KT4310KT4301", "UT2300"},
+var TestClients = []PeerClientPair{
+	{"-AZ3034-6wfG2wk6wWLc", "AZ3034"},
+	{"-AZ3042-6ozMq5q6Q3NX", "AZ3042"},
+	{"-BS5820-oy4La2MWGEFj", "BS5820"},
+	{"-AR6360-6oZyyMWoOOBe", "AR6360"},
+	{"-AG2083-s1hiF8vGAAg0", "AG2083"},
+	{"-AG3003-lEl2Mm4NEO4n", "AG3003"},
+	{"-MR1100-00HS~T7*65rm", "MR1100"},
+	{"-LK0140-ATIV~nbEQAMr", "LK0140"},
+	{"-KT2210-347143496631", "KT2210"},
+	{"-TR0960-6ep6svaa61r4", "TR0960"},
+	{"-XX1150-dv220cotgj4d", "XX1150"},
+	{"-AZ2504-192gwethivju", "AZ2504"},
+	{"-KT4310-3L4UvarKuqIu", "KT4310"},
+	{"-AZ2060-0xJQ02d4309O", "AZ2060"},
+	{"-BD0300-2nkdf08Jd890", "BD0300"},
+	{"-A~0010-a9mn9DFkj39J", "A~0010"},
+	{"-UT2300-MNu93JKnm930", "UT2300"},
+	{"-UT2300-KT4310KT4301", "UT2300"},
 
-		{"T03A0----f089kjsdf6e", "T03A0-"},
-		{"S58B-----nKl34GoNb75", "S58B--"},
-		{"M4-4-0--9aa757Efd5Bl", "M4-4-0"},
+	{"T03A0----f089kjsdf6e", "T03A0-"},
+	{"S58B-----nKl34GoNb75", "S58B--"},
+	{"M4-4-0--9aa757Efd5Bl", "M4-4-0"},
 
-		{"AZ2500BTeYUzyabAfo6U", "AZ2500"}, // BitTyrant
-		{"exbc0JdSklm834kj9Udf", "exbc0J"}, // Old BitComet
-		{"FUTB0L84j542mVc84jkd", "FUTB0L"}, // Alt BitComet
-		{"XBT054d-8602Jn83NnF9", "XBT054"}, // XBT
-		{"OP1011affbecbfabeefb", "OP1011"}, // Opera
-		{"-ML2.7.2-kgjjfkd9762", "ML2.7."}, // MLDonkey
-		{"-BOWA0C-SDLFJWEIORNM", "BOWA0C"}, // Bits on Wheels
-		{"Q1-0-0--dsn34DFn9083", "Q1-0-0"}, // Queen Bee
-		{"Q1-10-0-Yoiumn39BDfO", "Q1-10-"}, // Queen Bee Alt
-		{"346------SDFknl33408", "346---"}, // TorreTopia
-		{"QVOD0054ABFFEDCCDEDB", "QVOD00"}, // Qvod
+	{"AZ2500BTeYUzyabAfo6U", "AZ2500"}, // BitTyrant
+	{"exbc0JdSklm834kj9Udf", "exbc0J"}, // Old BitComet
+	{"FUTB0L84j542mVc84jkd", "FUTB0L"}, // Alt BitComet
+	{"XBT054d-8602Jn83NnF9", "XBT054"}, // XBT
+	{"OP1011affbecbfabeefb", "OP1011"}, // Opera
+	{"-ML2.7.2-kgjjfkd9762", "ML2.7."}, // MLDonkey
+	{"-BOWA0C-SDLFJWEIORNM", "BOWA0C"}, // Bits on Wheels
+	{"Q1-0-0--dsn34DFn9083", "Q1-0-0"}, // Queen Bee
+	{"Q1-10-0-Yoiumn39BDfO", "Q1-10-"}, // Queen Bee Alt
+	{"346------SDFknl33408", "346---"}, // TorreTopia
+	{"QVOD0054ABFFEDCCDEDB", "QVOD00"}, // Qvod
 
-		{"", ""},
-		{"-", ""},
-		{"12345", ""},
-		{"-12345", ""},
-		{"123456", "123456"},
-		{"-123456", "123456"},
-	}
-)
+	{"", ""},
+	{"-", ""},
+	{"12345", ""},
+	{"-12345", ""},
+	{"123456", "123456"},
+	{"-123456", "123456"},
+}
 
 func TestParseClientID(t *testing.T) {
 	for _, pair := range TestClients {
diff --git a/server/stats_test.go b/server/stats_test.go
index 0161270..87f8a45 100644
--- a/server/stats_test.go
+++ b/server/stats_test.go
@@ -5,7 +5,6 @@
 package server
 
 import (
-	"errors"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -16,12 +15,7 @@ import (
 )
 
 func newTestServer() (*Server, error) {
-	s, err := New(&config.MockConfig)
-	if err != nil {
-		return nil, err
-	}
-
-	return s, nil
+	return New(&config.MockConfig)
 }
 
 func TestStats(t *testing.T) {
@@ -39,10 +33,10 @@ func TestStats(t *testing.T) {
 	s.serveStats(w, r)
 
 	if w.Code != 200 {
-		t.Error(errors.New("/stats did not return HTTP 200"))
+		t.Error("/stats did not return 200 OK")
 	}
 
 	if w.Header()["Content-Type"][0] != "application/json" {
-		t.Error(errors.New("/stats did not return the proper Content-Type header"))
+		t.Error("/stats did not return JSON")
 	}
 }