Changeset 657 in tmcsimulator for trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.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/CADSimulatorConsoleTest.java (modified) (3 diffs)

trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java

@@ -85 +85 @@
     private void verify(String errmsg, String expect)
     {
-        String[] results = sw.toString().trim().split("\n");   // split into lines
+        
+        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
@@ -234 +236 @@
                 + "Network Loaded              : None\n"
                 + "-- Info Messages --\n"
-                + ". = Console Info Message."
-                + "tmcsim.cadsimulator.Coordinator.copyXMLfile = Loaded script copied to webapps/dynamicdata/incident_script.xml\n"
+                + ". = Console Info Message.\n"
                 + "-- Error Messages --\n"
                 + "Someclass.Somemethod = Sample error message.\n";
@@ -247 +248 @@
                 + "Network Loaded              : None\n"
                 + "-- Info Messages --\n"
-                + ". = Console Info Message."
-                + "tmcsim.cadsimulator.Coordinator.copyXMLfile = Loaded script copied to webapps/dynamicdata/incident_script.xml\n"
+                + ". = Console Info Message.\n"
                 + "-- Error Messages --\n"
                 + "Someclass.Somemethod = Sample error message.\n";