From 14cc8d5c24e63af962a65a2f9b7c91c6375f120d Mon Sep 17 00:00:00 2001
From: Dan Sosedoff <dan.sosedoff@gmail.com>
Date: Mon, 16 Mar 2015 23:41:53 -0500
Subject: [PATCH] Move all test data under ./data dir

---
 bookmarks_test.go                    | 10 +++++-----
 client_test.go                       |  2 +-
 {fixtures => data}/bookmark.toml     |  0
 {fixtures => data}/bookmark_url.toml |  0
 {sql => data}/booktown.sql           |  0
 {fixtures => data}/invalid.toml      |  0
 {fixtures => data}/invalid_port.toml |  0
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename {fixtures => data}/bookmark.toml (100%)
 rename {fixtures => data}/bookmark_url.toml (100%)
 rename {sql => data}/booktown.sql (100%)
 rename {fixtures => data}/invalid.toml (100%)
 rename {fixtures => data}/invalid_port.toml (100%)

diff --git a/bookmarks_test.go b/bookmarks_test.go
index 415ca60..cb2062d 100644
--- a/bookmarks_test.go
+++ b/bookmarks_test.go
@@ -10,17 +10,17 @@ func Test_Invalid_Bookmark_Files(t *testing.T) {
 	_, err := readServerConfig("foobar")
 	assert.Error(t, err)
 
-	_, err = readServerConfig("./fixtures/invalid.toml")
+	_, err = readServerConfig("./data/invalid.toml")
 	assert.Error(t, err)
 	assert.Equal(t, "Near line 1, key 'invalid encoding': Near line 2: Expected key separator '=', but got '\\n' instead.", err.Error())
 
-	_, err = readServerConfig("./fixtures/invalid_port.toml")
+	_, err = readServerConfig("./data/invalid_port.toml")
 	assert.Error(t, err)
 	assert.Equal(t, "Type mismatch for 'main.Bookmark.Port': Expected string but found 'int64'.", err.Error())
 }
 
 func Test_Bookmark(t *testing.T) {
-	bookmark, err := readServerConfig("./fixtures/bookmark.toml")
+	bookmark, err := readServerConfig("./data/bookmark.toml")
 
 	assert.Equal(t, nil, err)
 	assert.Equal(t, "localhost", bookmark.Host)
@@ -33,7 +33,7 @@ func Test_Bookmark(t *testing.T) {
 }
 
 func Test_Bookmark_URL(t *testing.T) {
-	bookmark, err := readServerConfig("./fixtures/bookmark_url.toml")
+	bookmark, err := readServerConfig("./data/bookmark_url.toml")
 
 	assert.Equal(t, nil, err)
 	assert.Equal(t, "postgres://username:password@host:port/database?sslmode=disable", bookmark.Url)
@@ -64,7 +64,7 @@ func Test_ReadBookmarks_Invalid(t *testing.T) {
 }
 
 func Test_ReadBookmarks(t *testing.T) {
-	bookmarks, err := readAllBookmarks("./fixtures")
+	bookmarks, err := readAllBookmarks("./data")
 
 	assert.Equal(t, nil, err)
 	assert.Equal(t, 2, len(bookmarks))
diff --git a/client_test.go b/client_test.go
index 90911c3..b392c45 100644
--- a/client_test.go
+++ b/client_test.go
@@ -40,7 +40,7 @@ func setup() {
 		os.Exit(1)
 	}
 
-	out, err = exec.Command(testCommands["psql"], "-U", "postgres", "-h", "localhost", "-f", "./sql/booktown.sql", "booktown").CombinedOutput()
+	out, err = exec.Command(testCommands["psql"], "-U", "postgres", "-h", "localhost", "-f", "./data/booktown.sql", "booktown").CombinedOutput()
 
 	if err != nil {
 		fmt.Println("Database import failed:", string(out))
diff --git a/fixtures/bookmark.toml b/data/bookmark.toml
similarity index 100%
rename from fixtures/bookmark.toml
rename to data/bookmark.toml
diff --git a/fixtures/bookmark_url.toml b/data/bookmark_url.toml
similarity index 100%
rename from fixtures/bookmark_url.toml
rename to data/bookmark_url.toml
diff --git a/sql/booktown.sql b/data/booktown.sql
similarity index 100%
rename from sql/booktown.sql
rename to data/booktown.sql
diff --git a/fixtures/invalid.toml b/data/invalid.toml
similarity index 100%
rename from fixtures/invalid.toml
rename to data/invalid.toml
diff --git a/fixtures/invalid_port.toml b/data/invalid_port.toml
similarity index 100%
rename from fixtures/invalid_port.toml
rename to data/invalid_port.toml