Changeset 657 in tmcsimulator for trunk

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.

Location:

trunk

Files:

• src/tmcsim/cadsimulator/Coordinator.java (modified) (1 diff)
• test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java (modified) (3 diffs)
• test/tmcsim/cadsimulator/SystemTest.java (modified) (3 diffs)
• test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java (modified) (2 diffs)
• test/tmcsim/highwaymodel/LoadHighwaysTest.java (modified) (5 diffs)

trunk/src/tmcsim/cadsimulator/Coordinator.java

@@ -609 +609 @@
             Path source = Paths.get(selectedFile);
             Files.copy(source, destination,REPLACE_EXISTING);
-            Logger.getLogger(Coordinator.class.getName()).log(Level.INFO,  
-                    "Loaded script copied to " + destination);
+            //Logger.getLogger(Coordinator.class.getName()).log(Level.INFO,  
+            //        "Loaded script copied to " + destination);
         } catch (IOException ex) {
             Logger.getLogger(Coordinator.class.getName()).log(Level.SEVERE, null, ex);

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";

trunk/test/tmcsim/cadsimulator/SystemTest.java

@@ -62 +62 @@
         });
 
-        // Check CAD Simulator appears with no script and nothing connected
+        // Check CAD Server appears with no script and nothing connected
         assertTrue("Title bar incorrect", cadwindow.getTitle().trim().startsWith("CAD Server"));
         Panel mainPanel = cadwindow.getPanel("contentPane");
@@ -72 +72 @@
         assertEquals("network id should be None", "None", mainPanel.getTextBox("networkLoadedTF").getText().trim());
 
-        ParamicsCommunicator pc = null;
-        pc = new ParamicsCommunicator("config/paramics_communicator_config.properties");
-        ParamicsCommunicatorGUI theGUI = new ParamicsCommunicatorGUI();
-        pc.setGUI(theGUI);
+
         // Note: Can't set visible ANY windows during UISpec test
-
-        // expect pcomm to say "sleeping"
 
         Window simMgrWindow = null;
@@ -100 +95 @@
         TextBox txtSimStatus = contentPanel.getTextBox("simulationStatusText");
         assertEquals("No Script", txtSimStatus.getText());
-        TextBox txtParamStatus = contentPanel.getTextBox("paramicsStatusInfoLabel");
-        assertEquals("Unknown", txtParamStatus.getText());
-        Button loadNetworkBtn = simMgrWindow.getButton("Load Network");
-        assertFalse(loadNetworkBtn.isEnabled());
-
-        Button paramicsBtn = simMgrWindow.getButton("Connect to Paramics");
-        paramicsBtn.click();
-        try
-        {
-            Thread.sleep(200);
-        } catch (Exception ex)
-        {
-        }
-        assertEquals("Disconnect from Paramics", paramicsBtn.getLabel());
-
-        assertEquals("Connected", txtParamStatus.getText());
-        pc.startReading();
-
-        loadNetworkBtn.click();
-        try
-        {
-            Thread.sleep(200);
-        } catch (Exception ex)
-        {
-        }
-        assertEquals("Sending Network ID", txtParamStatus.getText());
-        System.out.println("Sending Network ID");
-        assertFalse(loadNetworkBtn.isEnabled());
-        String warmingXML = "<Paramics>\n"
-                + "<Network_Status>WARMING</Network_Status>\n"
-                + "<Network_ID>1</Network_ID>\n"
-                + "</Paramics>";
-        writedata("paramics_status.xml", warmingXML);
-        try
-        {
-            Thread.sleep(2100);
-        } catch (Exception ex)
-        {
-        }
-        assertEquals("Warming Up", txtParamStatus.getText());
-        System.out.println("Warming Up Passed");
-
-        try
-        {
-            Thread.sleep(2100);
-        } catch (Exception ex)
-        {
-        }
-        String loadedXML = "<Paramics>\n"
-                + "<Network_Status>LOADED</Network_Status>"
-                + "<Network_ID>1</Network_ID>"
-                + "</Paramics>";
-        writedata("paramics_status.xml", loadedXML);
-        try
-        {
-            Thread.sleep(2100);
-        } catch (Exception ex)
-        {
-        }
-        //assertEquals("Network 1 Loaded", txtParamStatus.getText());
-        //assertEquals("network id should be 1", "1", mainPanel.getTextBox("networkLoadedTF").getText().trim());
 
 

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);
-    }
+    
 }

trunk/test/tmcsim/highwaymodel/LoadHighwaysTest.java

@@ -18 +18 @@
  */
 public class LoadHighwaysTest extends TestCase {
+    // 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 LoadHighwaysTest(String testName) {
@@ -28 +38 @@
         PrintWriter writer = null;
         try {
-            writer = new PrintWriter(new FileWriter("/tmp/postmiles1.txt"));
+            writer = new PrintWriter(new FileWriter(tmpPath + "postmiles1.txt"));
             writer.println("5 S 0.9,33.408425,-117.599923,CALAFIA,0,0");
             writer.println("5 N 1.24,33.413051,-117.601964,MAGDALENA,0,0");
             writer.println("5 S 1.49,33.416348,-117.603827,EL CAMINO REAL,0,0");
             writer.close();
-            writer = new PrintWriter(new FileWriter("/tmp/postmiles3.txt"));
+            writer = new PrintWriter(new FileWriter(tmpPath + "postmiles3.txt"));
             writer.println("73 N 23.9,33.643656,-117.859875,BISON 2,0.976131,0.217185");
             writer.println("55 S 6.88,33.697495,-117.862677,MACARTHU1,-0.710326,0.703873");
@@ -49 +59 @@
     protected void tearDown() throws Exception {
         super.tearDown();
-        Path path = FileSystems.getDefault().getPath("/tmp", "postmiles1.txt");
+        Path path = FileSystems.getDefault().getPath(tmpPath, "postmiles1.txt");
         Files.delete(path);
-        path = FileSystems.getDefault().getPath("/tmp", "postmiles3.txt");
+        path = FileSystems.getDefault().getPath(tmpPath, "postmiles3.txt");
         Files.delete(path);
     }
@@ -61 +71 @@
         System.out.println("testLoadHighways");
         Highways highways = new Highways(
-                "/tmp/postmiles1.txt");
+                tmpPath + "postmiles1.txt");
 
         // Test for correct number of highways
@@ -97 +107 @@
         System.out.println("testLoadHighways2");
         Highways highways = new Highways(
-                "/tmp/postmiles3.txt");
+                tmpPath + "postmiles3.txt");
 
         // Test for correct number of highways