Changeset 50 in tmcsimulator

Timestamp:

07/02/2016 03:41:05 PM (10 years ago)

Author:

jdalbey

Message:

ParamicsLogFileHandlerTest?.java: Revised to use CADSimulator so no log errors are written.

Location:

trunk

Files:

• src/tmcsim/application.properties (modified) (1 diff)
• test/tmcsim/paramicslog/ParamicsLogFileHandlerTest.java (modified) (2 diffs)

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Sat, 02 Jul 2016 09:45:14 -0700
+#Sat, 02 Jul 2016 16:19:54 -0700
 
-Application.revision=47
+Application.revision=49
 
 Application.buildnumber=19

trunk/test/tmcsim/paramicslog/ParamicsLogFileHandlerTest.java

@@ -10 +10 @@
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
 import junit.framework.TestCase;
+import tmcsim.cadsimulator.CADSimulator;
 import tmcsim.common.ScriptException;
 import tmcsim.common.SimulationException;
@@ -39 +41 @@
     {
         System.out.println("getInstance");
+        try
+        {
+            new CADSimulator("config/testConfig/cad_simulator_console_config.properties");
+        } catch (Exception e)
+        {
+            fail("Couldn't launch CADSimulator");
+        }
         //ParamicsLog plog = ParamicsLog.getInstance();
         Properties paramicsLogProp = new Properties();
         paramicsLogProp.load(new FileInputStream(propsfile));
         String logFilename = paramicsLogProp.getProperty("LogFile");
-        // This test assumes there is NO CADSimulator running.
+        // This test requires a CADSimulator running.
         Logger logger = Logger.getLogger("tmcsim.parmicsLog");
         ParamicsLogFileHandler fh = ParamicsLogFileHandler.getInstance();
         logger.addHandler(fh);
+        // write a message to the log.
         logger.info("Hello friendly log.");
+        // Read from the log file and see if the desired msg is there.
         File logFile = new File(logFilename);
         assertTrue("log file doesn't exist", logFile.exists());
-        String expected = "\n<!-- Time written to file: ? -->\nHello friendly log.\n";
+        String expected = "\n<!-- Time written to file: 00:00:00 -->\nHello friendly log.\n";
         String actual = fh.getLog();
         assertEquals("log written incorrectly", expected, actual);