From 3e5e8159c4cdfb182b882e1f2f13a45d90face91 Mon Sep 17 00:00:00 2001
From: blanc <guillaume.blanc@eurecom.fr>
Date: Mon, 29 Jan 2024 09:07:25 -0500
Subject: [PATCH] Remove useless code
---
ttool/src/test/java/test/AbstractTest.java | 3 +--
.../src/test/java/ui/AvatarSecurityTests.java | 24 ++++++-------------
2 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/ttool/src/test/java/test/AbstractTest.java b/ttool/src/test/java/test/AbstractTest.java
index 381999dec2..c8f5bea208 100644
--- a/ttool/src/test/java/test/AbstractTest.java
+++ b/ttool/src/test/java/test/AbstractTest.java
@@ -234,8 +234,7 @@ public abstract class AbstractTest {
if (golden.contains(outputLine)) {
checked += 1;
} else {
- checked = -1;
- break;
+ return false;
}
}
diff --git a/ttool/src/test/java/ui/AvatarSecurityTests.java b/ttool/src/test/java/ui/AvatarSecurityTests.java
index 1c63f124f4..6ae9287822 100644
--- a/ttool/src/test/java/ui/AvatarSecurityTests.java
+++ b/ttool/src/test/java/ui/AvatarSecurityTests.java
@@ -1,33 +1,24 @@
package ui;
-import avatartranslator.AvatarSpecification;
-import avatartranslator.toproverif.AVATAR2ProVerif;
import common.ConfigurationTTool;
import common.SpecConfigTTool;
-import myutil.FileException;
-import myutil.FileUtils;
import myutil.TraceManager;
import org.junit.BeforeClass;
import org.junit.Test;
-import proverifspec.ProVerifSpec;
-
-import java.io.*;
-import java.util.ArrayList;
-import java.util.List;
import static org.junit.Assert.*;
public class AvatarSecurityTests extends AbstractUITest {
- final static String RES_FOLDER = "ui/avatarsecuritytests/";
- final static String INPUT_FOLDER = "input/";
- final static String GOLDEN_SUFFIX = "_golden";
- final static String OUTPUT_FOLDER = "output/";
- final static String PVSPEC_SUFFIX = "_pvspec";
- static String OUTPUT_DIR;
+ private final static String RES_FOLDER = "ui/avatarsecuritytests/";
+ private final static String INPUT_FOLDER = "input/";
+ private final static String GOLDEN_SUFFIX = "_golden";
+ private final static String OUTPUT_FOLDER = "output/";
+ private final static String PVSPEC_SUFFIX = "_pvspec";
+ private static String OUTPUT_DIR;
- final static String[] MODELS = {
+ private final static String[] MODELS = {
"AliceAndBob",
};
@@ -61,7 +52,6 @@ public class AvatarSecurityTests extends AbstractUITest {
TraceManager.addDev("Start testing " + model);
openModel(model);
- AvatarSpecification avatarSpecification = mainGUI.gtm.getAvatarSpecification();
mainGUI.checkModelingSyntax(true);
String pvspecPath = OUTPUT_DIR + model + PVSPEC_SUFFIX;
--
GitLab