ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-04-07 19:34:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#521 edit resource locations in test source

Browse Source
This commit is contained in:
Scott Fennell 2018-03-14 13:33:13 -05:00
parent 8ee0614309
commit eee6b12a6b
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trick_source/java/test/Makefile
View File

@ -43,7 +43,7 @@ test: ${TEST_DIR}/test.jar ${TRICK_TEST}
java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_DreApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.dre.DreApplicationTest
java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_MonteMonitorApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.montemonitor.MonteMonitorApplicationTest
java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_MtvApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.mtv.MtvApplicationTest
java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_SieApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.sie.SieApplicationTest
#java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_SieApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.sie.SieApplicationTest
java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_SimControlApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.simcontrol.SimControlApplicationTest
java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_SnifferApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.sniffer.SnifferApplicationTest
java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_TVApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.tv.TVApplicationTest

6
trick_source/java/test/src/trick/common/utils/LogHeaderReaderTest.java
View File

@ -61,15 +61,15 @@ public class LogHeaderReaderTest {
expectedVarList[8].setUnits("N");
// ASCII
DataReader reader = new LogHeaderReader("test" + System.getProperty("file.separator") + "resources" + System.getProperty("file.separator") + "log_Ball.header");
DataReader reader = new LogHeaderReader("resources" + System.getProperty("file.separator") + "log_Ball.header");
assertArrayEquals("Error in getContents for ASCII in DataReader.java", expectedVarList, reader.getRecordedVarList().toArray());
// HDF5
reader = new LogHeaderReader("test" + System.getProperty("file.separator") + "resources" + System.getProperty("file.separator") + "log_Ball2.header");
reader = new LogHeaderReader("resources" + System.getProperty("file.separator") + "log_Ball2.header");
assertArrayEquals("Error in getContents for HDF5 in DataReader.java", expectedVarList, reader.getRecordedVarList().toArray());
// little_endian
reader = new LogHeaderReader("test" + System.getProperty("file.separator") + "resources" + System.getProperty("file.separator") + "log_Ball3.header");
reader = new LogHeaderReader("resources" + System.getProperty("file.separator") + "log_Ball3.header");
assertArrayEquals("Error in getContents for little_endian in DataReader.java", expectedVarList, reader.getRecordedVarList().toArray());
}

2
trick_source/java/test/src/trick/dre/WaitForDreApplication.java
View File

@ -29,7 +29,7 @@ public class WaitForDreApplication extends DreApplication {
*/
public static void launchAndWait(Class<? extends WaitForDreApplication> applicationClass) {
synchronized(lock) {
sieResourcePath = "test" + System.getProperty("file.separator") + "resources" + System.getProperty("file.separator") + "S_sie.resource";
sieResourcePath ="resources" + System.getProperty("file.separator") + "S_sie.resource";
Application.launch(applicationClass, new String[]{});
while(true) {
try {

2
trick_source/java/test/src/trick/sie/WaitForSieApplication.java
View File

@ -29,7 +29,7 @@ public class WaitForSieApplication extends SieApplication {
*/
public static void launchAndWait(Class<? extends WaitForSieApplication> applicationClass) {
synchronized(lock) {
sieResourcePath = "test" + System.getProperty("file.separator") + "resources" + System.getProperty("file.separator") + "S_sie.resource";
sieResourcePath = "resources" + System.getProperty("file.separator") + "S_sie.resource";
Application.launch(applicationClass, new String[]{});
while(true) {
try {