Changeset 558 in tmcsimulator


Ignore:
Timestamp:
01/16/2020 12:13:14 PM (6 years ago)
Author:
jdalbey
Message:

Change hardcoded "scripts" as name of folder to a constant in SimulationManager?. See #228.

Location:
trunk/test/tmcsim
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java

    r455 r558  
    1313import tmcsim.interfaces.CADClientInterface; 
    1414import tmcsim.interfaces.SimulationManagerInterface; 
     15import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder; 
    1516 
    1617/** 
    … …  
    8687 
    8788        // Load a script file 
    88         String autoloadScriptname = "scripts/one-incident.xml"; 
     89        String autoloadScriptname = kScenarioFolder+"/one-incident.xml"; 
    8990        app.theCoordinator.loadScriptFile(new File(autoloadScriptname)); 
    9091        // The status should now say Ready 

  • trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java

    r455 r558  
    1616import tmcsim.interfaces.CADClientInterface; 
    1717import tmcsim.interfaces.SimulationManagerInterface; 
     18import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder; 
    1819 
    1920/** 
    … …  
    237238        System.out.println("Sim status"); 
    238239        // Load a script file - to put status at Ready 
    239         String autoloadScriptname = "scripts/one-incident.xml"; 
     240        String autoloadScriptname = kScenarioFolder+"/one-incident.xml"; 
    240241        app.theCoordinator.loadScriptFile(new File(autoloadScriptname)); 
    241242        pause(500); 
    … …  
    319320    { 
    320321        new File("scripts").mkdir(); 
    321         writedata("scripts/Cardfile.xml", cardfileData); 
    322         writedata("scripts/one-incident.xml", oneincidentXML); 
     322        writedata(kScenarioFolder+"/Cardfile.xml", cardfileData); 
     323        writedata(kScenarioFolder+"/one-incident.xml", oneincidentXML); 
    323324    } 
    324325 

  • trunk/test/tmcsim/cadsimulator/CADSimulatorFixture.java

    r123 r558  
    1313import java.util.logging.Logger; 
    1414import static tmcsim.cadsimulator.CADSimulatorFixture.bos; 
     15import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder; 
    1516 
    1617/** 
    … …  
    6768    public static void writeScriptfiles() 
    6869    { 
    69         writeFileFromURL("scripts/Cardfile.xml", cardfileURL); 
    70         writeFileFromURL("scripts/one-incident.xml", smallXMLURL); 
     70        writeFileFromURL(kScenarioFolder+"/Cardfile.xml", cardfileURL); 
     71        writeFileFromURL(kScenarioFolder+"/one-incident.xml", smallXMLURL); 
    7172    } 
    7273 

  • trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java

    r422 r558  
    1616import tmcsim.interfaces.CADClientInterface; 
    1717import tmcsim.interfaces.SimulationManagerInterface; 
     18import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder; 
    1819 
    1920/** 
    … …  
    139140 
    140141        // Load a script file 
    141         String autoloadScriptname = "scripts/one-incident.xml"; 
     142        String autoloadScriptname = kScenarioFolder+"/one-incident.xml"; 
    142143        app.theCoordinator.loadScriptFile(new File(autoloadScriptname)); 
    143144        // The status should now say Ready 

  • trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java

    r422 r558  
    1919import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI; 
    2020import tmcsim.simulationmanager.SimulationManager; 
     21import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder; 
    2122 
    2223/** 
    … …  
    149150 
    150151        // Load a script file 
    151         String autoloadScriptname = "scripts/audio_systest.xml"; 
     152        String autoloadScriptname = kScenarioFolder+"/audio_systest.xml"; 
    152153        simMgrApp.loadScript(new File(autoloadScriptname)); 
    153154        try 

  • trunk/test/tmcsim/cadsimulator/SystemTest.java

    r422 r558  
    1515import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI; 
    1616import tmcsim.simulationmanager.SimulationManager; 
     17import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder; 
    1718 
    1819/** 
    … …  
    163164 
    164165        // Load a script file 
    165         String autoloadScriptname = "scripts/system_test_script.xml"; 
     166        String autoloadScriptname = kScenarioFolder+"/system_test_script.xml"; 
    166167        simMgrApp.loadScript(new File(autoloadScriptname)); 
    167168        try 

  • trunk/test/tmcsim/cadsimulator/VisibleSystemDemoDriver.java

    r422 r558  
    1414import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI; 
    1515import tmcsim.simulationmanager.SimulationManager; 
     16import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder; 
    1617 
    1718/** 
    … …  
    137138 
    138139        // Load a script file 
    139         String autoloadScriptname = "scripts/audio_systest.xml"; 
     140        String autoloadScriptname = kScenarioFolder+"/audio_systest.xml"; 
    140141        simMgrApp.loadScript(new File(autoloadScriptname)); 
    141142        try 

  • trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java

    r228 r558  
    1717import tmcsim.common.ScriptException; 
    1818import tmcsim.common.SimulationException; 
     19import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder; 
    1920 
    2021/** 
    … …  
    109110 
    110111        // Load a script file 
    111         String autoloadScriptname = "scripts/practice_script_2016.xml"; 
     112        String autoloadScriptname = kScenarioFolder+"/practice_script_2016.xml"; 
    112113        SimulationManagerModel simMgrModel = simMgrApp.theSimManagerModel; 
    113114        simMgrModel.loadScript(new File(autoloadScriptname)); 
Note: See TracChangeset for help on using the changeset viewer.