Tests, formatting

mbta · Jul 24, 2023 · 7aad68b · 7aad68b
1 parent f0455f9
commit 7aad68b
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 44 deletions.
diff --git a/lib/screens/v2/widget_instance/reconstructed_alert.ex b/lib/screens/v2/widget_instance/reconstructed_alert.ex
@@ -995,6 +995,7 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlert do
     def audio_serialize(t), do: ReconstructedAlert.serialize(t)
     def audio_sort_key(t), do: ReconstructedAlert.audio_sort_key(t)
     def audio_valid_candidate?(t), do: ReconstructedAlert.temporarily_override_alert(t)
+
     def audio_view(t),
       do:
         if(ReconstructedAlert.widget_type(t) === :reconstructed_large_alert,

diff --git a/test/screens/v2/candidate_generator/widgets/reconstructed_alert_test.exs b/test/screens/v2/candidate_generator/widgets/reconstructed_alert_test.exs
@@ -175,7 +175,7 @@ defmodule Screens.V2.CandidateGenerator.Widgets.ReconstructedAlertTest do
               active_period: [{~U[2020-12-31T00:00:00Z], ~U[2021-01-02T00:00:00Z]}]
             },
             is_full_screen: true,
-            informed_stations_string: "Oak Grove"
+            informed_stations: ["Oak Grove"]
           },
           expected_common_data
         ),
@@ -187,7 +187,7 @@ defmodule Screens.V2.CandidateGenerator.Widgets.ReconstructedAlertTest do
               informed_entities: [ie(stop: "place-mlmnl")],
               active_period: [{~U[2020-12-31T00:00:00Z], ~U[2021-01-02T00:00:00Z]}]
             },
-            informed_stations_string: "Malden Center"
+            informed_stations: ["Malden Center"]
           },
           expected_common_data
         ),
@@ -200,7 +200,7 @@ defmodule Screens.V2.CandidateGenerator.Widgets.ReconstructedAlertTest do
               active_period: [{~U[2020-12-31T00:00:00Z], ~U[2021-01-02T00:00:00Z]}]
             },
             is_full_screen: false,
-            informed_stations_string: ""
+            informed_stations: []
           },
           expected_common_data
         )
@@ -267,7 +267,7 @@ defmodule Screens.V2.CandidateGenerator.Widgets.ReconstructedAlertTest do
               active_period: [{~U[2020-12-31T00:00:00Z], ~U[2021-01-02T00:00:00Z]}]
             },
             is_full_screen: true,
-            informed_stations_string: "Malden Center"
+            informed_stations: ["Malden Center"]
           },
           expected_common_data
         ),
@@ -280,7 +280,7 @@ defmodule Screens.V2.CandidateGenerator.Widgets.ReconstructedAlertTest do
               active_period: [{~U[2020-12-31T00:00:00Z], ~U[2021-01-02T00:00:00Z]}]
             },
             is_full_screen: true,
-            informed_stations_string: ""
+            informed_stations: []
           },
           expected_common_data
         ),
@@ -292,7 +292,7 @@ defmodule Screens.V2.CandidateGenerator.Widgets.ReconstructedAlertTest do
               informed_entities: [ie(stop: "place-astao")],
               active_period: [{~U[2020-12-31T00:00:00Z], ~U[2021-01-02T00:00:00Z]}]
             },
-            informed_stations_string: "Assembly"
+            informed_stations: ["Assembly"]
           },
           expected_common_data
         )
@@ -349,7 +349,7 @@ defmodule Screens.V2.CandidateGenerator.Widgets.ReconstructedAlertTest do
               active_period: [{~U[2020-12-31T00:00:00Z], ~U[2021-01-02T00:00:00Z]}]
             },
             is_full_screen: true,
-            informed_stations_string: ""
+            informed_stations: []
           },
           expected_common_data
         )
@@ -429,7 +429,7 @@ defmodule Screens.V2.CandidateGenerator.Widgets.ReconstructedAlertTest do
         screen: config,
         location_context: location_context,
         now: now,
-        informed_stations_string: "",
+        informed_stations: [],
         is_terminal_station: true
       }
 
@@ -508,7 +508,7 @@ defmodule Screens.V2.CandidateGenerator.Widgets.ReconstructedAlertTest do
               informed_entities: [ie(stop: "place-ogmnl", direction_id: 0)],
               active_period: [{~U[2020-12-31T00:00:00Z], ~U[2021-01-02T00:00:00Z]}]
             },
-            informed_stations_string: ""
+            informed_stations: []
           },
           expected_common_data
         ),
@@ -520,7 +520,7 @@ defmodule Screens.V2.CandidateGenerator.Widgets.ReconstructedAlertTest do
               informed_entities: [ie(stop: "place-ogmnl")],
               active_period: [{~U[2020-12-31T00:00:00Z], ~U[2021-01-02T00:00:00Z]}]
             },
-            informed_stations_string: ""
+            informed_stations: []
           },
           expected_common_data
         )

diff --git a/test/screens/v2/widget_instance/reconstructed_alert_test.exs b/test/screens/v2/widget_instance/reconstructed_alert_test.exs
@@ -75,8 +75,8 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
     }
   end
 
-  defp put_informed_stations_string(widget, string) do
-    %{widget | informed_stations_string: string}
+  defp put_informed_stations(widget, stations) do
+    %{widget | informed_stations: stations}
   end
 
   defp put_app_id(widget, app_id) do
@@ -167,7 +167,7 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
       widget
       |> put_home_stop(PreFare, home_stop)
       |> put_stop_sequences(stop_sequences)
-      |> put_informed_stations_string("Downtown Crossing")
+      |> put_informed_stations(["Downtown Crossing"])
       |> put_routes_at_stop(routes)
 
     %{widget: widget}
@@ -200,7 +200,7 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
       widget
       |> put_home_stop(PreFare, home_stop)
       |> put_stop_sequences(stop_sequences)
-      |> put_informed_stations_string("Malden Center")
+      |> put_informed_stations(["Malden Center"])
       |> put_routes_at_stop(routes)
 
     %{widget: widget}
@@ -239,7 +239,7 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
   end
 
   defp setup_informed_entities_string(%{widget: widget}) do
-    %{widget: put_informed_stations_string(widget, "Downtown Crossing")}
+    %{widget: put_informed_stations(widget, ["Downtown Crossing"])}
   end
 
   defp setup_location_context(%{widget: widget}) do
@@ -497,7 +497,9 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
         effect: :shuttle,
         remedy: "Use shuttle bus",
         updated_at: "Friday, 5:00 am",
-        routes: [%{color: :orange, text: "ORANGE LINE", type: :text}]
+        routes: [%{color: :orange, text: "ORANGE LINE", type: :text}],
+        # Odd range, but not a normal alert situation
+        endpoints: {"Malden Center", "Malden Center"}
       }
 
       assert expected == ReconstructedAlert.serialize(widget)
@@ -520,7 +522,8 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
         effect: :station_closure,
         remedy: "Seek alternate route",
         updated_at: "Friday, 5:00 am",
-        routes: [%{color: :orange, text: "ORANGE LINE", type: :text}]
+        routes: [%{color: :orange, text: "ORANGE LINE", type: :text}],
+        other_closures: ["Malden Center"]
       }
 
       assert expected == ReconstructedAlert.serialize(widget)
@@ -593,7 +596,8 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
         effect: :shuttle,
         remedy: "Use shuttle bus",
         updated_at: "Friday, 5:00 am",
-        routes: [%{color: :orange, text: "ORANGE LINE", type: :text}]
+        routes: [%{color: :orange, text: "ORANGE LINE", type: :text}],
+        endpoints: {"Oak Grove", "Malden Center"}
       }
 
       assert expected == ReconstructedAlert.serialize(widget)
@@ -618,12 +622,13 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
         issue: "No trains to Oak Grove",
         location: "No Orange Line trains between Oak Grove and Malden Center",
         cause: nil,
-        routes: ["ol-oak-grove"],
+        routes: [%{headsign: "Oak Grove", route_id: "Orange", svg_name: "ol-oak-grove"}],
         effect: :suspension,
         remedy: "Seek alternate route",
         updated_at: "Friday, 5:00 am",
         region: :boundary,
-        endpoints: {"Oak Grove", "Malden Center"}
+        endpoints: {"Oak Grove", "Malden Center"},
+        is_transfer_station: false
       }
 
       assert expected == ReconstructedAlert.serialize(widget)
@@ -644,12 +649,13 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
         issue: "No trains to Oak Grove",
         location: "Shuttle buses between Oak Grove and Malden Center",
         cause: nil,
-        routes: ["ol-oak-grove"],
+        routes: [%{headsign: "Oak Grove", route_id: "Orange", svg_name: "ol-oak-grove"}],
         effect: :shuttle,
         remedy: "Use shuttle bus",
         updated_at: "Friday, 5:00 am",
         region: :boundary,
-        endpoints: {"Oak Grove", "Malden Center"}
+        endpoints: {"Oak Grove", "Malden Center"},
+        is_transfer_station: false
       }
 
       assert expected == ReconstructedAlert.serialize(widget)
@@ -670,7 +676,7 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
       expected = %{
         issue: "Trains may be delayed up to 20 minutes",
         cause: nil,
-        routes: ["ol"],
+        routes: [%{route_id: "Orange", svg_name: "ol"}],
         effect: :delay,
         remedy: "Delays are happening",
         updated_at: "Friday, 5:00 am",
@@ -695,7 +701,7 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
       expected = %{
         issue: "Trains may be delayed over 60 minutes",
         cause: nil,
-        routes: ["ol"],
+        routes: [%{route_id: "Orange", svg_name: "ol"}],
         effect: :delay,
         remedy: "Delays are happening",
         updated_at: "Friday, 5:00 am",
@@ -720,7 +726,7 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
       expected = %{
         issue: "Trains may be delayed up to 20 minutes",
         cause: nil,
-        routes: ["ol-forest-hills"],
+        routes: [%{headsign: "Forest Hills", route_id: "Orange", svg_name: "ol-forest-hills"}],
         effect: :delay,
         remedy: "Delays are happening",
         updated_at: "Friday, 5:00 am",
@@ -745,7 +751,7 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
       expected = %{
         issue: "Trains may be delayed over 60 minutes",
         cause: :construction,
-        routes: ["ol"],
+        routes: [%{route_id: "Orange", svg_name: "ol"}],
         effect: :delay,
         remedy: "Delays are happening",
         updated_at: "Friday, 5:00 am",
@@ -770,7 +776,7 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
       expected = %{
         issue: "Trains may be delayed over 60 minutes",
         cause: nil,
-        routes: ["ol"],
+        routes: [%{route_id: "Orange", svg_name: "ol"}],
         effect: :delay,
         remedy: "Delays are happening",
         updated_at: "Friday, 5:00 am",
@@ -794,12 +800,13 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
         issue: "No trains",
         location: nil,
         cause: nil,
-        routes: ["ol-forest-hills"],
+        routes: [%{headsign: "Forest Hills", route_id: "Orange", svg_name: "ol-forest-hills"}],
         effect: :shuttle,
         remedy: "Shuttle buses available",
         updated_at: "Friday, 5:00 am",
         region: :outside,
-        endpoints: {"Wellington", "Wellington"}
+        endpoints: {"Wellington", "Wellington"},
+        is_transfer_station: false
       }
 
       assert expected == ReconstructedAlert.serialize(widget)
@@ -820,12 +827,13 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
         issue: "No trains",
         location: nil,
         cause: nil,
-        routes: ["ol-forest-hills"],
+        routes: [%{headsign: "Forest Hills", route_id: "Orange", svg_name: "ol-forest-hills"}],
         effect: :suspension,
         remedy: "Seek alternate route",
         updated_at: "Friday, 5:00 am",
         region: :outside,
-        endpoints: {"Wellington", "Assembly"}
+        endpoints: {"Wellington", "Assembly"},
+        is_transfer_station: false
       }
 
       assert expected == ReconstructedAlert.serialize(widget)
@@ -846,10 +854,10 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
         |> put_is_full_screen(true)
 
       expected = %{
-        issue: ["orange"],
-        unaffected_routes: ["red"],
+        issue: nil,
+        unaffected_routes: [%{route_id: "Red", svg_name: "rl"}],
         cause: nil,
-        routes: ["ol"],
+        routes: [%{route_id: "Orange", svg_name: "ol"}],
         effect: :station_closure,
         updated_at: "Friday, 5:00 am",
         region: :here
@@ -873,11 +881,12 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
         remedy: "Seek alternate route",
         cause: nil,
         location: "No Orange Line trains at Downtown Crossing",
-        routes: ["ol"],
+        routes: [%{route_id: "Orange", svg_name: "ol"}],
         effect: :suspension,
         updated_at: "Friday, 5:00 am",
         region: :here,
-        endpoints: {"Downtown Crossing", "Downtown Crossing"}
+        endpoints: {"Downtown Crossing", "Downtown Crossing"},
+        is_transfer_station: true
       }
 
       assert expected == ReconstructedAlert.serialize(widget)
@@ -898,11 +907,12 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
         remedy: "Use shuttle bus",
         cause: nil,
         location: "Shuttle buses at Downtown Crossing",
-        routes: ["ol"],
+        routes: [%{route_id: "Orange", svg_name: "ol"}],
         effect: :shuttle,
         updated_at: "Friday, 5:00 am",
         region: :here,
-        endpoints: {"Downtown Crossing", "Downtown Crossing"}
+        endpoints: {"Downtown Crossing", "Downtown Crossing"},
+        is_transfer_station: true
       }
 
       assert expected == ReconstructedAlert.serialize(widget)
@@ -1220,7 +1230,7 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
           ie(stop: "place-welln", route: "Orange", route_type: 1)
         ])
         |> put_cause(:unknown)
-        |> put_informed_stations_string("Wellington")
+        |> put_informed_stations(["Wellington"])
 
       expected = %{
         issue: "Trains will bypass Wellington",
@@ -1270,7 +1280,7 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
           ie(stop: "place-welln", route: "Orange", route_type: 1)
         ])
         |> put_cause(:construction)
-        |> put_informed_stations_string("Wellington")
+        |> put_informed_stations(["Wellington"])
 
       expected = %{
         issue: "Trains will bypass Wellington",
@@ -1649,12 +1659,13 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
         issue: "No trains",
         location: nil,
         cause: nil,
-        routes: ["ol-forest-hills"],
+        routes: [%{headsign: "Forest Hills", route_id: "Orange", svg_name: "ol-forest-hills"}],
         effect: :suspension,
         remedy: "Seek alternate route",
         updated_at: "Friday, 5:14 am",
         region: :outside,
-        endpoints: {"North Station", "Back Bay"}
+        endpoints: {"North Station", "Back Bay"},
+        is_transfer_station: false
       }
 
       assert expected == ReconstructedAlert.serialize(alert_widget)
@@ -2033,12 +2044,19 @@ defmodule Screens.V2.WidgetInstance.ReconstructedAlertTest do
         issue: "No trains to North Station & North",
         location: "Shuttle buses between Union Square and Government Center",
         cause: nil,
-        routes: ["gl-north-station-north"],
+        routes: [
+          %{
+            headsign: "North Station & North",
+            route_id: "Green",
+            svg_name: "gl-north-station-north"
+          }
+        ],
         effect: :shuttle,
         remedy: "Use shuttle bus",
         updated_at: "Friday, 2:24 pm",
         region: :boundary,
-        endpoints: {"Union Square", "Government Center"}
+        endpoints: {"Union Square", "Government Center"},
+        is_transfer_station: false
       }
 
       assert expected == ReconstructedAlert.serialize(alert_widget)