Changeset 655 in tmcsimulator for trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java

Timestamp:

09/11/2022 04:28:42 PM (4 years ago)

Author:

jdalbey

Message:

Improve unit tests.

File:

• trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java (modified) (5 diffs)

trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java

@@ -30 +30 @@
     private CADConsoleViewer console;
     private StringWriter sw;
-
+    // Setup a path for temp files
+    static String tmpPath = "/tmp/";// default path is for linux
+    static
+    {
+        String myOs = System.getProperty("os.name").toLowerCase();
+        if (myOs.indexOf("win") >= 0) 
+        {
+          tmpPath = "C:/TEMP/";  // alt path for Windows
+        }
+    }
     public CADSimulatorConsoleTest(String testName)
     {
@@ -70 +79 @@
 
     /**
-     * compare StringWriter contents against expected
+     * obsolete: compare StringWriter contents against expected
      */
-    private void verify(String msg, String expect)
+    private void verify0(String msg, String expect)
     {
         String result = sw.toString().trim();
@@ -85 +94 @@
         assertTrue(msg + ": " + result, match);
     }
-
+    /** compare StringWriter contents against expected
+     *  @param expected contains just the most recent lines of output
+     *  @param errmsg message to be displayed if test fails
+     *  improved to verify line by line
+     */
+    private void verify(String errmsg, String expect)
+    {
+        String[] results = sw.toString().trim().split("\n");   // split into lines
+        String[] expecteds = expect.trim().split("\n");
+        // Work backwards from the most recent line of output 
+        for (int item=expecteds.length-1; item >= 0; item--)
+        {
+            //System.out.println("Verifying "+expecteds[item]+" against "+results[item]);
+            assertEquals(errmsg + " line "+item, expecteds[item], results[item]);
+        }    
+    }            
     public static void pause(int millis)
     {
@@ -134 +158 @@
         CADClientInterface ci = mock(CADClientInterface.class);
         app.theCoordinator.registerForCallback(ci);
+        pause(500);
         verify("connected 1 terminal output incorrect: ", expected2);
         String expected3 =
@@ -286 +311 @@
             +"FEPSim_IP_addr = localhost\n"
             +"Output_Destination = Console\n"
-            +"Highway_Status_File = /tmp/highway_status.json\n";
+            +"Highway_Status_File = "+tmpPath+"highway_status.json\n";
     static final String paramicsData = "ParamicsCommHost = 127.0.0.1\n"
             + "ParamicsCommPort       = 4450\n"