Changeset 657 in tmcsimulator for trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java

Timestamp:

09/12/2022 01:30:08 PM (4 years ago)

Author:

jdalbey

Message:

Update unit tests to run on Windows (path and line separators), remove obsolete paramics test.

File:

• trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java (modified) (2 diffs)

trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java

@@ -34 +34 @@
         console.setWriter(sw);
     }
-    /**
-     * compare StringWriter contents against expected
+    /** 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 msg, String expect)
-    {
-        String result = sw.toString().trim();
-        result = result.replaceAll("\n", ",");
-        String fullExpect = expect.trim();
-        fullExpect = fullExpect.replaceAll("\n", ",");
-        assertTrue(msg + ": " + result, result.endsWith(fullExpect));
-    }
+    private void verify(String errmsg, String expect)
+    {
+        
+        String result = sw.toString().trim().replace("\r","");  // Remove windows line feed characters
+        String[] results = result.split("\n"); //System.getProperty("line.separator"));   // split into lines
+        String[] expecteds = expect.trim().split("\n");
+        int rIdx = results.length-1;  // index to results array
+        // Work backwards from the most recent line of output 
+        for (int eIdx=expecteds.length-1; eIdx >= 0; eIdx--)
+        {
+            //System.out.println("Verifying "+eIdx+". "+expecteds[eIdx]+" against "+results[rIdx]);
+            assertEquals(errmsg + " line "+eIdx, expecteds[eIdx], results[rIdx]);
+            rIdx--;
+        }    
+    }  
 
     public static void pause(int millis)
@@ -233 +242 @@
     }
 
-    public void testNetworkID()
-    {
-        String expected10 =
-                "--- CAD Simulator ---\n"
-                + "Elapsed Simulation Time     : 0:00:00\n"
-                + "Status                      : No Script\n"
-                + "Connected CAD Terminals     : 0\n"
-                + "Simulation Manager Connected: No\n"
-                + "Connected to Paramics       : No\n"
-                + "Network Loaded              : 17\n"
-                + "-- Info Messages --\n\n"
-                + "-- Error Messages --\n\n";
-        // this will tell the model it has a new network ID
-        cadmodel.setParamicsNetworkLoaded("17");
-        cadmodel.setParamicsStatus(CADEnums.PARAMICS_STATUS.LOADED);
-        pause(500);
-        verify("network id should be 17", expected10);
-    }
+    
 }