Fix failing tests

khyatimahendru · Jan 22, 2025 · 48336d4 · 48336d4
1 parent d163e01
commit 48336d4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/udmis/src/test/java/com/google/bos/udmi/service/messaging/impl/FileMessagePipeTest.java b/udmis/src/test/java/com/google/bos/udmi/service/messaging/impl/FileMessagePipeTest.java
@@ -107,7 +107,7 @@ public void tracePlayback() {
     fileMessagePipe.activate(consumed::add);
     fileMessagePipe.awaitShutdown();
 
-    assertEquals(14, consumed.size(), "playback messages");
+    assertEquals(15, consumed.size(), "playback messages");
 
     List<String> errors =
         consumed.stream().filter(bundle -> bundle.message instanceof String)

diff --git a/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java b/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java
@@ -800,9 +800,11 @@ public void validateDeviceMessage(ReportingDevice device, Map<String, Object> me
       Map<String, String> attributes) {
     String schemaName = ofNullable(attributes.get(SCHEMA_NAME_KEY)).orElseGet(
         () -> messageSchema(attributes));
+
     if (SubType.REPLY.value().equals(attributes.get(SUBTYPE_PROPERTY_KEY))) {
       return;
     }
+
     upgradeMessage(schemaName, message);
 
     // Assume the attributes know what they're doing when the schema name is provided explicitly.

diff --git a/validator/src/test/java/com/google/daq/mqtt/validator/PlaybackTest.java b/validator/src/test/java/com/google/daq/mqtt/validator/PlaybackTest.java
@@ -29,7 +29,7 @@ public class PlaybackTest extends TestBase {
   @Test
   public void simpleTraceReport() {
     MessageReadingClient client = validateTrace(SIMPLE_TRACE_DIR);
-    assertEquals("trace message count", 13, client.messageCount);
+    assertEquals("trace message count", 14, client.messageCount);
     List<OutputBundle> outputMessages = client.getOutputMessages();
     OutputBundle lastBundle = outputMessages.get(outputMessages.size() - 1);
     ValidationState finalReport = asValidationState(lastBundle.message);
@@ -94,7 +94,7 @@ public void notMissingDevice() {
   @Test
   public void deviceArgs() {
     MessageReadingClient client = validateTrace(SIMPLE_TRACE_DIR, TRACE_DEVICES);
-    assertEquals("trace message count", 13, client.messageCount);
+    assertEquals("trace message count", 14, client.messageCount);
     List<OutputBundle> outputMessages = client.getOutputMessages();
     TreeMap<String, Object> lastMessage = outputMessages.get(outputMessages.size() - 1).message;
     ValidationState finalReport = asValidationState(lastMessage);