Handle legacy state messages

.github/workflows/testing.yml

@@ -30,6 +30,9 @@ jobs:
         run: bin/test_mosquitto
       - name: bin/run_tests udmis_tests
         run: bin/run_tests udmis_tests
+      - name: udmis test output
+        if: ${{ always() }}
+        run: more out/test_* | cat
 
   unit:
     name: Unit Tests

udmis/src/test/java/com/google/bos/udmi/service/core/ProcessorTestBase.java

@@ -11,8 +11,6 @@
 import com.google.bos.udmi.service.pod.UdmiServicePod;
 import com.google.udmi.util.CleanDateFormat;
 import java.io.File;
-import java.io.IOException;
-import java.rmi.RemoteException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -30,8 +28,27 @@ public abstract class ProcessorTestBase extends MessageTestBase {
   public static final Date TEST_TIMESTAMP = CleanDateFormat.cleanDate();
   public static final String TEST_FUNCTIONS = "functions-version";
   protected final List<Object> captured = new ArrayList<>();
-  private ProcessorBase processor;
   protected IotAccessBase provider;
+  private ProcessorBase processor;
+
+  /**
+   * Write a deployment file for testing.
+   */
+  public static void writeVersionDeployFile() {
+    File deployFile = new File(ReflectProcessor.DEPLOY_FILE);
+    try {
+      deleteDirectory(deployFile.getParentFile());
+      deployFile.getParentFile().mkdirs();
+      SetupUdmiConfig deployedVersion = new SetupUdmiConfig();
+      deployedVersion.deployed_at = TEST_TIMESTAMP;
+      deployedVersion.deployed_by = TEST_USER;
+      deployedVersion.udmi_functions = TEST_FUNCTIONS;
+      deployedVersion.udmi_version = TEST_VERSION;
+      writeFile(deployedVersion, deployFile);
+    } catch (Exception e) {
+      throw new RuntimeException("While writing deploy file " + deployFile.getAbsolutePath(), e);
+    }
+  }
 
   protected int getDefaultCount() {
     return getMessageCount(Object.class);
@@ -45,6 +62,15 @@ protected int getMessageCount(Class<?> clazz) {
     return processor.getMessageCount(clazz);
   }
 
+  @NotNull
+  protected abstract Class<? extends ProcessorBase> getProcessorClass();
+
+  protected <T> T initializeTestInstance(@SuppressWarnings("unused") Class<T> clazz) {
+    initializeTestInstance();
+    //noinspection unchecked
+    return (T) processor;
+  }
+
   protected void initializeTestInstance() {
     try {
       UdmiServicePod.resetForTest();
@@ -56,6 +82,15 @@ protected void initializeTestInstance() {
     }
   }
 
+  protected void terminateAndWait() {
+    getReverseDispatcher().terminate();
+    getTestDispatcher().awaitShutdown();
+    getTestDispatcher().terminate();
+    getReverseDispatcher().awaitShutdown();
+    provider.shutdown();
+    processor.shutdown();
+  }
+
   private void activateReverseProcessor() {
     MessageDispatcherImpl reverseDispatcher = getReverseDispatcher();
     reverseDispatcher.registerHandler(Object.class, this::resultHandler);
@@ -76,37 +111,6 @@ private void createProcessorInstance() {
     provider.activate();
   }
 
-  /**
-   * Write a deployment file for testing.
-   */
-  public static void writeVersionDeployFile() {
-    File deployFile = new File(ReflectProcessor.DEPLOY_FILE);
-    try {
-      deleteDirectory(deployFile.getParentFile());
-      deployFile.getParentFile().mkdirs();
-      SetupUdmiConfig deployedVersion = new SetupUdmiConfig();
-      deployedVersion.deployed_at = TEST_TIMESTAMP;
-      deployedVersion.deployed_by = TEST_USER;
-      deployedVersion.udmi_functions = TEST_FUNCTIONS;
-      deployedVersion.udmi_version = TEST_VERSION;
-      writeFile(deployedVersion, deployFile);
-    } catch (Exception e) {
-      throw new RuntimeException("While writing deploy file " + deployFile.getAbsolutePath(), e);
-    }
-  }
-
-  @NotNull
-  protected abstract Class<? extends ProcessorBase> getProcessorClass();
-
-  protected void terminateAndWait() {
-    getReverseDispatcher().terminate();
-    getTestDispatcher().awaitShutdown();
-    getTestDispatcher().terminate();
-    getReverseDispatcher().awaitShutdown();
-    provider.shutdown();
-    processor.shutdown();
-  }
-
   private void resultHandler(Object message) {
     captured.add(message);
   }

udmis/src/test/java/com/google/bos/udmi/service/core/StateProcessorTest.java

@@ -2,6 +2,7 @@
 
 import static com.google.udmi.util.GeneralUtils.ifNotNullGet;
 import static com.google.udmi.util.JsonUtil.fromStringStrict;
+import static com.google.udmi.util.JsonUtil.loadFileRequired;
 import static com.google.udmi.util.JsonUtil.stringify;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -14,6 +15,8 @@
 
 import com.google.bos.udmi.service.messaging.impl.MessageBase.Bundle;
 import com.google.udmi.util.CleanDateFormat;
+import com.google.udmi.util.GeneralUtils;
+import com.google.udmi.util.JsonUtil;
 import java.util.Date;
 import java.util.function.Function;
 import org.jetbrains.annotations.NotNull;
@@ -34,6 +37,7 @@
 public class StateProcessorTest extends ProcessorTestBase {
 
   public static final Date INITIAL_LAST_START = CleanDateFormat.cleanDate(new Date(12981837));
+  private static final String BAD_STATE_MESSAGE_FILE = "src/test/messages/bad_state.json";
 
   @NotNull
   protected Class<? extends ProcessorBase> getProcessorClass() {
@@ -136,6 +140,12 @@ public void multiExpansion() {
     assertEquals(1, getDefaultCount(), "default handler count");
   }
 
+  @Test
+  public void badMessage() {
+    StateProcessor processor = initializeTestInstance(StateProcessor.class);
+    processor.defaultHandler(loadFileRequired(Object.class, BAD_STATE_MESSAGE_FILE));
+  }
+
   /**
    * Test that a state update with one sub-block results in a received message of the proper type.
    */

udmis/src/test/java/com/google/bos/udmi/service/core/TargetProcessorTest.java

@@ -3,7 +3,6 @@
 import static com.google.bos.udmi.service.core.ProcessorBase.REFLECT_REGISTRY;
 import static com.google.udmi.util.JsonUtil.toMap;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.times;

udmis/src/test/messages/bad_state.json

@@ -0,0 +1 @@
+{"timestamp":"2023-08-08T16:32:31.000Z","version":"1","system":{"last_config":"2023-08-08T13:07:00Z","operational":true,"serial_no":"30000852","hardware":{"make":"EasyIO","model":"FS32","sku":"PLACEHOLDER","rev":"PLACEHOLDER"},"software":{"firmware":"V3.0b53"}},"pointset":{"points":{"temperature_sensor":{"units":"Degrees-Celsius"}}}}