From 745b6f18e33b99c4bcffab660d473f05f3b6bc3d Mon Sep 17 00:00:00 2001
From: Eduard Urbach <e.urbach@gmail.com>
Date: Wed, 21 Jun 2017 20:33:57 +0200
Subject: [PATCH] Fixed log errors and improved tests

---
 jobs/avatars/main.go |   2 +-
 middleware/Log.go    |   4 +-
 tests.go             | 117 +++++++++++++++++++++++--------------------
 3 files changed, 65 insertions(+), 58 deletions(-)

diff --git a/jobs/avatars/main.go b/jobs/avatars/main.go
index 101b122e..e2bdebc3 100644
--- a/jobs/avatars/main.go
+++ b/jobs/avatars/main.go
@@ -22,7 +22,7 @@ const (
 
 var avatarSources []AvatarSource
 var avatarOutputs []AvatarOutput
-var avatarLog = log.NewLog()
+var avatarLog = log.New()
 
 // Main
 func main() {
diff --git a/middleware/Log.go b/middleware/Log.go
index 40a52e71..8be4d67c 100644
--- a/middleware/Log.go
+++ b/middleware/Log.go
@@ -13,10 +13,10 @@ import (
 
 // Log middleware logs every request into logs/request.log and errors into logs/error.log.
 func Log() aero.Middleware {
-	request := log.NewLog()
+	request := log.New()
 	request.AddOutput(log.File("logs/request.log"))
 
-	err := log.NewLog()
+	err := log.New()
 	err.AddOutput(log.File("logs/error.log"))
 	err.AddOutput(os.Stderr)
 
diff --git a/tests.go b/tests.go
index f2c142d8..a63318eb 100644
--- a/tests.go
+++ b/tests.go
@@ -1,113 +1,120 @@
 package main
 
-func init() {
+var tests = map[string][]string{
 	// User
-	app.Test("/user/:nick", []string{
+	"/user/:nick": []string{
 		"/+Akyoto",
-	})
+	},
 
-	app.Test("/user/:nick/threads", []string{
+	"/user/:nick/threads": []string{
 		"/+Akyoto/threads",
-	})
+	},
 
-	app.Test("/user/:nick/animelist", []string{
+	"/user/:nick/animelist": []string{
 		"/+Akyoto/animelist",
-	})
+	},
 
-	app.Test("/user/:nick/animelist/:id", []string{
+	"/user/:nick/animelist/:id": []string{
 		"/+Akyoto/animelist/7929",
-	})
+	},
 
 	// Pages
-	app.Test("/anime/:id", []string{
+	"/anime/:id": []string{
 		"/anime/1",
-	})
+	},
 
-	app.Test("/threads/:id", []string{
+	"/threads/:id": []string{
 		"/threads/HJgS7c2K",
-	})
+	},
 
-	app.Test("/posts/:id", []string{
+	"/posts/:id": []string{
 		"/posts/B1RzshnK",
-	})
+	},
 
-	app.Test("/forum/:tag", []string{
+	"/forum/:tag": []string{
 		"/forum/general",
-	})
+	},
 
-	app.Test("/search/:term", []string{
+	"/search/:term": []string{
 		"/search/Dragon Ball",
-	})
+	},
 
 	// API
-	app.Test("/api/anime/:id", []string{
+	"/api/anime/:id": []string{
 		"/api/anime/1",
-	})
+	},
 
-	app.Test("/api/thread/:id", []string{
+	"/api/thread/:id": []string{
 		"/api/thread/HJgS7c2K",
-	})
+	},
 
-	app.Test("/api/post/:id", []string{
+	"/api/post/:id": []string{
 		"/api/post/B1RzshnK",
-	})
+	},
 
-	app.Test("/api/animelist/:id", []string{
+	"/api/animelist/:id": []string{
 		"/api/animelist/4J6qpK1ve",
-	})
+	},
 
-	app.Test("/api/settings/:id", []string{
+	"/api/settings/:id": []string{
 		"/api/settings/4J6qpK1ve",
-	})
+	},
 
-	app.Test("/api/user/:id", []string{
+	"/api/user/:id": []string{
 		"/api/user/4J6qpK1ve",
-	})
+	},
 
-	app.Test("/api/emailtouser/:id", []string{
+	"/api/emailtouser/:id": []string{
 		"/api/emailtouser/e.urbach@gmail.com",
-	})
+	},
 
-	app.Test("/api/googletouser/:id", []string{
+	"/api/googletouser/:id": []string{
 		"/api/googletouser/106530160120373282283",
-	})
+	},
 
-	app.Test("/api/nicktouser/:id", []string{
+	"/api/nicktouser/:id": []string{
 		"/api/nicktouser/Akyoto",
-	})
+	},
 
-	app.Test("/api/searchindex/:id", []string{
+	"/api/searchindex/:id": []string{
 		"/api/searchindex/Anime",
-	})
+	},
 
 	// Images
-	app.Test("/images/avatars/large/:file", []string{
+	"/images/avatars/large/:file": []string{
 		"/images/avatars/large/4J6qpK1ve.webp",
-	})
+	},
 
-	app.Test("/images/avatars/small/:file", []string{
+	"/images/avatars/small/:file": []string{
 		"/images/avatars/small/4J6qpK1ve.webp",
-	})
+	},
 
-	app.Test("/images/brand/:file", []string{
+	"/images/brand/:file": []string{
 		"/images/brand/64.webp",
-	})
+	},
 
-	app.Test("/images/login/:file", []string{
+	"/images/login/:file": []string{
 		"/images/login/google",
-	})
+	},
 
-	app.Test("/images/cover/:file", []string{
+	"/images/cover/:file": []string{
 		"/images/cover/default",
-	})
+	},
 
-	app.Test("/images/elements/:file", []string{
+	"/images/elements/:file": []string{
 		"/images/elements/no-avatar.svg",
-	})
+	},
 
 	// Disable
-	app.Test("/auth/google", nil)
-	app.Test("/auth/google/callback", nil)
-	app.Test("/user", nil)
-	app.Test("/settings", nil)
+	"/auth/google":          nil,
+	"/auth/google/callback": nil,
+	"/user":                 nil,
+	"/settings":             nil,
+}
+
+func init() {
+	// Specify test routes
+	for route, examples := range tests {
+		app.Test(route, examples)
+	}
 }