From eee6b12a6beb639e25c04a9b24c561da337c8765 Mon Sep 17 00:00:00 2001 From: Scott Fennell Date: Wed, 14 Mar 2018 13:33:13 -0500 Subject: [PATCH] #521 edit resource locations in test source --- trick_source/java/test/Makefile | 2 +- .../test/src/trick/common/utils/LogHeaderReaderTest.java | 6 +++--- .../java/test/src/trick/dre/WaitForDreApplication.java | 2 +- .../java/test/src/trick/sie/WaitForSieApplication.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/trick_source/java/test/Makefile b/trick_source/java/test/Makefile index 0f1cb542..71d43177 100644 --- a/trick_source/java/test/Makefile +++ b/trick_source/java/test/Makefile @@ -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 diff --git a/trick_source/java/test/src/trick/common/utils/LogHeaderReaderTest.java b/trick_source/java/test/src/trick/common/utils/LogHeaderReaderTest.java index 5de6ddd4..0cbbcb4d 100644 --- a/trick_source/java/test/src/trick/common/utils/LogHeaderReaderTest.java +++ b/trick_source/java/test/src/trick/common/utils/LogHeaderReaderTest.java @@ -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()); } diff --git a/trick_source/java/test/src/trick/dre/WaitForDreApplication.java b/trick_source/java/test/src/trick/dre/WaitForDreApplication.java index bb007657..28a6d6f7 100644 --- a/trick_source/java/test/src/trick/dre/WaitForDreApplication.java +++ b/trick_source/java/test/src/trick/dre/WaitForDreApplication.java @@ -29,7 +29,7 @@ public class WaitForDreApplication extends DreApplication { */ public static void launchAndWait(Class 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 { diff --git a/trick_source/java/test/src/trick/sie/WaitForSieApplication.java b/trick_source/java/test/src/trick/sie/WaitForSieApplication.java index dc1309c3..e3db1549 100644 --- a/trick_source/java/test/src/trick/sie/WaitForSieApplication.java +++ b/trick_source/java/test/src/trick/sie/WaitForSieApplication.java @@ -29,7 +29,7 @@ public class WaitForSieApplication extends SieApplication { */ public static void launchAndWait(Class 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 {