Fix Signal group alignment test

usdot-jpo-ode · May 15, 2024 · c8c4c1b · c8c4c1b
1 parent a60d1cb
commit c8c4c1b
Show file tree

Hide file tree

Showing 3 changed files with 2,541 additions and 47 deletions.
diff --git a/...a/us/dot/its/jpo/conflictmonitor/monitor/topologies/MapSpatMessageAssessmentTopology.java b/...a/us/dot/its/jpo/conflictmonitor/monitor/topologies/MapSpatMessageAssessmentTopology.java
@@ -275,7 +275,7 @@ public Topology buildTopology() {
                     if (!mapSignalGroups.equals(spatSignalGroups)) {
                         event.setMapSignalGroupIds(mapSignalGroups);
                         event.setSpatSignalGroupIds(spatSignalGroups);
-                        event.setSource(key.toString());
+                        event.setSource(key.getRsuId());
                         events.add(new KeyValue<>(key.toString(), event));
                     }
 

diff --git a/...monitor/monitor/notifications/IntersectionReferenceAlignmentNotificationTopologyTest.java b/...monitor/monitor/notifications/IntersectionReferenceAlignmentNotificationTopologyTest.java
@@ -74,11 +74,11 @@ public void testTopology() {
                 Serdes.String().deserializer(), 
                 JsonSerdes.IntersectionReferenceAlignmentNotification().deserializer());
 
-
-            final var mapKey = new RsuIntersectionKey("127.0.0.1", 12109);
+            final String rsuIp = "10.11.81.12";
+            final var mapKey = new RsuIntersectionKey(rsuIp, 12109);
             inputMapTopic.pipeInput(mapKey, processedMap);
 
-            final var spatKey = new RsuIntersectionKey("127.0.0.1", 12108);
+            final var spatKey = new RsuIntersectionKey(rsuIp, 12108);
             inputSpatTopic.pipeInput(spatKey, processedSpat);
 
 
@@ -93,7 +93,7 @@ public void testTopology() {
 
             KeyValue<String, IntersectionReferenceAlignmentNotification> notificationKeyValue = notificationResults.get(0);
 
-            assertEquals("127.0.0.1", notificationKeyValue.key);
+            assertEquals(rsuIp, notificationKeyValue.key);
 
             IntersectionReferenceAlignmentNotification notification = notificationKeyValue.value;
 
@@ -105,7 +105,7 @@ public void testTopology() {
 
             IntersectionReferenceAlignmentEvent event = notification.getEvent();
 
-            assertEquals("127.0.0.1", event.getSource());
+            assertEquals(rsuIp, event.getSource());
 
             assertEquals(1, event.getMapRegulatorIntersectionIds().size());
             assertEquals(1, event.getSpatRegulatorIntersectionIds().size());

diff --git a/...o/conflictmonitor/monitor/notifications/SignalGroupAlignmentNotificationTopologyTest.java b/...o/conflictmonitor/monitor/notifications/SignalGroupAlignmentNotificationTopologyTest.java