diff --git a/ttool/src/test/java/tmltranslator/DiplodocusSecurityTest.java b/ttool/src/test/java/tmltranslator/DiplodocusSecurityTest.java index a289849c24c6c37d659365c5d2ad1349e2a7f20d..c509187259fdd47d17f7a26eb836c3ba3dcd3055 100644 --- a/ttool/src/test/java/tmltranslator/DiplodocusSecurityTest.java +++ b/ttool/src/test/java/tmltranslator/DiplodocusSecurityTest.java @@ -5,6 +5,7 @@ import avatartranslator.toproverif.AVATAR2ProVerif; import myutil.FileUtils; import myutil.TraceManager; import org.jgrapht.alg.util.Pair; +import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -26,6 +27,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; + @RunWith(Parameterized.class) public class DiplodocusSecurityTest extends AbstractTest { final static String DIR_GEN = "tmltranslator/DiplodocusSecurityTest/"; @@ -163,11 +166,14 @@ public class DiplodocusSecurityTest extends AbstractTest { try { proc = Runtime.getRuntime().exec(cmd); proc_in = new BufferedReader(new InputStreamReader(proc.getInputStream())); + int nbLines =0; while ((str = proc_in.readLine()) != null) { // TraceManager.addDev( "Sending " + str + " from " + port + " to client..." ); + System.out.println("Output from ProVerif: " + str); if (summaryFound && (str.contains(PROVERIF_QUERY))) { + nbLines++; str = changeCommId(str); assertTrue(contains(tab, str)); } @@ -176,6 +182,7 @@ public class DiplodocusSecurityTest extends AbstractTest { summaryFound = true; } } + assertEquals(nbLines, goldenMap.get(tab).length); } catch (Exception e) { // probably make is not installed System.out.println("FAILED: executing: " + cmd + ": " + e.getMessage());