Changeset 5 in tmcsimulator

Timestamp:

04/16/2016 12:54:43 PM (10 years ago)

Author:

jdalbey

Message:

CADSimulatorTest: added test of info messages text area.

Location:

trunk

Files:

• src/tmcsim/cadsimulator/CADSimulator.java (modified) (2 diffs)
• src/tmcsim/cadsimulator/viewer/SimulationStatusPanel.java (modified) (1 diff)
• test/tmcsim/cadsimulator/CADSimulatorTest.java (modified) (6 diffs)

trunk/src/tmcsim/cadsimulator/CADSimulator.java

@@ -70 +70 @@
     
     /** Error logger. */
-    private static Logger cadSimLogger = Logger.getLogger("tmcsim.simulationmanager");
+    private static Logger cadSimLogger = Logger.getLogger("tmcsim.cadsimulator");
 
     /**
@@ -161 +161 @@
         //Create the Coordinator and register it for RMI communicator.  Start the
         //CAD Simulator Socket Handler to begin to accept connections from CAD Clients.
-        try {         
+        try {
             theViewer             = new CADSimulatorViewer();
             theCoordinator        = new Coordinator();

trunk/src/tmcsim/cadsimulator/viewer/SimulationStatusPanel.java

@@ -393 +393 @@
         infoMessagesTA = new JTextArea(6, 30);
         infoMessagesTA.setEditable(false);
-        infoMessagesPane = new JScrollPane(errorMessagesTA);
+        infoMessagesTA.setName("infoMessagesTA");
+        infoMessagesPane = new JScrollPane(infoMessagesTA);
         infoMessagesPane.setPreferredSize(new Dimension(300, 100));
         
         infoMessagesPane.setBorder(BorderFactory.createTitledBorder(
                 BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), "Info Messages"));  
-
+        infoMessagesPane.setName("infoMessagesPane");
         
         errorMessagesTA = new JTextArea(6, 30);

trunk/test/tmcsim/cadsimulator/CADSimulatorTest.java

@@ -2 +2 @@
 
 import java.rmi.RemoteException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.swing.JScrollPane;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.fail;
@@ -67 +70 @@
                     {
                         app = new CADSimulator(System.getProperty("CAD_SIM_PROPERTIES"));
-                    } catch (Exception e)
+                    }
+                    catch (Exception e)
                     {
                         fail("Couldn't launch CADSimulator");
@@ -73 +77 @@
                 }
             });
-        } else
+        }
+        else
         {
             fail("CAD_SIM_PROPERTIES system property not defined.");
@@ -90 +95 @@
         app.theCoordinator.registerForCallback(ci);
         assertEquals("2", terminals.getText().trim());
-        
+
         SimulationManagerInterface si = new CADSimulatorTest.FakeSimMgr();
         app.theCoordinator.registerForCallback(si);
         assertEquals("Yes", mainPanel.getTextBox("managerConnectedTF").getText().trim());
-        
+
+        Logger cadSimLogger = Logger.getLogger("tmcsim.cadsimulator");
+        cadSimLogger.logp(Level.INFO, "", "", "Sample Info Message.");
+
+        Panel infoPane = mainPanel.getPanel("InfoMessagesPane");
+        TextBox infoText = infoPane.getTextBox("infoMessagesTA");
+        assertEquals(". = Sample Info Message.\n", infoText.getText());
+
         app = null;
-//        app.theViewer.dispose();
-//        Window confirmPopup = null;
-//        confirmPopup = WindowInterceptor.run(new Trigger()
-//        {
-//            public void run()
-//            {
-//                app.theViewer.closeViewer();
-//            }
-//        });
-//        confirmPopup.getButton("OK").click();
     }
 
-    class FakeClient implements CADClientInterface 
+    class FakeClient implements CADClientInterface
     {
+
         @Override
         public void refresh() throws RemoteException
@@ -115 +118 @@
             throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
         }
-    
     }
+
     class FakeSimMgr implements SimulationManagerInterface
     {
+
         @Override
         public void tick(long theTime) throws RemoteException
@@ -160 +164 @@
             throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
         }
-    
     }
-    
-    
 }