#297 Fix test failures because of times with microseconds

peek-travel · Sep 12, 2023 · 42d0ff0 · 42d0ff0
1 parent 988bd3d
commit 42d0ff0
Show file tree

Hide file tree

Showing 13 changed files with 494 additions and 453 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
-elixir 1.12.1-otp-24
-erlang 24.0.2
+elixir 1.14.5-otp-25
+erlang 25.3.2
diff --git a/lib/cocktail/schedule.ex b/lib/cocktail/schedule.ex
@@ -184,16 +184,16 @@ defmodule Cocktail.Schedule do
       ...> schedule = start_time |> new() |> add_recurrence_rule(:daily)
       ...> schedule |> occurrences() |> Enum.take(3) |> Enum.map(&Timex.format!(&1, "{ISO:Extended}"))
       ["2017-01-02T10:00:00-08:00",
-       "2017-01-03T10:00:00-08:00",
-       "2017-01-04T10:00:00-08:00"]
+       "2017-01-03T10:00:00.000000-08:00",
+       "2017-01-04T10:00:00.000000-08:00"]
 
       # using a NaiveDateTime with a duration
-      iex> start_time = ~N[2017-02-01 12:00:00]
+      iex> start_time = ~N[2017-02-01 12:00:00.000000]
       ...> schedule = start_time |> new(duration: 3_600) |> add_recurrence_rule(:weekly)
       ...> schedule |> occurrences() |> Enum.take(3)
-      [%Cocktail.Span{from: ~N[2017-02-01 12:00:00], until: ~N[2017-02-01 13:00:00]},
-       %Cocktail.Span{from: ~N[2017-02-08 12:00:00], until: ~N[2017-02-08 13:00:00]},
-       %Cocktail.Span{from: ~N[2017-02-15 12:00:00], until: ~N[2017-02-15 13:00:00]}]
+      [%Cocktail.Span{from: ~N[2017-02-01 12:00:00], until: ~N[2017-02-01 13:00:00.000000]},
+       %Cocktail.Span{from: ~N[2017-02-08 12:00:00.000000], until: ~N[2017-02-08 13:00:00.000000]},
+       %Cocktail.Span{from: ~N[2017-02-15 12:00:00.000000], until: ~N[2017-02-15 13:00:00.000000]}]
   """
   @spec occurrences(t, Cocktail.time() | nil) :: Enumerable.t()
   def occurrences(%__MODULE__{} = schedule, start_time \\ nil) do

diff --git a/test/cocktail/daily_test.exs b/test/cocktail/daily_test.exs
@@ -4,6 +4,7 @@ defmodule Cocktail.DailyTest do
   alias Cocktail.Schedule
 
   import Cocktail.TestSupport.DateTimeSigil
+  import Cocktail.TestSupport.Assertions
 
   test "Daily" do
     times =
@@ -13,11 +14,11 @@ defmodule Cocktail.DailyTest do
       |> Cocktail.Schedule.occurrences()
       |> Enum.take(3)
 
-    assert times == [
-             ~Y[2017-01-01 06:00:00 America/Los_Angeles],
-             ~Y[2017-01-02 06:00:00 America/Los_Angeles],
-             ~Y[2017-01-03 06:00:00 America/Los_Angeles]
-           ]
+    assert_equivalent_times(times, [
+      ~Y[2017-01-01 06:00:00 America/Los_Angeles],
+      ~Y[2017-01-02 06:00:00 America/Los_Angeles],
+      ~Y[2017-01-03 06:00:00 America/Los_Angeles]
+    ])
   end
 
   test "Every 2 days" do
@@ -28,11 +29,11 @@ defmodule Cocktail.DailyTest do
       |> Cocktail.Schedule.occurrences()
       |> Enum.take(3)
 
-    assert times == [
-             ~Y[2017-01-01 06:00:00 America/Los_Angeles],
-             ~Y[2017-01-03 06:00:00 America/Los_Angeles],
-             ~Y[2017-01-05 06:00:00 America/Los_Angeles]
-           ]
+    assert_equivalent_times(times, [
+      ~Y[2017-01-01 06:00:00 America/Los_Angeles],
+      ~Y[2017-01-03 06:00:00 America/Los_Angeles],
+      ~Y[2017-01-05 06:00:00 America/Los_Angeles]
+    ])
   end
 
   test "Every 2 days / Every 3 days" do
@@ -44,15 +45,15 @@ defmodule Cocktail.DailyTest do
       |> Cocktail.Schedule.occurrences()
       |> Enum.take(7)
 
-    assert times == [
-             ~Y[2017-01-01 06:00:00 America/Los_Angeles],
-             ~Y[2017-01-03 06:00:00 America/Los_Angeles],
-             ~Y[2017-01-04 06:00:00 America/Los_Angeles],
-             ~Y[2017-01-05 06:00:00 America/Los_Angeles],
-             ~Y[2017-01-07 06:00:00 America/Los_Angeles],
-             ~Y[2017-01-09 06:00:00 America/Los_Angeles],
-             ~Y[2017-01-10 06:00:00 America/Los_Angeles]
-           ]
+    assert_equivalent_times(times, [
+      ~Y[2017-01-01 06:00:00 America/Los_Angeles],
+      ~Y[2017-01-03 06:00:00 America/Los_Angeles],
+      ~Y[2017-01-04 06:00:00 America/Los_Angeles],
+      ~Y[2017-01-05 06:00:00 America/Los_Angeles],
+      ~Y[2017-01-07 06:00:00 America/Los_Angeles],
+      ~Y[2017-01-09 06:00:00 America/Los_Angeles],
+      ~Y[2017-01-10 06:00:00 America/Los_Angeles]
+    ])
   end
 
   test "Daily; overridden start time" do
@@ -63,11 +64,11 @@ defmodule Cocktail.DailyTest do
       |> Cocktail.Schedule.occurrences(~Y[2017-08-01 12:00:00 America/Los_Angeles])
       |> Enum.take(3)
 
-    assert times == [
-             ~Y[2017-08-02 06:00:00 America/Los_Angeles],
-             ~Y[2017-08-03 06:00:00 America/Los_Angeles],
-             ~Y[2017-08-04 06:00:00 America/Los_Angeles]
-           ]
+    assert_equivalent_times(times, [
+      ~Y[2017-08-02 06:00:00 America/Los_Angeles],
+      ~Y[2017-08-03 06:00:00 America/Los_Angeles],
+      ~Y[2017-08-04 06:00:00 America/Los_Angeles]
+    ])
   end
 
   test "Daily on the 10th and 14th hours of the day" do
@@ -78,13 +79,13 @@ defmodule Cocktail.DailyTest do
       |> Cocktail.Schedule.occurrences()
       |> Enum.take(5)
 
-    assert times == [
-             ~Y[2017-01-01 10:00:00 America/Los_Angeles],
-             ~Y[2017-01-01 14:00:00 America/Los_Angeles],
-             ~Y[2017-01-02 10:00:00 America/Los_Angeles],
-             ~Y[2017-01-02 14:00:00 America/Los_Angeles],
-             ~Y[2017-01-03 10:00:00 America/Los_Angeles]
-           ]
+    assert_equivalent_times(times, [
+      ~Y[2017-01-01 10:00:00 America/Los_Angeles],
+      ~Y[2017-01-01 14:00:00 America/Los_Angeles],
+      ~Y[2017-01-02 10:00:00 America/Los_Angeles],
+      ~Y[2017-01-02 14:00:00 America/Los_Angeles],
+      ~Y[2017-01-03 10:00:00 America/Los_Angeles]
+    ])
   end
 
   test "Every 6 days on Mondays and Fridays" do
@@ -95,16 +96,16 @@ defmodule Cocktail.DailyTest do
       |> Cocktail.Schedule.occurrences()
       |> Enum.take(8)
 
-    assert times == [
-             ~Y[2017-01-13 06:00:00 America/Los_Angeles],
-             ~Y[2017-02-06 06:00:00 America/Los_Angeles],
-             ~Y[2017-02-24 06:00:00 America/Los_Angeles],
-             ~Y[2017-03-20 06:00:00 America/Los_Angeles],
-             ~Y[2017-04-07 06:00:00 America/Los_Angeles],
-             ~Y[2017-05-01 06:00:00 America/Los_Angeles],
-             ~Y[2017-05-19 06:00:00 America/Los_Angeles],
-             ~Y[2017-06-12 06:00:00 America/Los_Angeles]
-           ]
+    assert_equivalent_times(times, [
+      ~Y[2017-01-13 06:00:00 America/Los_Angeles],
+      ~Y[2017-02-06 06:00:00 America/Los_Angeles],
+      ~Y[2017-02-24 06:00:00 America/Los_Angeles],
+      ~Y[2017-03-20 06:00:00 America/Los_Angeles],
+      ~Y[2017-04-07 06:00:00 America/Los_Angeles],
+      ~Y[2017-05-01 06:00:00 America/Los_Angeles],
+      ~Y[2017-05-19 06:00:00 America/Los_Angeles],
+      ~Y[2017-06-12 06:00:00 America/Los_Angeles]
+    ])
   end
 
   test "Daily on Mondays and Fridays on the 10th and 14th hours of the day" do
@@ -115,13 +116,13 @@ defmodule Cocktail.DailyTest do
       |> Cocktail.Schedule.occurrences()
       |> Enum.take(5)
 
-    assert times == [
-             ~Y[2017-01-02 10:00:00 America/Los_Angeles],
-             ~Y[2017-01-02 14:00:00 America/Los_Angeles],
-             ~Y[2017-01-06 10:00:00 America/Los_Angeles],
-             ~Y[2017-01-06 14:00:00 America/Los_Angeles],
-             ~Y[2017-01-09 10:00:00 America/Los_Angeles]
-           ]
+    assert_equivalent_times(times, [
+      ~Y[2017-01-02 10:00:00 America/Los_Angeles],
+      ~Y[2017-01-02 14:00:00 America/Los_Angeles],
+      ~Y[2017-01-06 10:00:00 America/Los_Angeles],
+      ~Y[2017-01-06 14:00:00 America/Los_Angeles],
+      ~Y[2017-01-09 10:00:00 America/Los_Angeles]
+    ])
   end
 
   test "Daily on Mondays and Fridays on the 10th and 14th hours of the day on the 15th and 45th minutes of the hour on the 0th and 30th seconds of the minute" do
@@ -138,17 +139,17 @@ defmodule Cocktail.DailyTest do
       |> Cocktail.Schedule.occurrences()
       |> Enum.take(9)
 
-    assert times == [
-             ~Y[2017-01-02 10:15:00 America/Los_Angeles],
-             ~Y[2017-01-02 10:15:30 America/Los_Angeles],
-             ~Y[2017-01-02 10:45:00 America/Los_Angeles],
-             ~Y[2017-01-02 10:45:30 America/Los_Angeles],
-             ~Y[2017-01-02 14:15:00 America/Los_Angeles],
-             ~Y[2017-01-02 14:15:30 America/Los_Angeles],
-             ~Y[2017-01-02 14:45:00 America/Los_Angeles],
-             ~Y[2017-01-02 14:45:30 America/Los_Angeles],
-             ~Y[2017-01-06 10:15:00 America/Los_Angeles]
-           ]
+    assert_equivalent_times(times, [
+      ~Y[2017-01-02 10:15:00 America/Los_Angeles],
+      ~Y[2017-01-02 10:15:30 America/Los_Angeles],
+      ~Y[2017-01-02 10:45:00 America/Los_Angeles],
+      ~Y[2017-01-02 10:45:30 America/Los_Angeles],
+      ~Y[2017-01-02 14:15:00 America/Los_Angeles],
+      ~Y[2017-01-02 14:15:30 America/Los_Angeles],
+      ~Y[2017-01-02 14:45:00 America/Los_Angeles],
+      ~Y[2017-01-02 14:45:30 America/Los_Angeles],
+      ~Y[2017-01-06 10:15:00 America/Los_Angeles]
+    ])
   end
 
   test "generating occurrences when when add_recurrence_time is used" do

diff --git a/test/cocktail/edge_cases_test.exs b/test/cocktail/edge_cases_test.exs
@@ -1,17 +1,19 @@
 defmodule Cocktail.EdgeCasesTest do
   use ExUnit.Case
 
+  import Cocktail.TestSupport.Assertions
+
   alias Cocktail.Schedule
 
   test "override start time to before the schedule's start time" do
     schedule = ~N[2017-10-01 09:00:00] |> Schedule.new() |> Schedule.add_recurrence_rule(:daily)
 
     times = schedule |> Schedule.occurrences(~N[2017-09-01 00:00:00]) |> Enum.take(3)
 
-    assert times == [
-             ~N[2017-10-01 09:00:00],
-             ~N[2017-10-02 09:00:00],
-             ~N[2017-10-03 09:00:00]
-           ]
+    assert_equivalent_times(times, [
+      ~N[2017-10-01 09:00:00],
+      ~N[2017-10-02 09:00:00],
+      ~N[2017-10-03 09:00:00]
+    ])
   end
 end
diff --git a/test/cocktail/hourly_test.exs b/test/cocktail/hourly_test.exs
@@ -4,6 +4,7 @@ defmodule Cocktail.HourlyTest do
   alias Cocktail.Schedule
 
   import Cocktail.TestSupport.DateTimeSigil
+  import Cocktail.TestSupport.Assertions
 
   test "Hourly" do
     times =
@@ -13,11 +14,11 @@ defmodule Cocktail.HourlyTest do
       |> Cocktail.Schedule.occurrences()
       |> Enum.take(3)
 
-    assert times == [
-             ~Y[2017-01-01 06:00:00 America/Los_Angeles],
-             ~Y[2017-01-01 07:00:00 America/Los_Angeles],
-             ~Y[2017-01-01 08:00:00 America/Los_Angeles]
-           ]
+    assert_equivalent_times(times, [
+      ~Y[2017-01-01 06:00:00 America/Los_Angeles],
+      ~Y[2017-01-01 07:00:00 America/Los_Angeles],
+      ~Y[2017-01-01 08:00:00 America/Los_Angeles]
+    ])
   end
 
   test "Every 2 hours" do
@@ -28,11 +29,11 @@ defmodule Cocktail.HourlyTest do
       |> Cocktail.Schedule.occurrences()
       |> Enum.take(3)
 
-    assert times == [
-             ~Y[2017-01-01 06:00:00 America/Los_Angeles],
-             ~Y[2017-01-01 08:00:00 America/Los_Angeles],
-             ~Y[2017-01-01 10:00:00 America/Los_Angeles]
-           ]
+    assert_equivalent_times(times, [
+      ~Y[2017-01-01 06:00:00 America/Los_Angeles],
+      ~Y[2017-01-01 08:00:00 America/Los_Angeles],
+      ~Y[2017-01-01 10:00:00 America/Los_Angeles]
+    ])
   end
 
   test "Every 2 hours / Every 3 hours" do
@@ -44,15 +45,15 @@ defmodule Cocktail.HourlyTest do
       |> Cocktail.Schedule.occurrences()
       |> Enum.take(7)
 
-    assert times == [
-             ~Y[2017-01-01 06:00:00 America/Los_Angeles],
-             ~Y[2017-01-01 08:00:00 America/Los_Angeles],
-             ~Y[2017-01-01 09:00:00 America/Los_Angeles],
-             ~Y[2017-01-01 10:00:00 America/Los_Angeles],
-             ~Y[2017-01-01 12:00:00 America/Los_Angeles],
-             ~Y[2017-01-01 14:00:00 America/Los_Angeles],
-             ~Y[2017-01-01 15:00:00 America/Los_Angeles]
-           ]
+    assert_equivalent_times(times, [
+      ~Y[2017-01-01 06:00:00 America/Los_Angeles],
+      ~Y[2017-01-01 08:00:00 America/Los_Angeles],
+      ~Y[2017-01-01 09:00:00 America/Los_Angeles],
+      ~Y[2017-01-01 10:00:00 America/Los_Angeles],
+      ~Y[2017-01-01 12:00:00 America/Los_Angeles],
+      ~Y[2017-01-01 14:00:00 America/Los_Angeles],
+      ~Y[2017-01-01 15:00:00 America/Los_Angeles]
+    ])
   end
 
   test "Hourly; overridden start time" do
@@ -63,11 +64,11 @@ defmodule Cocktail.HourlyTest do
       |> Cocktail.Schedule.occurrences(~Y[2017-08-01 12:00:00 America/Los_Angeles])
       |> Enum.take(3)
 
-    assert times == [
-             ~Y[2017-08-01 12:00:00 America/Los_Angeles],
-             ~Y[2017-08-01 13:00:00 America/Los_Angeles],
-             ~Y[2017-08-01 14:00:00 America/Los_Angeles]
-           ]
+    assert_equivalent_times(times, [
+      ~Y[2017-08-01 12:00:00 America/Los_Angeles],
+      ~Y[2017-08-01 13:00:00 America/Los_Angeles],
+      ~Y[2017-08-01 14:00:00 America/Los_Angeles]
+    ])
   end
 
   test "Hourly on the 10th and 14th hours of the day" do
@@ -78,13 +79,13 @@ defmodule Cocktail.HourlyTest do
       |> Cocktail.Schedule.occurrences()
       |> Enum.take(5)
 
-    assert times == [
-             ~Y[2017-01-01 10:00:00 America/Los_Angeles],
-             ~Y[2017-01-01 14:00:00 America/Los_Angeles],
-             ~Y[2017-01-02 10:00:00 America/Los_Angeles],
-             ~Y[2017-01-02 14:00:00 America/Los_Angeles],
-             ~Y[2017-01-03 10:00:00 America/Los_Angeles]
-           ]
+    assert_equivalent_times(times, [
+      ~Y[2017-01-01 10:00:00 America/Los_Angeles],
+      ~Y[2017-01-01 14:00:00 America/Los_Angeles],
+      ~Y[2017-01-02 10:00:00 America/Los_Angeles],
+      ~Y[2017-01-02 14:00:00 America/Los_Angeles],
+      ~Y[2017-01-03 10:00:00 America/Los_Angeles]
+    ])
   end
 
   test "Every 6 hours on Mondays and Fridays" do
@@ -95,17 +96,17 @@ defmodule Cocktail.HourlyTest do
       |> Cocktail.Schedule.occurrences()
       |> Enum.take(9)
 
-    assert times == [
-             ~Y[2017-01-02 00:00:00 America/Los_Angeles],
-             ~Y[2017-01-02 06:00:00 America/Los_Angeles],
-             ~Y[2017-01-02 12:00:00 America/Los_Angeles],
-             ~Y[2017-01-02 18:00:00 America/Los_Angeles],
-             ~Y[2017-01-06 00:00:00 America/Los_Angeles],
-             ~Y[2017-01-06 06:00:00 America/Los_Angeles],
-             ~Y[2017-01-06 12:00:00 America/Los_Angeles],
-             ~Y[2017-01-06 18:00:00 America/Los_Angeles],
-             ~Y[2017-01-09 00:00:00 America/Los_Angeles]
-           ]
+    assert_equivalent_times(times, [
+      ~Y[2017-01-02 00:00:00 America/Los_Angeles],
+      ~Y[2017-01-02 06:00:00 America/Los_Angeles],
+      ~Y[2017-01-02 12:00:00 America/Los_Angeles],
+      ~Y[2017-01-02 18:00:00 America/Los_Angeles],
+      ~Y[2017-01-06 00:00:00 America/Los_Angeles],
+      ~Y[2017-01-06 06:00:00 America/Los_Angeles],
+      ~Y[2017-01-06 12:00:00 America/Los_Angeles],
+      ~Y[2017-01-06 18:00:00 America/Los_Angeles],
+      ~Y[2017-01-09 00:00:00 America/Los_Angeles]
+    ])
   end
 
   test "Hourly on Mondays and Fridays on the 10th and 14th hours of the day" do
@@ -116,12 +117,12 @@ defmodule Cocktail.HourlyTest do
       |> Cocktail.Schedule.occurrences()
       |> Enum.take(5)
 
-    assert times == [
-             ~Y[2017-01-02 10:00:00 America/Los_Angeles],
-             ~Y[2017-01-02 14:00:00 America/Los_Angeles],
-             ~Y[2017-01-06 10:00:00 America/Los_Angeles],
-             ~Y[2017-01-06 14:00:00 America/Los_Angeles],
-             ~Y[2017-01-09 10:00:00 America/Los_Angeles]
-           ]
+    assert_equivalent_times(times, [
+      ~Y[2017-01-02 10:00:00 America/Los_Angeles],
+      ~Y[2017-01-02 14:00:00 America/Los_Angeles],
+      ~Y[2017-01-06 10:00:00 America/Los_Angeles],
+      ~Y[2017-01-06 14:00:00 America/Los_Angeles],
+      ~Y[2017-01-09 10:00:00 America/Los_Angeles]
+    ])
   end
 end