Changeset 471 in tmcsimulator for trunk/test/tmcsim

Timestamp:

07/29/2019 01:36:40 PM (7 years ago)

Author:

jdalbey

Message:

Coordinator.java: Fix defect 181 in sorting CADcomments. logging_service error messages improved.

File:

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

trunk/test/tmcsim/cadsimulator/CoordinatorTest.java

@@ -30 +30 @@
     public void testWriteToCADLog() throws RemoteException
     {
-        System.out.println("write to CAD log");
+        System.out.println("testing write to CAD log");
         Coordinator coord = new Coordinator(null,"","");
         Vector<Incident> incList = new Vector<Incident>();
@@ -51 +51 @@
         List<String> result = coord.getSortedComments(incList);
         assertTrue(result != null);
-        assert (result.get(0).startsWith("00"));
-        assert (result.get(1).startsWith("01"));
-        assert (result.get(2).startsWith("03"));
-        assert (result.get(3).startsWith("10"));
+        assertTrue (result.get(0).startsWith("00"));
+        assertTrue (result.get(1).startsWith("01"));
+        assertTrue (result.get(2).startsWith("03"));
+        assertTrue (result.get(3).startsWith("10"));
+    }    
+    public void testBadDataWriteToCADLog() throws RemoteException
+    {
+        System.out.println("test int conversion in write to CAD log");
+        Coordinator coord = new Coordinator(null,"","");
+        Vector<Incident> incList = new Vector<Incident>();
+        Incident inci1 = new Incident(201, "Alpha", 10L);
+        Incident inci2 = new Incident(209, "Bravo", 20L);
+        Incident inci3 = new Incident(209, "Charly", 20L);
+        String[] fields1 = {"date","01:01:01","JHD","?","two"};
+        String[] fields2 = {"date","99999999209","JHD","?","one"};
+        String[] fields3 = {"date","INVALID","JHD","?","one"};
+        inci1.addToCommentsNotesTable(fields1);
+        inci2.addToCommentsNotesTable(fields2);
+        inci2.addToCommentsNotesTable(fields3);
+        incList.add(inci1);
+        incList.add(inci2);
+        incList.add(inci3);
+        List<String> result = coord.getSortedComments(incList);
+        assertTrue(result != null);
+        assertTrue (result.get(0).startsWith("INVALID"));
+        assertTrue (result.get(1).startsWith("01"));
+        assertTrue (result.get(2).startsWith("99"));
     }    
 }