balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Fix all tests

Browse Source
This commit is contained in:
Dan Sosedoff
2015-04-30 12:09:29 -05:00
parent e9f2f8eb83
commit 50cdf99913
5 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/bookmarks/bookmarks_test.go
View File

@@ -10,17 +10,17 @@ func Test_Invalid_Bookmark_Files(t *testing.T) {
_, err := readServerConfig("foobar")
assert.Error(t, err)
_, err = readServerConfig("./data/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("./data/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())
assert.Equal(t, "Type mismatch for 'bookmarks.Bookmark.Port': Expected string but found 'int64'.", err.Error())
}
func Test_Bookmark(t *testing.T) {
bookmark, err := readServerConfig("./data/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("./data/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)
@@ -46,7 +46,7 @@ func Test_Bookmark_URL(t *testing.T) {
}
func Test_Bookmarks_Path(t *testing.T) {
assert.NotEqual(t, "/.pgweb/bookmarks", bookmarksPath())
assert.NotEqual(t, "/.pgweb/bookmarks", Path())
}
func Test_Basename(t *testing.T) {
@@ -57,14 +57,14 @@ func Test_Basename(t *testing.T) {
}
func Test_ReadBookmarks_Invalid(t *testing.T) {
bookmarks, err := readAllBookmarks("foobar")
bookmarks, err := ReadAll("foobar")
assert.Error(t, err)
assert.Equal(t, 0, len(bookmarks))
}
func Test_ReadBookmarks(t *testing.T) {
bookmarks, err := readAllBookmarks("./data")
bookmarks, err := ReadAll("../../data")
assert.Equal(t, nil, err)
assert.Equal(t, 2, len(bookmarks))