From 7a565731122a490814e0d1d1920f8d2959681c96 Mon Sep 17 00:00:00 2001 From: Ludovic Apvrille <ludovic.apvrille@telecom-paris.fr> Date: Tue, 8 Jun 2021 17:13:43 +0200 Subject: [PATCH] Update on tests: removing graphical aspects --- ttool/src/test/java/test/AbstractTest.java | 20 +++++++++++++++++++ .../java/tmltranslator/CompareTMLTests.java | 1 - .../DiplodocusDelayPenaltyEnableTests.java | 3 ++- .../DiplodocusFPGAReconfigurationTests.java | 3 ++- .../DiplodocusInsertSignalTest.java | 3 ++- .../java/tmltranslator/DiplodocusNoCTest.java | 3 ++- .../DiplodocusSimulatorTerminationTest.java | 3 ++- .../DiplodocusSimulatorTest.java | 3 ++- .../tmltranslator/FpgaClockDividerTest.java | 3 ++- .../java/tmltranslator/HTMLParseTest.java | 3 ++- ...HelpSeverTest.java => HelpServerTest.java} | 5 +++-- .../java/tmltranslator/MemoryLeakTest.java | 3 ++- .../MulticoreCrossCpuSchedulingTest.java | 3 ++- .../tmltranslator/MulticoreHangingTest.java | 3 ++- .../RemoveAllTransactionsTests.java | 3 ++- .../RunToNextBreakpointMaxTransTest.java | 3 ++- .../RunUntilChannelAccessTest.java | 3 ++- .../tmltranslator/TMLComparingMethodTest.java | 3 ++- .../tmltranslator/TimelineDiagramTest.java | 3 ++- ttool/src/test/java/ui/AbstractUITest.java | 17 ---------------- .../DiplodocusDelayPenaltyDisableTests.java | 3 ++- 21 files changed, 57 insertions(+), 37 deletions(-) rename ttool/src/test/java/tmltranslator/{HelpSeverTest.java => HelpServerTest.java} (98%) rename ttool/src/test/java/{tmltranslator => ui}/DiplodocusDelayPenaltyDisableTests.java (99%) diff --git a/ttool/src/test/java/test/AbstractTest.java b/ttool/src/test/java/test/AbstractTest.java index da7eaaf01f..6ff9039779 100644 --- a/ttool/src/test/java/test/AbstractTest.java +++ b/ttool/src/test/java/test/AbstractTest.java @@ -122,4 +122,24 @@ public abstract class AbstractTest { } + + protected void monitorError(Process proc) { + BufferedReader proc_err = new BufferedReader(new InputStreamReader(proc.getErrorStream())); + new Thread() { + @Override public void run() { + String line; + try { + while ((line = proc_err.readLine()) != null) { + System.out.println("NOC executing err: " + line); + } + } catch (Exception e) { + //System.out.println("FAILED reading errors"); + return; + } + + } + }.start(); + } + + } diff --git a/ttool/src/test/java/tmltranslator/CompareTMLTests.java b/ttool/src/test/java/tmltranslator/CompareTMLTests.java index 2dff679966..79520bf4e6 100644 --- a/ttool/src/test/java/tmltranslator/CompareTMLTests.java +++ b/ttool/src/test/java/tmltranslator/CompareTMLTests.java @@ -4,7 +4,6 @@ import test.AbstractTest; import tmltranslator.compareTMLTest.CompareTML; import org.junit.Before; import org.junit.Test; -import ui.AbstractUITest; import java.io.File; import java.nio.file.Files; diff --git a/ttool/src/test/java/tmltranslator/DiplodocusDelayPenaltyEnableTests.java b/ttool/src/test/java/tmltranslator/DiplodocusDelayPenaltyEnableTests.java index 69343bf778..db48a506ea 100644 --- a/ttool/src/test/java/tmltranslator/DiplodocusDelayPenaltyEnableTests.java +++ b/ttool/src/test/java/tmltranslator/DiplodocusDelayPenaltyEnableTests.java @@ -9,6 +9,7 @@ import org.junit.BeforeClass; import org.junit.Test; import req.ebrdd.EBRDD; import tepe.TEPE; +import test.AbstractTest; import tmltranslator.tomappingsystemc2.DiploSimulatorFactory; import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator; import tmltranslator.tomappingsystemc2.Penalties; @@ -22,7 +23,7 @@ import java.util.List; import static org.junit.Assert.assertTrue; -public class DiplodocusDelayPenaltyEnableTests extends AbstractUITest { +public class DiplodocusDelayPenaltyEnableTests extends AbstractTest { final String DIR_GEN = "test_diplo_simulator/"; diff --git a/ttool/src/test/java/tmltranslator/DiplodocusFPGAReconfigurationTests.java b/ttool/src/test/java/tmltranslator/DiplodocusFPGAReconfigurationTests.java index 9f63ce47b5..a06471734f 100644 --- a/ttool/src/test/java/tmltranslator/DiplodocusFPGAReconfigurationTests.java +++ b/ttool/src/test/java/tmltranslator/DiplodocusFPGAReconfigurationTests.java @@ -9,6 +9,7 @@ import org.junit.BeforeClass; import org.junit.Test; import req.ebrdd.EBRDD; import tepe.TEPE; +import test.AbstractTest; import tmltranslator.tomappingsystemc2.DiploSimulatorFactory; import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator; import tmltranslator.tomappingsystemc2.Penalties; @@ -22,7 +23,7 @@ import java.util.List; import static org.junit.Assert.assertTrue; -public class DiplodocusFPGAReconfigurationTests extends AbstractUITest { +public class DiplodocusFPGAReconfigurationTests extends AbstractTest { private static final String DIR_GEN = "test_diplo_simulator/"; // test for reconfiguration of FPGA diff --git a/ttool/src/test/java/tmltranslator/DiplodocusInsertSignalTest.java b/ttool/src/test/java/tmltranslator/DiplodocusInsertSignalTest.java index 8e1691d079..e4e77b0e4c 100644 --- a/ttool/src/test/java/tmltranslator/DiplodocusInsertSignalTest.java +++ b/ttool/src/test/java/tmltranslator/DiplodocusInsertSignalTest.java @@ -9,6 +9,7 @@ import org.junit.BeforeClass; import org.junit.Test; import req.ebrdd.EBRDD; import tepe.TEPE; +import test.AbstractTest; import tmltranslator.tomappingsystemc2.DiploSimulatorFactory; import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator; import tmltranslator.tomappingsystemc2.Penalties; @@ -22,7 +23,7 @@ import java.util.List; import static org.junit.Assert.assertTrue; -public class DiplodocusInsertSignalTest extends AbstractUITest { +public class DiplodocusInsertSignalTest extends AbstractTest { final String DIR_GEN = "test_diplo_simulator/"; // test for inserting signals diff --git a/ttool/src/test/java/tmltranslator/DiplodocusNoCTest.java b/ttool/src/test/java/tmltranslator/DiplodocusNoCTest.java index f60e14f067..22e6eb47df 100644 --- a/ttool/src/test/java/tmltranslator/DiplodocusNoCTest.java +++ b/ttool/src/test/java/tmltranslator/DiplodocusNoCTest.java @@ -9,6 +9,7 @@ import org.junit.Test; import org.junit.runners.model.TestTimedOutException; import req.ebrdd.EBRDD; import tepe.TEPE; +import test.AbstractTest; import tmltranslator.tomappingsystemc2.DiploSimulatorFactory; import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator; import tmltranslator.tomappingsystemc2.Penalties; @@ -25,7 +26,7 @@ import static org.junit.Assert.*; -public class DiplodocusNoCTest extends AbstractUITest { +public class DiplodocusNoCTest extends AbstractTest { final String MODEL = "spec"; diff --git a/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTerminationTest.java b/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTerminationTest.java index d119b5f902..518c3e3344 100644 --- a/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTerminationTest.java +++ b/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTerminationTest.java @@ -11,6 +11,7 @@ import remotesimulation.RemoteConnection; import remotesimulation.RemoteConnectionException; import req.ebrdd.EBRDD; import tepe.TEPE; +import test.AbstractTest; import tmltranslator.TMLMapping; import tmltranslator.TMLMappingTextSpecification; import tmltranslator.TMLSyntaxChecking; @@ -27,7 +28,7 @@ import java.util.List; import static org.junit.Assert.assertTrue; -public class DiplodocusSimulatorTerminationTest extends AbstractUITest { +public class DiplodocusSimulatorTerminationTest extends AbstractTest { final String DIR_GEN = "test_diplo_simulator/"; final String [] MODELS_TERMINATE = {"terminatedTest"}; private String SIM_DIR; diff --git a/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTest.java b/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTest.java index a6ce73734c..b46acfdcc4 100644 --- a/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTest.java +++ b/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTest.java @@ -9,6 +9,7 @@ import org.junit.BeforeClass; import org.junit.Test; import req.ebrdd.EBRDD; import tepe.TEPE; +import test.AbstractTest; import tmltranslator.TMLMapping; import tmltranslator.TMLMappingTextSpecification; import tmltranslator.TMLSyntaxChecking; @@ -27,7 +28,7 @@ import java.util.List; import static org.junit.Assert.*; -public class DiplodocusSimulatorTest extends AbstractUITest { +public class DiplodocusSimulatorTest extends AbstractTest { //final String [] MODELS = {"scp"}; final String [] MODELS = {"scp", "ssdf"}; diff --git a/ttool/src/test/java/tmltranslator/FpgaClockDividerTest.java b/ttool/src/test/java/tmltranslator/FpgaClockDividerTest.java index 3398e36b0c..1c3edf5c5d 100644 --- a/ttool/src/test/java/tmltranslator/FpgaClockDividerTest.java +++ b/ttool/src/test/java/tmltranslator/FpgaClockDividerTest.java @@ -9,6 +9,7 @@ import org.junit.BeforeClass; import org.junit.Test; import req.ebrdd.EBRDD; import tepe.TEPE; +import test.AbstractTest; import tmltranslator.TMLMapping; import tmltranslator.TMLMappingTextSpecification; import tmltranslator.TMLSyntaxChecking; @@ -28,7 +29,7 @@ import java.util.List; import static org.junit.Assert.assertTrue; -public class FpgaClockDividerTest extends AbstractUITest { +public class FpgaClockDividerTest extends AbstractTest { private final String DIR_GEN = "test_diplo_simulator/"; private final String [] MODELS_FPGA_CLOCK_DIVIDER = {"fpga_clock_divider"}; diff --git a/ttool/src/test/java/tmltranslator/HTMLParseTest.java b/ttool/src/test/java/tmltranslator/HTMLParseTest.java index f6c22fe2de..2b44870c4e 100644 --- a/ttool/src/test/java/tmltranslator/HTMLParseTest.java +++ b/ttool/src/test/java/tmltranslator/HTMLParseTest.java @@ -13,6 +13,7 @@ import org.junit.BeforeClass; import org.junit.Test; import req.ebrdd.EBRDD; import tepe.TEPE; +import test.AbstractTest; import tmltranslator.TMLMapping; import tmltranslator.TMLMappingTextSpecification; import tmltranslator.TMLSyntaxChecking; @@ -31,7 +32,7 @@ import java.util.List; import static org.junit.Assert.assertTrue; -public class HTMLParseTest extends AbstractUITest { +public class HTMLParseTest extends AbstractTest { final String DIR_GEN = "test_diplo_simulator/"; final String [] MODELS_PARSE_HTML = {"parseFPGA_HTML", "parseCPU1_HTML","parseCPU2_HTML"}; final String [] PARSE_FPGA = {"<- idle 468 ->","", "", "", ""}; diff --git a/ttool/src/test/java/tmltranslator/HelpSeverTest.java b/ttool/src/test/java/tmltranslator/HelpServerTest.java similarity index 98% rename from ttool/src/test/java/tmltranslator/HelpSeverTest.java rename to ttool/src/test/java/tmltranslator/HelpServerTest.java index c8f1c78152..dbe0d4b93a 100644 --- a/ttool/src/test/java/tmltranslator/HelpSeverTest.java +++ b/ttool/src/test/java/tmltranslator/HelpServerTest.java @@ -8,6 +8,7 @@ import org.junit.BeforeClass; import org.junit.Test; import req.ebrdd.EBRDD; import tepe.TEPE; +import test.AbstractTest; import tmltranslator.tomappingsystemc2.DiploSimulatorFactory; import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator; import tmltranslator.tomappingsystemc2.Penalties; @@ -21,7 +22,7 @@ import java.util.List; import static org.junit.Assert.assertTrue; -public class HelpSeverTest extends AbstractUITest { +public class HelpServerTest extends AbstractTest { private final String DIR_GEN = "test_diplo_simulator/"; private final String [] MODELS_HELP_SERVER = {"fpga_clock_divider"}; @@ -42,7 +43,7 @@ public class HelpSeverTest extends AbstractUITest { RESOURCES_DIR = getBaseResourcesDir() + "/tmltranslator/simulator/"; } - public HelpSeverTest() { + public HelpServerTest() { super(); } diff --git a/ttool/src/test/java/tmltranslator/MemoryLeakTest.java b/ttool/src/test/java/tmltranslator/MemoryLeakTest.java index 0fd6eefa07..67ce0b24f6 100644 --- a/ttool/src/test/java/tmltranslator/MemoryLeakTest.java +++ b/ttool/src/test/java/tmltranslator/MemoryLeakTest.java @@ -9,6 +9,7 @@ import org.junit.BeforeClass; import org.junit.Test; import req.ebrdd.EBRDD; import tepe.TEPE; +import test.AbstractTest; import tmltranslator.TMLMapping; import tmltranslator.TMLMappingTextSpecification; import tmltranslator.TMLSyntaxChecking; @@ -30,7 +31,7 @@ import java.util.List; import static org.junit.Assert.assertTrue; -public class MemoryLeakTest extends AbstractUITest { +public class MemoryLeakTest extends AbstractTest { final String DIR_GEN = "test_diplo_simulator/"; final String [] MODELS_MEMORY_LEAK = {"fpga_reconfig5", "fpga_reconfig6"}; private String SIM_DIR; diff --git a/ttool/src/test/java/tmltranslator/MulticoreCrossCpuSchedulingTest.java b/ttool/src/test/java/tmltranslator/MulticoreCrossCpuSchedulingTest.java index 36dbc7f415..5f4c438593 100644 --- a/ttool/src/test/java/tmltranslator/MulticoreCrossCpuSchedulingTest.java +++ b/ttool/src/test/java/tmltranslator/MulticoreCrossCpuSchedulingTest.java @@ -9,6 +9,7 @@ import org.junit.BeforeClass; import org.junit.Test; import req.ebrdd.EBRDD; import tepe.TEPE; +import test.AbstractTest; import tmltranslator.TMLMapping; import tmltranslator.TMLMappingTextSpecification; import tmltranslator.TMLSyntaxChecking; @@ -28,7 +29,7 @@ import java.util.List; import static org.junit.Assert.assertTrue; -public class MulticoreCrossCpuSchedulingTest extends AbstractUITest { +public class MulticoreCrossCpuSchedulingTest extends AbstractTest { final String DIR_GEN = "test_diplo_simulator/"; final String [] MODELS_CPU_CROSS = {"testMultiCoreRRPB", "testMultiCoreRR"}; private String SIM_DIR; diff --git a/ttool/src/test/java/tmltranslator/MulticoreHangingTest.java b/ttool/src/test/java/tmltranslator/MulticoreHangingTest.java index 201e26f2f4..b26f59ecc6 100644 --- a/ttool/src/test/java/tmltranslator/MulticoreHangingTest.java +++ b/ttool/src/test/java/tmltranslator/MulticoreHangingTest.java @@ -9,6 +9,7 @@ import org.junit.BeforeClass; import org.junit.Test; import req.ebrdd.EBRDD; import tepe.TEPE; +import test.AbstractTest; import tmltranslator.TMLMapping; import tmltranslator.TMLMappingTextSpecification; import tmltranslator.TMLSyntaxChecking; @@ -26,7 +27,7 @@ import java.util.List; import static org.junit.Assert.assertTrue; -public class MulticoreHangingTest extends AbstractUITest { +public class MulticoreHangingTest extends AbstractTest { final String DIR_GEN = "test_diplo_simulator/"; final String [] MODELS_CPU_SHOWTRACE = {"multicore_trace"}; private String SIM_DIR; diff --git a/ttool/src/test/java/tmltranslator/RemoveAllTransactionsTests.java b/ttool/src/test/java/tmltranslator/RemoveAllTransactionsTests.java index f27a71f18a..73f52bec52 100644 --- a/ttool/src/test/java/tmltranslator/RemoveAllTransactionsTests.java +++ b/ttool/src/test/java/tmltranslator/RemoveAllTransactionsTests.java @@ -9,6 +9,7 @@ import org.junit.BeforeClass; import org.junit.Test; import req.ebrdd.EBRDD; import tepe.TEPE; +import test.AbstractTest; import tmltranslator.TMLMapping; import tmltranslator.TMLMappingTextSpecification; import tmltranslator.TMLSyntaxChecking; @@ -27,7 +28,7 @@ import java.util.List; import static org.junit.Assert.assertTrue; -public class RemoveAllTransactionsTests extends AbstractUITest { +public class RemoveAllTransactionsTests extends AbstractTest { final String DIR_GEN = "test_diplo_simulator/"; final String [] MODELS_PARSE_HTML = {"parseFPGA_HTML"}; final static String EXPECTED_FILE_REMOVE_ALL_TRANS = getBaseResourcesDir() + "tmltranslator/expected/expected_remove_all_trans.txt"; diff --git a/ttool/src/test/java/tmltranslator/RunToNextBreakpointMaxTransTest.java b/ttool/src/test/java/tmltranslator/RunToNextBreakpointMaxTransTest.java index aceed3ee47..87592d7cc0 100644 --- a/ttool/src/test/java/tmltranslator/RunToNextBreakpointMaxTransTest.java +++ b/ttool/src/test/java/tmltranslator/RunToNextBreakpointMaxTransTest.java @@ -9,6 +9,7 @@ import org.junit.BeforeClass; import org.junit.Test; import req.ebrdd.EBRDD; import tepe.TEPE; +import test.AbstractTest; import tmltranslator.TMLMapping; import tmltranslator.TMLMappingTextSpecification; import tmltranslator.TMLSyntaxChecking; @@ -28,7 +29,7 @@ import java.util.List; import static org.junit.Assert.assertTrue; -public class RunToNextBreakpointMaxTransTest extends AbstractUITest { +public class RunToNextBreakpointMaxTransTest extends AbstractTest { final String DIR_GEN = "test_diplo_simulator/"; final String [] MODELS_RTNBP_MAX_TRANS = {"rtnbmt"}; private String SIM_DIR; diff --git a/ttool/src/test/java/tmltranslator/RunUntilChannelAccessTest.java b/ttool/src/test/java/tmltranslator/RunUntilChannelAccessTest.java index d1bc79cfb9..57b4c0a85d 100644 --- a/ttool/src/test/java/tmltranslator/RunUntilChannelAccessTest.java +++ b/ttool/src/test/java/tmltranslator/RunUntilChannelAccessTest.java @@ -8,6 +8,7 @@ import org.junit.BeforeClass; import org.junit.Test; import req.ebrdd.EBRDD; import tepe.TEPE; +import test.AbstractTest; import tmltranslator.TMLMapping; import tmltranslator.TMLMappingTextSpecification; import tmltranslator.TMLSyntaxChecking; @@ -26,7 +27,7 @@ import java.util.List; import static org.junit.Assert.assertTrue; -public class RunUntilChannelAccessTest extends AbstractUITest { +public class RunUntilChannelAccessTest extends AbstractTest { final String DIR_GEN = "test_diplo_simulator/"; final String [] MODELS_RUCA = {"ruca"}; final static String EXPECTED_FILE_RUCA = getBaseResourcesDir() + "tmltranslator/expected/expected_ruca.txt"; diff --git a/ttool/src/test/java/tmltranslator/TMLComparingMethodTest.java b/ttool/src/test/java/tmltranslator/TMLComparingMethodTest.java index 31012a5617..313c199419 100644 --- a/ttool/src/test/java/tmltranslator/TMLComparingMethodTest.java +++ b/ttool/src/test/java/tmltranslator/TMLComparingMethodTest.java @@ -41,6 +41,7 @@ package tmltranslator; import org.junit.Before; import org.junit.Test; +import test.AbstractTest; import ui.AbstractUITest; import java.util.*; @@ -55,7 +56,7 @@ import static org.junit.Assert.*; * @author Minh Hiep PHAM */ -public class TMLComparingMethodTest extends AbstractUITest { +public class TMLComparingMethodTest extends AbstractTest { private TMLComparingMethod comparing; diff --git a/ttool/src/test/java/tmltranslator/TimelineDiagramTest.java b/ttool/src/test/java/tmltranslator/TimelineDiagramTest.java index fb75dfd09a..5946afad93 100644 --- a/ttool/src/test/java/tmltranslator/TimelineDiagramTest.java +++ b/ttool/src/test/java/tmltranslator/TimelineDiagramTest.java @@ -11,6 +11,7 @@ import remotesimulation.RemoteConnection; import remotesimulation.RemoteConnectionException; import req.ebrdd.EBRDD; import tepe.TEPE; +import test.AbstractTest; import tmltranslator.TMLMapping; import tmltranslator.TMLMappingTextSpecification; import tmltranslator.TMLSyntaxChecking; @@ -31,7 +32,7 @@ import java.util.List; import static org.junit.Assert.assertTrue; -public class TimelineDiagramTest extends AbstractUITest { +public class TimelineDiagramTest extends AbstractTest { final String DIR_GEN = "test_diplo_simulator/"; final String [] MODELS_TIMELINE = {"timelineDiagram"}; private String SIM_DIR; diff --git a/ttool/src/test/java/ui/AbstractUITest.java b/ttool/src/test/java/ui/AbstractUITest.java index b678c4a802..9b37645d8d 100644 --- a/ttool/src/test/java/ui/AbstractUITest.java +++ b/ttool/src/test/java/ui/AbstractUITest.java @@ -77,21 +77,4 @@ public abstract class AbstractUITest extends AbstractTest { return null; } - protected void monitorError(Process proc) { - BufferedReader proc_err = new BufferedReader(new InputStreamReader(proc.getErrorStream())); - new Thread() { - @Override public void run() { - String line; - try { - while ((line = proc_err.readLine()) != null) { - System.out.println("NOC executing err: " + line); - } - } catch (Exception e) { - //System.out.println("FAILED reading errors"); - return; - } - - } - }.start(); - } } diff --git a/ttool/src/test/java/tmltranslator/DiplodocusDelayPenaltyDisableTests.java b/ttool/src/test/java/ui/DiplodocusDelayPenaltyDisableTests.java similarity index 99% rename from ttool/src/test/java/tmltranslator/DiplodocusDelayPenaltyDisableTests.java rename to ttool/src/test/java/ui/DiplodocusDelayPenaltyDisableTests.java index eb21bc183e..9821d1a20e 100644 --- a/ttool/src/test/java/tmltranslator/DiplodocusDelayPenaltyDisableTests.java +++ b/ttool/src/test/java/ui/DiplodocusDelayPenaltyDisableTests.java @@ -1,4 +1,4 @@ -package tmltranslator; +package ui; import common.ConfigurationTTool; import common.SpecConfigTTool; @@ -9,6 +9,7 @@ import org.junit.BeforeClass; import org.junit.Test; import req.ebrdd.EBRDD; import tepe.TEPE; +import test.AbstractTest; import tmltranslator.TMLMapping; import tmltranslator.TMLMappingTextSpecification; import tmltranslator.TMLSyntaxChecking; -- GitLab