balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Use generic typed error pattern

Browse Source 
The codebase doesn't yet use the explicitly typed error pattern. To keep
things consistent, lets use the generic error type.
This commit is contained in:
akarki15 2016-11-12 12:30:15 -05:00
parent 1b4902f196
commit 68db934507
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/bookmarks/bookmarks.go
View File

@ -90,12 +90,6 @@ func ReadAll(path string) (map[string]Bookmark, error) {
return results, nil return results, nil
} }
type ErrNonExistingBookmark string
func (e ErrNonExistingBookmark) Error() string {
return fmt.Sprintf("couldn't find a bookmark with name %s", e)
}
func GetBookmark(bookmarkPath string, bookmarkName string) (Bookmark, error) { func GetBookmark(bookmarkPath string, bookmarkName string) (Bookmark, error) {
bookmarks, err := ReadAll(bookmarkPath) bookmarks, err := ReadAll(bookmarkPath)
if err != nil { if err != nil {
@ -103,7 +97,7 @@ func GetBookmark(bookmarkPath string, bookmarkName string) (Bookmark, error) {
} }
bookmark, ok := bookmarks[bookmarkName] bookmark, ok := bookmarks[bookmarkName]
if !ok { if !ok {
return Bookmark{}, ErrNonExistingBookmark(bookmarkName) return Bookmark{}, fmt.Errorf("couldn't find a bookmark with name %s", bookmarkName)
} }
return bookmark, nil return bookmark, nil

3
pkg/bookmarks/bookmarks_test.go
View File

@ -84,7 +84,8 @@ func Test_GetBookmark(t *testing.T) {
} }
_, err = GetBookmark("../../data", "bar") _, err = GetBookmark("../../data", "bar")
assert.Equal(t, ErrNonExistingBookmark("bar"), err) expErrStr := "couldn't find a bookmark with name bar"
assert.Equal(t, expErrStr, err.Error())
_, err = GetBookmark("foo", "bookmark") _, err = GetBookmark("foo", "bookmark")
assert.Error(t, err) assert.Error(t, err)