Merge branch 'bugfix' into 'master'

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

See merge request !25

build.gradle

@@ -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"
 
     task copyRuntimeLibs(type: Copy) {

ttool/build.gradle

@@ -31,6 +31,7 @@ dependencies {
     // Use JUnit test framework
     testCompile 'junit:junit:4.12'
     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 {

ttool/src/test/java/launcher/TestRshClient.java

@@ -24,9 +24,9 @@ public class TestRshClient {
 
     private static final String EXPECTED_COMMAND_OUTPUT = "!!!Hello World!!!" + System.lineSeparator();
     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_NON_STOP = "./resources/launcher/helloWorldNonStop";
-    private static final String TEST_FILE_NAME = "./resources/launcher/test.txt";
+    private static final String TEST_COMMAND = "./resources/test/launcher/" + TEST_PROGRAM_NAME;
+    private static final String TEST_COMMAND_NON_STOP = "./resources/test//launcher/helloWorldNonStop";
+    private static final String TEST_FILE_NAME = "./resources/test/launcher/test.txt";
     private static final String TEST_FILE_DATA = "testDatafhkenomrcg ,jgh o";
 
 

ttool/src/test/java/ui/TestGTURTLEModeling.java

@@ -16,7 +16,7 @@ import myutil.FileUtils;
 
 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;