From 8a21c0cdf5077b70fe2baaf2efcf0fca82370504 Mon Sep 17 00:00:00 2001 From: apvrille <ludovic.apvrille@eurecom.fr> Date: Thu, 12 Oct 2017 15:43:13 +0200 Subject: [PATCH] Removing old tests --- .../Avatar/AvatarBoolExprTests.java | 0 .../Avatar/AvatarGuardTests.java | 0 .../Avatar/AvatarPragmaTests.java | 0 .../Avatar/AvatarSafetyTests.java | 0 .../Avatar/ProVerif/typed.txt | 0 .../Avatar/ProVerif/untyped.txt | 0 {tests => oldTest_DoNotUse}/TToolTest.java | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../models/test_code_gen_hwa.xml | 0 .../models/test_dma.xml | 0 {tests => oldTest_DoNotUse}/test.mk | 0 .../ui/fr.tpt.ttool.tests.ui/.classpath | 0 .../ui/fr.tpt.ttool.tests.ui/.gitignore | 0 .../ui/fr.tpt.ttool.tests.ui/.project | 0 .../assertj-swing-3.8.0.jar | Bin .../tpt/ttool/tests/ui/MoveComponentTest.java | 0 .../util/fr.tpt.ttool.tests.util/.classpath | 0 .../util/fr.tpt.ttool.tests.util/.gitignore | 0 .../util/fr.tpt.ttool.tests.util/.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../launch/TToolUtilTestsRunner.launch | 0 .../launch/TestRshClient.launch | 0 .../resources/helloWorld | Bin .../resources/helloWorldNonStop | Bin .../tests/util/TToolUtilTestsRunner.java | 0 .../tests/util/remote/TestRshClient.java | 0 .../avatartranslator/AvatarGuardTests.java | 90 +++++++++--------- 30 files changed, 45 insertions(+), 45 deletions(-) rename {tests => oldTest_DoNotUse}/Avatar/AvatarBoolExprTests.java (100%) rename {tests => oldTest_DoNotUse}/Avatar/AvatarGuardTests.java (100%) rename {tests => oldTest_DoNotUse}/Avatar/AvatarPragmaTests.java (100%) rename {tests => oldTest_DoNotUse}/Avatar/AvatarSafetyTests.java (100%) rename {tests => oldTest_DoNotUse}/Avatar/ProVerif/typed.txt (100%) rename {tests => oldTest_DoNotUse}/Avatar/ProVerif/untyped.txt (100%) rename {tests => oldTest_DoNotUse}/TToolTest.java (100%) rename {tests => oldTest_DoNotUse}/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.classpath (100%) rename {tests => oldTest_DoNotUse}/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.gitignore (100%) rename {tests => oldTest_DoNotUse}/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.project (100%) rename {tests => oldTest_DoNotUse}/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.settings/org.eclipse.jdt.core.prefs (100%) rename {tests => oldTest_DoNotUse}/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/models/test_code_gen_hwa.xml (100%) rename {tests => oldTest_DoNotUse}/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/models/test_dma.xml (100%) rename {tests => oldTest_DoNotUse}/test.mk (100%) rename {tests => oldTest_DoNotUse}/ui/fr.tpt.ttool.tests.ui/.classpath (100%) rename {tests => oldTest_DoNotUse}/ui/fr.tpt.ttool.tests.ui/.gitignore (100%) rename {tests => oldTest_DoNotUse}/ui/fr.tpt.ttool.tests.ui/.project (100%) rename {tests => oldTest_DoNotUse}/ui/fr.tpt.ttool.tests.ui/assertj-swing-3.8.0.jar (100%) rename {tests => oldTest_DoNotUse}/ui/fr.tpt.ttool.tests.ui/src/fr/tpt/ttool/tests/ui/MoveComponentTest.java (100%) rename {tests => oldTest_DoNotUse}/util/fr.tpt.ttool.tests.util/.classpath (100%) rename {tests => oldTest_DoNotUse}/util/fr.tpt.ttool.tests.util/.gitignore (100%) rename {tests => oldTest_DoNotUse}/util/fr.tpt.ttool.tests.util/.project (100%) rename {tests => oldTest_DoNotUse}/util/fr.tpt.ttool.tests.util/.settings/org.eclipse.jdt.core.prefs (100%) rename {tests => oldTest_DoNotUse}/util/fr.tpt.ttool.tests.util/launch/TToolUtilTestsRunner.launch (100%) rename {tests => oldTest_DoNotUse}/util/fr.tpt.ttool.tests.util/launch/TestRshClient.launch (100%) rename {tests => oldTest_DoNotUse}/util/fr.tpt.ttool.tests.util/resources/helloWorld (100%) rename {tests => oldTest_DoNotUse}/util/fr.tpt.ttool.tests.util/resources/helloWorldNonStop (100%) rename {tests => oldTest_DoNotUse}/util/fr.tpt.ttool.tests.util/src/fr/tpt/ttool/tests/util/TToolUtilTestsRunner.java (100%) rename {tests => oldTest_DoNotUse}/util/fr.tpt.ttool.tests.util/src/fr/tpt/ttool/tests/util/remote/TestRshClient.java (100%) diff --git a/tests/Avatar/AvatarBoolExprTests.java b/oldTest_DoNotUse/Avatar/AvatarBoolExprTests.java similarity index 100% rename from tests/Avatar/AvatarBoolExprTests.java rename to oldTest_DoNotUse/Avatar/AvatarBoolExprTests.java diff --git a/tests/Avatar/AvatarGuardTests.java b/oldTest_DoNotUse/Avatar/AvatarGuardTests.java similarity index 100% rename from tests/Avatar/AvatarGuardTests.java rename to oldTest_DoNotUse/Avatar/AvatarGuardTests.java diff --git a/tests/Avatar/AvatarPragmaTests.java b/oldTest_DoNotUse/Avatar/AvatarPragmaTests.java similarity index 100% rename from tests/Avatar/AvatarPragmaTests.java rename to oldTest_DoNotUse/Avatar/AvatarPragmaTests.java diff --git a/tests/Avatar/AvatarSafetyTests.java b/oldTest_DoNotUse/Avatar/AvatarSafetyTests.java similarity index 100% rename from tests/Avatar/AvatarSafetyTests.java rename to oldTest_DoNotUse/Avatar/AvatarSafetyTests.java diff --git a/tests/Avatar/ProVerif/typed.txt b/oldTest_DoNotUse/Avatar/ProVerif/typed.txt similarity index 100% rename from tests/Avatar/ProVerif/typed.txt rename to oldTest_DoNotUse/Avatar/ProVerif/typed.txt diff --git a/tests/Avatar/ProVerif/untyped.txt b/oldTest_DoNotUse/Avatar/ProVerif/untyped.txt similarity index 100% rename from tests/Avatar/ProVerif/untyped.txt rename to oldTest_DoNotUse/Avatar/ProVerif/untyped.txt diff --git a/tests/TToolTest.java b/oldTest_DoNotUse/TToolTest.java similarity index 100% rename from tests/TToolTest.java rename to oldTest_DoNotUse/TToolTest.java diff --git a/tests/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.classpath b/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.classpath similarity index 100% rename from tests/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.classpath rename to oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.classpath diff --git a/tests/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.gitignore b/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.gitignore similarity index 100% rename from tests/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.gitignore rename to oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.gitignore diff --git a/tests/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.project b/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.project similarity index 100% rename from tests/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.project rename to oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.project diff --git a/tests/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.settings/org.eclipse.jdt.core.prefs b/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from tests/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.settings/org.eclipse.jdt.core.prefs rename to oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/.settings/org.eclipse.jdt.core.prefs diff --git a/tests/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/models/test_code_gen_hwa.xml b/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/models/test_code_gen_hwa.xml similarity index 100% rename from tests/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/models/test_code_gen_hwa.xml rename to oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/models/test_code_gen_hwa.xml diff --git a/tests/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/models/test_dma.xml b/oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/models/test_dma.xml similarity index 100% rename from tests/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/models/test_dma.xml rename to oldTest_DoNotUse/diplodocus/fr.tpt.ttool.tests.diplodocus.simulator/models/test_dma.xml diff --git a/tests/test.mk b/oldTest_DoNotUse/test.mk similarity index 100% rename from tests/test.mk rename to oldTest_DoNotUse/test.mk diff --git a/tests/ui/fr.tpt.ttool.tests.ui/.classpath b/oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/.classpath similarity index 100% rename from tests/ui/fr.tpt.ttool.tests.ui/.classpath rename to oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/.classpath diff --git a/tests/ui/fr.tpt.ttool.tests.ui/.gitignore b/oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/.gitignore similarity index 100% rename from tests/ui/fr.tpt.ttool.tests.ui/.gitignore rename to oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/.gitignore diff --git a/tests/ui/fr.tpt.ttool.tests.ui/.project b/oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/.project similarity index 100% rename from tests/ui/fr.tpt.ttool.tests.ui/.project rename to oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/.project diff --git a/tests/ui/fr.tpt.ttool.tests.ui/assertj-swing-3.8.0.jar b/oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/assertj-swing-3.8.0.jar similarity index 100% rename from tests/ui/fr.tpt.ttool.tests.ui/assertj-swing-3.8.0.jar rename to oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/assertj-swing-3.8.0.jar diff --git a/tests/ui/fr.tpt.ttool.tests.ui/src/fr/tpt/ttool/tests/ui/MoveComponentTest.java b/oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/src/fr/tpt/ttool/tests/ui/MoveComponentTest.java similarity index 100% rename from tests/ui/fr.tpt.ttool.tests.ui/src/fr/tpt/ttool/tests/ui/MoveComponentTest.java rename to oldTest_DoNotUse/ui/fr.tpt.ttool.tests.ui/src/fr/tpt/ttool/tests/ui/MoveComponentTest.java diff --git a/tests/util/fr.tpt.ttool.tests.util/.classpath b/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.classpath similarity index 100% rename from tests/util/fr.tpt.ttool.tests.util/.classpath rename to oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.classpath diff --git a/tests/util/fr.tpt.ttool.tests.util/.gitignore b/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.gitignore similarity index 100% rename from tests/util/fr.tpt.ttool.tests.util/.gitignore rename to oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.gitignore diff --git a/tests/util/fr.tpt.ttool.tests.util/.project b/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.project similarity index 100% rename from tests/util/fr.tpt.ttool.tests.util/.project rename to oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.project diff --git a/tests/util/fr.tpt.ttool.tests.util/.settings/org.eclipse.jdt.core.prefs b/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from tests/util/fr.tpt.ttool.tests.util/.settings/org.eclipse.jdt.core.prefs rename to oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/.settings/org.eclipse.jdt.core.prefs diff --git a/tests/util/fr.tpt.ttool.tests.util/launch/TToolUtilTestsRunner.launch b/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/launch/TToolUtilTestsRunner.launch similarity index 100% rename from tests/util/fr.tpt.ttool.tests.util/launch/TToolUtilTestsRunner.launch rename to oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/launch/TToolUtilTestsRunner.launch diff --git a/tests/util/fr.tpt.ttool.tests.util/launch/TestRshClient.launch b/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/launch/TestRshClient.launch similarity index 100% rename from tests/util/fr.tpt.ttool.tests.util/launch/TestRshClient.launch rename to oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/launch/TestRshClient.launch diff --git a/tests/util/fr.tpt.ttool.tests.util/resources/helloWorld b/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/resources/helloWorld similarity index 100% rename from tests/util/fr.tpt.ttool.tests.util/resources/helloWorld rename to oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/resources/helloWorld diff --git a/tests/util/fr.tpt.ttool.tests.util/resources/helloWorldNonStop b/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/resources/helloWorldNonStop similarity index 100% rename from tests/util/fr.tpt.ttool.tests.util/resources/helloWorldNonStop rename to oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/resources/helloWorldNonStop diff --git a/tests/util/fr.tpt.ttool.tests.util/src/fr/tpt/ttool/tests/util/TToolUtilTestsRunner.java b/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/src/fr/tpt/ttool/tests/util/TToolUtilTestsRunner.java similarity index 100% rename from tests/util/fr.tpt.ttool.tests.util/src/fr/tpt/ttool/tests/util/TToolUtilTestsRunner.java rename to oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/src/fr/tpt/ttool/tests/util/TToolUtilTestsRunner.java diff --git a/tests/util/fr.tpt.ttool.tests.util/src/fr/tpt/ttool/tests/util/remote/TestRshClient.java b/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/src/fr/tpt/ttool/tests/util/remote/TestRshClient.java similarity index 100% rename from tests/util/fr.tpt.ttool.tests.util/src/fr/tpt/ttool/tests/util/remote/TestRshClient.java rename to oldTest_DoNotUse/util/fr.tpt.ttool.tests.util/src/fr/tpt/ttool/tests/util/remote/TestRshClient.java diff --git a/ttool/src/test/java/avatartranslator/AvatarGuardTests.java b/ttool/src/test/java/avatartranslator/AvatarGuardTests.java index dda1d30166..6b5890b077 100644 --- a/ttool/src/test/java/avatartranslator/AvatarGuardTests.java +++ b/ttool/src/test/java/avatartranslator/AvatarGuardTests.java @@ -63,12 +63,12 @@ import avatartranslator.*; public class AvatarGuardTests { - AvatarGuard res; - AvatarBlock A,B; + AvatarGuard res; + AvatarBlock A,B; public AvatarGuardTests () { - // super ("AvatarGuards", false); + // super ("AvatarGuards", false); } - @Before + @Before public void test () { AvatarSpecification as = new AvatarSpecification("avatarspecification", null); A = new AvatarBlock("A", as, null); @@ -119,44 +119,44 @@ public class AvatarGuardTests { typeAttributesMap.put("T1", t1s); typeAttributesMap.put("T2", t2s); - } - - @Test - public void testElseGuardCreation(){ - res= AvatarGuard.createFromString(A, "else"); - assertTrue(res instanceof AvatarGuardElse); - } - - @Test - public void testEmptyGuardCreation(){ - //Empty Guard + } + + @Test + public void testElseGuardCreation(){ + res= AvatarGuard.createFromString(A, "else"); + assertTrue(res instanceof AvatarGuardElse); + } + + @Test + public void testEmptyGuardCreation(){ + //Empty Guard res= AvatarGuard.createFromString(A, ""); assertTrue(res instanceof AvatarGuardEmpty); - } - - @Test - public void testFailNonValidExpression(){ + } + + @Test + public void testFailNonValidExpression(){ //Fail if not valid expression /*res= AvatarGuard.createFromString(A, "arg(key1==key2))"); - assertTrue(res instanceof AvatarGuardEmpty); - res= AvatarGuard.createFromString(A, "key1=key2"); - assertTrue(res instanceof AvatarGuardEmpty); - res= AvatarGuard.createFromString(A, "key1==)"); - assertTrue(res instanceof AvatarGuardEmpty); - res= AvatarGuard.createFromString(A, "(key1==)))"); - assertTrue(res instanceof AvatarGuardEmpty);*/ - } - - - @Test - public void testMonoGuardCreation(){ - res= AvatarGuard.createFromString(A, "test"); + assertTrue(res instanceof AvatarGuardEmpty); + res= AvatarGuard.createFromString(A, "key1=key2"); + assertTrue(res instanceof AvatarGuardEmpty); + res= AvatarGuard.createFromString(A, "key1==)"); + assertTrue(res instanceof AvatarGuardEmpty); + res= AvatarGuard.createFromString(A, "(key1==)))"); + assertTrue(res instanceof AvatarGuardEmpty);*/ + } + + + @Test + public void testMonoGuardCreation(){ + res= AvatarGuard.createFromString(A, "test"); assertTrue(res instanceof AvatarSimpleGuardMono); - } + } - @Test - public void testDuoGuardCreation(){ - res= AvatarGuard.createFromString(A, "test==test2"); + @Test + public void testDuoGuardCreation(){ + res= AvatarGuard.createFromString(A, "test==test2"); assertTrue(res instanceof AvatarSimpleGuardDuo); res= AvatarGuard.createFromString(A, "key1==key2"); assertTrue(res instanceof AvatarSimpleGuardDuo); @@ -177,10 +177,10 @@ public class AvatarGuardTests { res= AvatarGuard.createFromString(A, "(a,b)==(c,d)"); assertTrue(res instanceof AvatarSimpleGuardDuo); - } + } - @Test - public void testUnaryGuardCreation(){ + @Test + public void testUnaryGuardCreation(){ res= AvatarGuard.createFromString(A, "not(test)"); assertTrue(res instanceof AvatarUnaryGuard); res= AvatarGuard.createFromString(A, "not(test==test2)"); @@ -192,10 +192,10 @@ public class AvatarGuardTests { res= AvatarGuard.createFromString(B, "not(m__a==m__b)"); assertTrue(res instanceof AvatarUnaryGuard); - } + } - @Test - public void testBinaryGuardCreation(){ + @Test + public void testBinaryGuardCreation(){ //Binary Guards res= AvatarGuard.createFromString(A, "(key1==true) and (key2==false)"); assertTrue(res instanceof AvatarBinaryGuard); @@ -205,9 +205,9 @@ public class AvatarGuardTests { assertTrue(res instanceof AvatarBinaryGuard); res= AvatarGuard.createFromString(A, "((key1==key1) or (key2==key1)) and (m__a==m__b)"); assertTrue(res instanceof AvatarBinaryGuard); - } - - + } + + public static void main(String[] args){ AvatarGuardTests apt = new AvatarGuardTests (); //apt.runTest (); -- GitLab