fix(test): fix time comparison error in test with go 1.9

Author: sebastienfr

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Changelog
 ## v0.0.2
+- 17/11/03 fix(test): fix time comparison error in test with go 1.9 (SFR)
 - 17/10/05 fix(test): enhance web test errors on full server test (SFR)
  refact(model): refact model constructor
  fix(dao): fix error name

dao/task-dao-mongo.go

@@ -13,6 +13,7 @@ import (
 var _ TaskDAO = (*TaskDAOMongo)(nil)
 
 var (
+// ErrInvalidUUID is used on invalid UUID number
 ErrInvalidUUID = errors.New("invalid input to UUID")
 )
 

model/task.go

@@ -49,3 +49,14 @@ func NewTask() *Task {
 Priority: PriorityMedium,
 }
 }
+
+// Equal compares a Task to another and returns true if they are equal false otherwise
+func (t Task) Equal(task Task) bool {
+return t.ID == task.ID &&
+t.Title == task.Title &&
+t.Description == task.Description &&
+t.Status == task.Status &&
+t.Priority == task.Priority &&
+t.CreationDate.Equal(task.CreationDate) &&
+t.DueDate.Equal(task.DueDate)
+}

web/controller.go

@@ -161,7 +161,7 @@ func (sh *TaskController) Update(w http.ResponseWriter, r *http.Request) {
 err := GetJSONContent(task, r)
 
 if err != nil {
-logger.WithField("error", err).Warn("unable to decode task to create")
+logger.WithField("error", err).Warn("unable to decode task to update")
 SendJSONError(w, "Error while decoding task to create", http.StatusBadRequest)
 return
 }

web/web_test.go

@@ -12,11 +12,6 @@ import (
 "time"
 )
 
-func init() {
-// set timezone as UTC for bson/json time marshalling
-time.Local = time.UTC
-}
-
 // This test is composed by several subtests and uses httptest.ResponseRecorder type to record http response.
 // These are NOT end-to-end tests as we are directly calling the controller methods we want to test.
 func TestTaskControllerGet(t *testing.T) {
@@ -48,7 +43,11 @@ func TestTaskControllerGet(t *testing.T) {
 t.Errorf("Wrong response code. Got %d instead of %d.", res.Code, http.StatusOK)
 }
 
-if dao.MockedTask != taskOut[0] {
+if len(taskOut) < 1 {
+t.Fatal("Wrong result size < 1")
+}
+
+if !dao.MockedTask.Equal(taskOut[0]) {
 t.Errorf("Expected different from %v output %v", dao.MockedTask, taskOut[0])
 }
 })
@@ -78,7 +77,7 @@ func TestTaskControllerGet(t *testing.T) {
 t.Errorf("Wrong response code. Got %d instead of %d.", res.Code, http.StatusOK)
 }
 
-if dao.MockedTask != taskOut {
+if !dao.MockedTask.Equal(taskOut) {
 t.Errorf("Expected different from %v output %v", dao.MockedTask, taskOut)
 }
 })
@@ -116,7 +115,7 @@ func TestTaskControllerGet(t *testing.T) {
 }
 
 task.ID = taskOut.ID
-if task != taskOut {
+if !task.Equal(taskOut) {
 t.Errorf("Expected different from %v output %v", task, taskOut)
 }
 })
@@ -167,7 +166,7 @@ func TestTaskControllerGetServer(t *testing.T) {
 }
 
 task.ID = taskTest.ID
-if task != taskTest {
+if !task.Equal(taskTest) {
 t.Errorf("Expected different from %v output %v", task, taskTest)
 }
 })
@@ -190,11 +189,11 @@ func TestTaskControllerGetServer(t *testing.T) {
 }
 
 if len(resTask) < 1 {
-t.Errorf("Expected length different from %v output 1", len(resTask))
-} else {
-if resTask[0] != taskTest {
-t.Errorf("Expected different from %v output %v", resTask[0], taskTest)
-}
+t.Fatal("Wrong result size < 1")
+}
+
+if !resTask[0].Equal(taskTest) {
+t.Errorf("Expected different from %v output %v", resTask[0], taskTest)
 }
 })
 
@@ -215,7 +214,7 @@ func TestTaskControllerGetServer(t *testing.T) {
 t.Errorf("Wrong response code. Got %d instead of %d.", res.StatusCode, http.StatusOK)
 }
 
-if resTask != taskTest {
+if !resTask.Equal(taskTest) {
 t.Errorf("Expected different from %v output %v", resTask, taskTest)
 }
 })
@@ -229,7 +228,7 @@ func BenchmarkTaskControllerGet(b *testing.B) {
 handler := NewTaskController(daoMock)
 
 // build a request
-req, err := http.NewRequest("GET", "localhost/tasks", nil)
+req, err := http.NewRequest(http.MethodGet, "localhost/tasks", nil)
 if err != nil {
 b.Fatal(err)
 }