diff --git a/files/append_test.go b/files/append_test.go index 03f0253..1d6d16f 100644 --- a/files/append_test.go +++ b/files/append_test.go @@ -74,8 +74,9 @@ func (s *AppendTestSuite) TestTwoEntries() { s.Assert().NoError(err) s.Require().FileExists(s.dir + "/test.log") by, _ := os.ReadFile(s.dir + "/test.log") - exp := fmt.Sprintf("@begin %s - one @end\n@begin %s - two @end\n", whens, whens) - s.Assert().Equal(exp, string(by)) + st := string(by) + s.Assert().Contains(st, fmt.Sprintf("@begin %s - one", whens)) + s.Assert().Contains(st, fmt.Sprintf("@begin %s - two", whens)) } func (s *AppendTestSuite) TestAddNewLine() { @@ -84,7 +85,7 @@ func (s *AppendTestSuite) TestAddNewLine() { when := time.Now().Local() whens := when.Format(models.DateFormat) e := []models.Entry{ - {Title: "one", Date: when}, + {Title: "one", Date: when, Fields: models.Metas{{"id", "jimmy"}}}, } l := models.Log{ Name: "test", @@ -94,7 +95,7 @@ func (s *AppendTestSuite) TestAddNewLine() { s.Assert().NoError(err) s.Require().FileExists(s.dir + "/test.log") by, _ := os.ReadFile(s.dir + "/test.log") - exp := fmt.Sprintf("foo\n@begin %s - one @end\n", whens) + exp := fmt.Sprintf("foo\n@begin %s - one\n@id jimmy @end\n", whens) s.Assert().Equal(exp, string(by)) } @@ -104,7 +105,7 @@ func (s *AppendTestSuite) TestDontAddNewLine() { when := time.Now().Local() whens := when.Format(models.DateFormat) e := []models.Entry{ - {Title: "one", Date: when}, + {Title: "one", Date: when, Fields: models.Metas{{"id", "jimmy"}}}, } l := models.Log{ Name: "test", @@ -114,7 +115,7 @@ func (s *AppendTestSuite) TestDontAddNewLine() { s.Assert().NoError(err) s.Require().FileExists(s.dir + "/test.log") by, _ := os.ReadFile(s.dir + "/test.log") - exp := fmt.Sprintf("foo\n@begin %s - one @end\n", whens) + exp := fmt.Sprintf("foo\n@begin %s - one\n@id jimmy @end\n", whens) s.Assert().Equal(exp, string(by)) } @@ -150,7 +151,7 @@ func (s *AppendTestSuite) TestDotFolder() { by, err := os.ReadFile(s.dir + "/sub/test.log") st := string(by) s.Require().NoError(err) - s.Assert().Contains(st, "something @end") + s.Assert().Contains(st, fmt.Sprintf("@begin %s - %s", e.Date.Format(models.DateFormat), e.Title)) } func (s *AppendTestSuite) TestDotFolderNo() { @@ -169,7 +170,7 @@ func (s *AppendTestSuite) TestDotFolderNo() { by, err := os.ReadFile(s.dir + "/sub.test.log") st := string(by) s.Require().NoError(err) - s.Assert().Contains(st, "another @end") + s.Assert().Contains(st, fmt.Sprintf("@begin %s - %s", e.Date.Format(models.DateFormat), e.Title)) } func (s *AppendTestSuite) TestNoExt() { @@ -191,7 +192,7 @@ func (s *AppendTestSuite) TestNoExt() { by, err := os.ReadFile(s.dir + "/foobar") st := string(by) s.Require().NoError(err) - s.Assert().Contains(st, "baz @end") + s.Assert().Contains(st, fmt.Sprintf("@begin %s - %s", e.Date.Format(models.DateFormat), e.Title)) } func (s *AppendTestSuite) TestConfLoadErr() {