Changeset 56 in tmcsimulator-scriptbuilder for trunk

Timestamp:

08/14/2017 12:35:16 PM (9 years ago)

Author:

bmcguffin

Message:

Added test files and began filling them out. Added an integration test for XML loading and saving. Added several reference files to test against.

Location:

trunk

Files:

• nbproject/project.properties (modified) (2 diffs)
• src/scriptbuilder/structures/ScriptIncident.java (modified) (2 diffs)
• test/scriptbuilder/structures/ScriptIncidentTest.java (modified) (3 diffs)
• test/scriptbuilder/structures/SimulationScriptTest.java (added)
• test/scriptbuilder/structures/TimeSliceTest.java (added)
• test/scriptbuilder/structures/XMLFormatIntegrationTest.java (added)
• test/scriptbuilder/structures/script.dtd (added)
• test/scriptbuilder/structures/single_incident_output_expected.xml (added)
• test/scriptbuilder/structures/test_input_file.xml (added)
• test/scriptbuilder/structures/test_output_file.xml (added)

trunk/nbproject/project.properties

@@ -1 +1 @@
 #Thu Jul 27 20:31:16 PDT 2017
 excludes=
+file.reference.commons-io-2.5-javadoc.jar=/Applications/NetBeans/NetBeans 7.4.app/Contents/Resources/NetBeans/java/docs/commons-io-2.5-javadoc.jar
+file.reference.commons-io-2.5.jar=/Applications/NetBeans/NetBeans 7.4.app/Contents/Resources/NetBeans/java/modules/ext/commons-io-2.5.jar
 javac.deprecation=false
 build.test.results.dir=${build.dir}/test/results
@@ -46 +48 @@
     ${build.classes.dir}:\
     ${file.reference.mockito-1.10.19.jar}:\
-    ${libs.junit_4.classpath}:\
-    ${libs.Hamcrest.classpath}
+    ${libs.Hamcrest.classpath}:\
+    ${file.reference.commons-io-2.5.jar}:\
+    ${file.reference.commons-io-2.5-javadoc.jar}
 javadoc.private=false
 annotation.processing.run.all.processors=true

trunk/src/scriptbuilder/structures/ScriptIncident.java

@@ -6 +6 @@
 import java.io.FileWriter;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Observable;
 import java.util.TreeMap;
 import scriptbuilder.structures.events.I_ScriptEvent;
@@ -253 +250 @@
     void insertCadData(long currentEventTime, CadData cad)
     {
-        if(number == 100)
-        {
-            System.out.println("\n\n~~~INCIDENT 100 GOT HERE~~~\n");
-        }
-        
-        
         int time = (int) currentEventTime;
 

trunk/test/scriptbuilder/structures/ScriptIncidentTest.java

@@ -1 +1 @@
 package scriptbuilder.structures;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
 import java.util.ArrayList;
+import static junit.framework.Assert.assertTrue;
 import junit.framework.TestCase;
-import static org.mockito.Matchers.*;
+import org.apache.commons.io.FileUtils;
 import scriptbuilder.structures.events.*;
 import static org.mockito.Mockito.*;
@@ -159 +163 @@
         instance.setIncidentActive();
         verify(mockedScript, times(1)).broadcastEvent(isA(IncidentFocusedEvent.class));
-        
+
     }
 
@@ -176 +180 @@
     }
 
+    /**
+     * Test of saveIncidentToFile method, of class ScriptIncident.
+     */
+    public void testSaveIncidentToFile()
+    {
+        try
+        {
+            System.out.println("saveIncidentToFile");
+            File inFile = new File("test/scriptbuilder/structures/test_input_file.xml");
+            assertTrue(inFile.exists());
+            File referenceFile = new File("test/scriptbuilder/structures/single_incident_output_expected.xml");
+            assertTrue(referenceFile.exists());
+
+            File outFile = new File("test/scriptbuilder/structures/test_output_file.xml");
+            if (outFile.exists())
+            {
+                outFile.delete();
+            }
+            assertFalse(outFile.exists());
+            outFile.createNewFile();
+            assertTrue(outFile.exists());
+
+            ScriptIncident instance = null;
+            SimulationScript script = new SimulationScript();
+            script.loadScriptFromFile(inFile);
+
+            for (ScriptIncident inc : script.incidents)
+            {
+                if (inc != null && inc.number == 187)
+                {
+                    instance = inc;
+                }
+            }
+            if (instance != null)
+            {
+                instance.saveIncidentToFile(outFile);
+            }
+
+            assertTrue(inFile.exists());
+            assertTrue(outFile.exists());
+
+            //Check to see if the two files are identical
+            boolean result = FileUtils.contentEquals(referenceFile, outFile);
+
+            assertTrue(result);
+
+        }
+        catch (IOException ex)
+        {
+            fail("There was an IO exception. Check file names and locations.");
+        }
+    }
+
+    /**
+     * Test of toXML method, of class ScriptIncident.
+     */
+    public void testToXML()
+    {
+        try
+        {
+            System.out.println("toXML");
+            File inFile = new File("test/scriptbuilder/structures/test_input_file.xml");
+            assertTrue(inFile.exists());
+            File referenceFile = new File("test/scriptbuilder/structures/single_incident_output_expected.xml");
+            assertTrue(referenceFile.exists());
+            ScriptIncident instance = null;
+            SimulationScript script = new SimulationScript();
+            script.loadScriptFromFile(inFile);
+            for (ScriptIncident inc : script.incidents)
+            {
+                if (inc != null && inc.number == 187)
+                {
+                    instance = inc;
+                }
+            }
+
+            String expResult;
+
+            byte[] data = Files.readAllBytes(referenceFile.toPath());
+
+            expResult = new String(data);
+
+            String result = instance.toXML();
+            assertEquals(expResult, result);
+
+        }
+        catch (Exception ex)
+        {
+            fail("There was an IO exception. Check file names and locations.");
+        }
+    }
+
+    /**
+     * Test of insertCadData method, of class ScriptIncident.
+     */
+    public void testInsertCadData()
+    {
+        System.out.println("insertCadData");
+        CadData cad = new CadData();
+        mockedScript = mock(SimulationScript.class);
+        ScriptIncident instance = new ScriptIncident(100, "test", "test", mockedScript);
+
+        assertEquals(0, instance.slices.size());
+        instance.insertCadData(10, cad);
+        assertEquals(1, instance.slices.size());
+    }
 }