From c17aaecb36aa9c29b6263f182bcdf14698f61327 Mon Sep 17 00:00:00 2001 From: hansen <dominik_hansen@web.de> Date: Mon, 24 Nov 2014 11:53:58 +0100 Subject: [PATCH] removed tla2bAst from compile path --- build.gradle | 2 +- src/main/java/de/tlc4b/TLC4B.java | 26 ++++------------- .../coverage/IntegrationCoverageTest.java | 15 +++++----- src/test/java/de/tlc4b/util/TestUtil.java | 29 ++++++++++++++++--- 4 files changed, 39 insertions(+), 33 deletions(-) diff --git a/build.gradle b/build.gradle index 8ac7715..0aee239 100644 --- a/build.gradle +++ b/build.gradle @@ -92,7 +92,7 @@ jar { jar { manifest { attributes "Main-Class" : 'de.tlc4b.TLC4B' - attributes "Class-Path": './tla/ tlatools.jar' + attributes "Class-Path": 'tlatools.jar' } } diff --git a/src/main/java/de/tlc4b/TLC4B.java b/src/main/java/de/tlc4b/TLC4B.java index 9b8a967..a6001ea 100644 --- a/src/main/java/de/tlc4b/TLC4B.java +++ b/src/main/java/de/tlc4b/TLC4B.java @@ -219,7 +219,7 @@ public class TLC4B { } } - private void progress(String[] args) throws IOException, BException { + public void progress(String[] args) throws IOException, BException { handleParameter(args); handleMainFileName(); @@ -426,26 +426,12 @@ public class TLC4B { } } - public static void testParse(String[] args, boolean deleteFiles) - throws Exception { - TLC4BGlobals.resetGlobals(); - TLC4BGlobals.setDeleteOnExit(deleteFiles); - TLC4BGlobals.setCreateTraceFile(false); - TLC4BGlobals.setTestingMode(true); - // B2TLAGlobals.setCleanup(true); - TLC4B tlc4b = new TLC4B(); - try { - tlc4b.progress(args); - } catch (Exception e) { - e.printStackTrace(); - System.err.println(e.getMessage()); - throw e; - } - File module = new File(tlc4b.buildDir, - tlc4b.machineFileNameWithoutFileExtension + ".tla"); + public File getBuildDir() { + return buildDir; + } - // parse result - new de.tla2bAst.Translator(module.getCanonicalPath()); + public String getMachineFileNameWithoutFileExtension() { + return machineFileNameWithoutFileExtension; } } diff --git a/src/test/java/de/tlc4b/coverage/IntegrationCoverageTest.java b/src/test/java/de/tlc4b/coverage/IntegrationCoverageTest.java index a9f58d1..6b378ad 100644 --- a/src/test/java/de/tlc4b/coverage/IntegrationCoverageTest.java +++ b/src/test/java/de/tlc4b/coverage/IntegrationCoverageTest.java @@ -1,6 +1,5 @@ package de.tlc4b.coverage; - import java.io.File; import java.util.ArrayList; @@ -15,9 +14,8 @@ import de.tlc4b.util.PolySuite.Config; import de.tlc4b.util.PolySuite.Configuration; @RunWith(PolySuite.class) -public class IntegrationCoverageTest extends AbstractParseMachineTest{ +public class IntegrationCoverageTest extends AbstractParseMachineTest { - private final File machine; public IntegrationCoverageTest(File machine, TLCResult result) { @@ -26,8 +24,8 @@ public class IntegrationCoverageTest extends AbstractParseMachineTest{ @Test public void testRunTLC() throws Exception { - String[] a = new String[] {machine.getPath(), "-notlc"}; - TLC4B.test(a,true); + String[] a = new String[] { machine.getPath(), "-notlc" }; + TLC4B.test(a, true); } @Config @@ -35,13 +33,14 @@ public class IntegrationCoverageTest extends AbstractParseMachineTest{ final ArrayList<String> list = new ArrayList<String>(); final ArrayList<String> ignoreList = new ArrayList<String>(); list.add("../prob_examples/public_examples/TLC/"); - - list.add("./src/test/resources/"); + + list.add("./src/test/resources/"); ignoreList.add("./src/test/resources/compound/"); ignoreList.add("./src/test/resources/other/"); ignoreList.add("./src/test/resources/test/"); ignoreList.add("./src/test/resources/testing/"); + ignoreList.add("./src/test/resources/todo/"); return getConfiguration2(list, ignoreList); } - + } diff --git a/src/test/java/de/tlc4b/util/TestUtil.java b/src/test/java/de/tlc4b/util/TestUtil.java index 6f4343b..58f66e0 100644 --- a/src/test/java/de/tlc4b/util/TestUtil.java +++ b/src/test/java/de/tlc4b/util/TestUtil.java @@ -107,8 +107,8 @@ public class TestUtil { System.out.println(b2tlaTranslator.getConfigString()); String name = b2tlaTranslator.getMachineName(); - - //parse check + + // parse check translateTLA2B(name, b2tlaTranslator.getModuleString(), b2tlaTranslator.getConfigString()); @@ -180,8 +180,7 @@ public class TestUtil { System.out.println("No result found."); return null; } - - + private static Process startJVM(final String optionsAsString, final String mainClass, final String[] arguments) throws IOException { @@ -204,6 +203,28 @@ public class TestUtil { return process; } + public static void testParse(String[] args, boolean deleteFiles) + throws Exception { + TLC4BGlobals.resetGlobals(); + TLC4BGlobals.setDeleteOnExit(deleteFiles); + TLC4BGlobals.setCreateTraceFile(false); + TLC4BGlobals.setTestingMode(true); + // B2TLAGlobals.setCleanup(true); + TLC4B tlc4b = new TLC4B(); + try { + tlc4b.progress(args); + } catch (Exception e) { + e.printStackTrace(); + System.err.println(e.getMessage()); + throw e; + } + File module = new File(tlc4b.getBuildDir(), + tlc4b.getMachineFileNameWithoutFileExtension() + ".tla"); + + // parse result + new de.tla2bAst.Translator(module.getCanonicalPath()); + } + } class StreamGobbler extends Thread { -- GitLab