Skip to content
Snippets Groups Projects
Commit 812867eb authored by Florian Lugou's avatar Florian Lugou Committed by Fabien Tessier
Browse files

added library to test dependencies and fixed bug in path for test classes

parent 8acc5d2d
No related branches found
No related tags found
2 merge requests!30Merge project manager into master,!29Resolve "Implement Project Management in TTool"
...@@ -34,7 +34,7 @@ subprojects { ...@@ -34,7 +34,7 @@ subprojects {
} }
} }
test.workingDir "${rootProject.absPath}/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util" test.workingDir "${rootProject.absPath}/ttool/build"
libsDirName = "${rootProject.absPath}/build" libsDirName = "${rootProject.absPath}/build"
task copyRuntimeLibs(type: Copy) { task copyRuntimeLibs(type: Copy) {
......
...@@ -31,6 +31,7 @@ dependencies { ...@@ -31,6 +31,7 @@ dependencies {
// Use JUnit test framework // Use JUnit test framework
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile group: 'org.hamcrest', name: 'hamcrest-core', version: '1.3' testCompile group: 'org.hamcrest', name: 'hamcrest-core', version: '1.3'
testCompile files('src/test/libs/fr.tpt.mem4csd.utils.compare_1.0.0.jar')
} }
jar { jar {
......
...@@ -24,9 +24,9 @@ public class TestRshClient { ...@@ -24,9 +24,9 @@ public class TestRshClient {
private static final String EXPECTED_COMMAND_OUTPUT = "!!!Hello World!!!" + System.lineSeparator(); private static final String EXPECTED_COMMAND_OUTPUT = "!!!Hello World!!!" + System.lineSeparator();
private static final String TEST_PROGRAM_NAME = "helloWorld"; private static final String TEST_PROGRAM_NAME = "helloWorld";
private static final String TEST_COMMAND = "./resources/launcher/" + TEST_PROGRAM_NAME; private static final String TEST_COMMAND = "./resources/test/launcher/" + TEST_PROGRAM_NAME;
private static final String TEST_COMMAND_NON_STOP = "./resources/launcher/helloWorldNonStop"; private static final String TEST_COMMAND_NON_STOP = "./resources/test//launcher/helloWorldNonStop";
private static final String TEST_FILE_NAME = "./resources/launcher/test.txt"; private static final String TEST_FILE_NAME = "./resources/test/launcher/test.txt";
private static final String TEST_FILE_DATA = "testDatafhkenomrcg ,jgh o"; private static final String TEST_FILE_DATA = "testDatafhkenomrcg ,jgh o";
......
...@@ -16,7 +16,7 @@ import myutil.FileUtils; ...@@ -16,7 +16,7 @@ import myutil.FileUtils;
public class TestGTURTLEModeling extends AbstractUITest { public class TestGTURTLEModeling extends AbstractUITest {
private static final String RESOURCES_DIR = "resources/ui/generateccode/"; private static final String RESOURCES_DIR = "resources/test/ui/generateccode/";
private final IComparator textComparator; private final IComparator textComparator;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment