From b8843ec580b700346246cb657f81eccf7ae7e483 Mon Sep 17 00:00:00 2001
From: jerray <jawher.jerray@eurecom.fr>
Date: Thu, 27 Jun 2024 10:57:17 +0200
Subject: [PATCH] update test Security Generation
---
.../AutoSecurityGenerationDiplodocusTest.java | 11 +++++++++--
.../java/tmltranslator/TMLComparingMethodTest.java | 2 +-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ttool/src/test/java/tmltranslator/AutoSecurityGenerationDiplodocusTest.java b/ttool/src/test/java/tmltranslator/AutoSecurityGenerationDiplodocusTest.java
index cba1f17fa5..58688c7682 100644
--- a/ttool/src/test/java/tmltranslator/AutoSecurityGenerationDiplodocusTest.java
+++ b/ttool/src/test/java/tmltranslator/AutoSecurityGenerationDiplodocusTest.java
@@ -1,6 +1,7 @@
package tmltranslator;
import common.ConfigurationTTool;
+import launcher.RshServer;
import myutil.FileUtils;
import myutil.TraceManager;
import org.junit.Before;
@@ -10,7 +11,6 @@ import test.AbstractTest;
import tmltranslator.patternhandling.SecurityGenerationForTMAP;
import java.io.File;
-import java.io.FilenameFilter;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -49,10 +49,17 @@ public class AutoSecurityGenerationDiplodocusTest extends AbstractTest {
super();
}
-
@Before
public void setUp() throws Exception {
TraceManager.devPolicy = TraceManager.TO_CONSOLE;
+ final Runnable runnable = new Runnable() {
+ @Override
+ public void run() {
+ new RshServer( null ).startServer();
+ }
+ };
+ Thread threadServer = new Thread( runnable );
+ threadServer.start();
ConfigurationTTool.ProVerifVerifierPath = "proverif";
ConfigurationTTool.ProVerifVerifierHost = "localhost";
TraceManager.addDev("Starting test for Security Generation");
diff --git a/ttool/src/test/java/tmltranslator/TMLComparingMethodTest.java b/ttool/src/test/java/tmltranslator/TMLComparingMethodTest.java
index a6ca771f4a..834366493d 100644
--- a/ttool/src/test/java/tmltranslator/TMLComparingMethodTest.java
+++ b/ttool/src/test/java/tmltranslator/TMLComparingMethodTest.java
@@ -1068,7 +1068,7 @@ public class TMLComparingMethodTest extends AbstractTest {
@Test
public void isSecurityPatternMapEquals() {
- assertTrue("two lists have same context but difference element order" +
+ assertFalse("two lists have same context but difference element order" +
"",comparing.isSecurityPatternMapEquals(securityMap1,securityMap2));
assertFalse("two lists have same size but difference context" +
--
GitLab