aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--todolist/file_store_test.go4
-rw-r--r--todolist/filter_test.go12
-rw-r--r--todolist/grouper_test.go6
-rw-r--r--todolist/todo_list_test.go18
5 files changed, 29 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore
index 22d2c23..9de3318 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
.goxc.local.json
dist
+
+# OSX metadata
+.DS_Store
diff --git a/todolist/file_store_test.go b/todolist/file_store_test.go
index 0bd194d..8de79ec 100644
--- a/todolist/file_store_test.go
+++ b/todolist/file_store_test.go
@@ -9,12 +9,12 @@ import (
func TestFileStore(t *testing.T) {
assert := assert.New(t)
store := &FileStore{FileLocation: "todos.json"}
- todos := store.Load()
+ todos, _ := store.Load()
assert.Equal(todos[0].Subject, "this is the first subject", "")
}
func TestSave(t *testing.T) {
store := &FileStore{FileLocation: "todos.json"}
- todos := store.Load()
+ todos, _ := store.Load()
store.Save(todos)
}
diff --git a/todolist/filter_test.go b/todolist/filter_test.go
index 59c0daa..e4d3fed 100644
--- a/todolist/filter_test.go
+++ b/todolist/filter_test.go
@@ -10,7 +10,8 @@ func TestFilterArchived(t *testing.T) {
assert := assert.New(t)
store := &FileStore{FileLocation: "todos.json"}
list := &TodoList{}
- list.Load(store.Load())
+ todos, _ := store.Load()
+ list.Load(todos)
filter := NewFilter(list.Todos())
archived := filter.filterArchived("l archived")
assert.Equal(1, len(archived))
@@ -21,7 +22,8 @@ func TestFilterUnarchivedByDefault(t *testing.T) {
assert := assert.New(t)
store := &FileStore{FileLocation: "todos.json"}
list := &TodoList{}
- list.Load(store.Load())
+ todos, _ := store.Load()
+ list.Load(todos)
filter := NewFilter(list.Todos())
unarchived := filter.filterArchived("l")
assert.Equal(1, len(unarchived))
@@ -32,7 +34,8 @@ func TestGetArchived(t *testing.T) {
assert := assert.New(t)
store := &FileStore{FileLocation: "todos.json"}
list := &TodoList{}
- list.Load(store.Load())
+ todos, _ := store.Load()
+ list.Load(todos)
filter := NewFilter(list.Todos())
archived := filter.getArchived()
assert.Equal(1, len(archived))
@@ -43,7 +46,8 @@ func TestGetUnarchived(t *testing.T) {
assert := assert.New(t)
store := &FileStore{FileLocation: "todos.json"}
list := &TodoList{}
- list.Load(store.Load())
+ todos, _ := store.Load()
+ list.Load(todos)
filter := NewFilter(list.Todos())
unarchived := filter.getUnarchived()
assert.Equal(1, len(unarchived))
diff --git a/todolist/grouper_test.go b/todolist/grouper_test.go
index 4b79703..12a1018 100644
--- a/todolist/grouper_test.go
+++ b/todolist/grouper_test.go
@@ -11,7 +11,8 @@ func TestGroupByContext(t *testing.T) {
store := &FileStore{FileLocation: "todos.json"}
list := &TodoList{}
- list.Load(store.Load())
+ todos, _ := store.Load()
+ list.Load(todos)
grouper := &Grouper{}
grouped := grouper.GroupByContext(list.Todos())
@@ -25,7 +26,8 @@ func TestGroupByProject(t *testing.T) {
store := &FileStore{FileLocation: "todos.json"}
list := &TodoList{}
- list.Load(store.Load())
+ todos, _ := store.Load()
+ list.Load(todos)
grouper := &Grouper{}
grouped := grouper.GroupByProject(list.Todos())
diff --git a/todolist/todo_list_test.go b/todolist/todo_list_test.go
index 941106d..8a40b14 100644
--- a/todolist/todo_list_test.go
+++ b/todolist/todo_list_test.go
@@ -17,7 +17,8 @@ func TestIndexOf(t *testing.T) {
todo := &Todo{Subject: "Grant"}
store := &FileStore{FileLocation: "todos.json"}
list := &TodoList{}
- list.Load(store.Load())
+ todos, _ := store.Load()
+ list.Load(todos)
assert.Equal(-1, list.IndexOf(todo))
assert.Equal(0, list.IndexOf(list.Data[0]))
@@ -27,7 +28,8 @@ func TestDelete(t *testing.T) {
assert := assert.New(t)
store := &FileStore{FileLocation: "todos.json"}
list := &TodoList{}
- list.Load(store.Load())
+ todos, _ := store.Load()
+ list.Load(todos)
assert.Equal(2, len(list.Data))
list.Delete(1)
assert.Equal(1, len(list.Data))
@@ -37,7 +39,8 @@ func TestComplete(t *testing.T) {
assert := assert.New(t)
store := &FileStore{FileLocation: "todos.json"}
list := &TodoList{}
- list.Load(store.Load())
+ todos, _ := store.Load()
+ list.Load(todos)
assert.Equal(false, list.FindById(1).Completed)
list.Complete(1)
assert.Equal(true, list.FindById(1).Completed)
@@ -47,7 +50,8 @@ func TestArchive(t *testing.T) {
assert := assert.New(t)
store := &FileStore{FileLocation: "todos.json"}
list := &TodoList{}
- list.Load(store.Load())
+ todos, _ := store.Load()
+ list.Load(todos)
assert.Equal(false, list.FindById(2).Archived)
list.Archive(2)
assert.Equal(true, list.FindById(2).Archived)
@@ -56,7 +60,8 @@ func TestUnarchive(t *testing.T) {
assert := assert.New(t)
store := &FileStore{FileLocation: "todos.json"}
list := &TodoList{}
- list.Load(store.Load())
+ todos, _ := store.Load()
+ list.Load(todos)
assert.Equal(true, list.FindById(1).Archived)
list.Unarchive(1)
assert.Equal(false, list.FindById(1).Archived)
@@ -66,7 +71,8 @@ func TestUncomplete(t *testing.T) {
assert := assert.New(t)
store := &FileStore{FileLocation: "todos.json"}
list := &TodoList{}
- list.Load(store.Load())
+ todos, _ := store.Load()
+ list.Load(todos)
assert.Equal(true, list.FindById(2).Completed)
list.Uncomplete(2)
assert.Equal(false, list.FindById(2).Completed)