From 812867eb64a8e4d09ca80a0efc0734c20e46bdf4 Mon Sep 17 00:00:00 2001
From: Florian Lugou <florian.lugou@telecom-paristech.fr>
Date: Tue, 21 Nov 2017 17:16:39 +0100
Subject: [PATCH] added library to test dependencies and fixed bug in path for
test classes
---
build.gradle | 2 +-
ttool/build.gradle | 1 +
ttool/src/test/java/launcher/TestRshClient.java | 6 +++---
ttool/src/test/java/ui/TestGTURTLEModeling.java | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/build.gradle b/build.gradle
index 5dafb00189..668f8911b1 100644
--- a/build.gradle
+++ b/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) {
diff --git a/ttool/build.gradle b/ttool/build.gradle
index 428c2830ce..2adfb21822 100644
--- a/ttool/build.gradle
+++ b/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 {
diff --git a/ttool/src/test/java/launcher/TestRshClient.java b/ttool/src/test/java/launcher/TestRshClient.java
index a6ab1e75a8..4a3dc390b0 100644
--- a/ttool/src/test/java/launcher/TestRshClient.java
+++ b/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";
diff --git a/ttool/src/test/java/ui/TestGTURTLEModeling.java b/ttool/src/test/java/ui/TestGTURTLEModeling.java
index 1f8f184c73..e9c8e40823 100644
--- a/ttool/src/test/java/ui/TestGTURTLEModeling.java
+++ b/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;
--
GitLab