From 943082ef4e0065fd744205ab6426d61824b78d37 Mon Sep 17 00:00:00 2001
From: Deluan <deluan@navidrome.org>
Date: Fri, 15 Oct 2021 22:00:34 -0400
Subject: [PATCH] Fix time-based tests (again)
---
persistence/sql_smartplaylist_test.go | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/persistence/sql_smartplaylist_test.go b/persistence/sql_smartplaylist_test.go
index c85c60457..e31a177e1 100644
--- a/persistence/sql_smartplaylist_test.go
+++ b/persistence/sql_smartplaylist_test.go
@@ -109,7 +109,8 @@ var _ = Describe("SmartPlaylist", func() {
})
Describe("dateRule", func() {
- dateStr := "2021-10-14"
+ delta := 30 * time.Hour // Must be large to account for the hours of the day
+ dateStr := time.Now().Format("2006-01-02")
date, _ := time.Parse("2006-01-02", dateStr)
DescribeTable("simple operators",
func(operator, expectedSql string, expectedValue time.Time) {
@@ -127,7 +128,6 @@ var _ = Describe("SmartPlaylist", func() {
DescribeTable("period operators",
func(operator, expectedSql string, expectedValue time.Time) {
- delta := 30 * time.Hour // Must be large to account for the hours of the day
r := dateRule{Field: "lastPlayed", Operator: operator, Value: 90}
sql, args, err := r.ToSql()
Expect(err).ToNot(HaveOccurred())
@@ -141,18 +141,18 @@ var _ = Describe("SmartPlaylist", func() {
It("accepts string as the 'in the last' operator value", func() {
r := dateRule{Field: "lastPlayed", Operator: "in the last", Value: "90"}
_, args, _ := r.ToSql()
- Expect(args).To(ConsistOf(BeTemporally("~", date.Add(-90*24*time.Hour), 30*time.Hour)))
+ Expect(args).To(ConsistOf(BeTemporally("~", date.Add(-90*24*time.Hour), delta)))
})
It("implements the 'is in the range' operator", func() {
- date2Str := "2021-09-14"
+ date2Str := time.Now().Add(48 * time.Hour).Format("2006-01-02")
date2, _ := time.Parse("2006-01-02", date2Str)
r := dateRule{Field: "lastPlayed", Operator: "is in the range", Value: []string{date2Str, dateStr}}
sql, args, err := r.ToSql()
Expect(err).ToNot(HaveOccurred())
Expect(sql).To(Equal("(lastPlayed >= ? AND lastPlayed <= ?)"))
- Expect(args).To(ConsistOf(BeTemporally("~", date2, 30*time.Hour), BeTemporally("~", date, 30*time.Hour)))
+ Expect(args).To(ConsistOf(BeTemporally("~", date2, 24*time.Hour), BeTemporally("~", date, delta)))
})
It("returns error if date is invalid", func() {