Changeset 656 in tmcsimulator for trunk/test

Timestamp:

09/11/2022 09:36:06 PM (4 years ago)

Author:

jdalbey

Message:

!CADSimulatorConsoleTest.java: fix defect in verify() method.

File:

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

trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java

@@ -78 +78 @@
     }
 
-    /**
-     * obsolete: compare StringWriter contents against expected
-     */
-    private void verify0(String msg, String expect)
-    {
-        String result = sw.toString().trim();
-        System.out.println(""+result);
-        result = result.replaceAll("\n", ",");
-        String fullExpect = expect.trim();
-        fullExpect = fullExpect.replaceAll("\n", ",");
-//        System.out.println(fullExpect);
-        System.out.println(result.substring(result.length() - fullExpect.length(), result.length()));
-//        String diff = StringUtils.difference(fullExpect, result);
-        boolean match = result.endsWith(fullExpect);
-        assertTrue(msg + ": " + result, match);
-    }
     /** compare StringWriter contents against expected
      *  @param expected contains just the most recent lines of output
@@ -103 +87 @@
         String[] results = sw.toString().trim().split("\n");   // 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 item=expecteds.length-1; item >= 0; item--)
+        for (int eIdx=expecteds.length-1; eIdx >= 0; eIdx--)
         {
-            //System.out.println("Verifying "+expecteds[item]+" against "+results[item]);
-            assertEquals(errmsg + " line "+item, expecteds[item], results[item]);
+            //System.out.println("Verifying "+eIdx+". "+expecteds[eIdx]+" against "+results[rIdx]);
+            assertEquals(errmsg + " line "+eIdx, expecteds[eIdx], results[rIdx]);
+            rIdx--;
         }    
     }            
@@ -158 +144 @@
         CADClientInterface ci = mock(CADClientInterface.class);
         app.theCoordinator.registerForCallback(ci);
-        pause(500);
+        System.out.println(""+sw.toString());
         verify("connected 1 terminal output incorrect: ", expected2);
         String expected3 =