Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Willink2016-10-19 09:41:12 +0000
committerEd Willink2016-10-30 11:40:59 +0000
commit5b5a36455a83acad8b46aec54b0d056fe3b26f7b (patch)
treec4639912d9add78ba873f0f9e6103ea121994782
parentcbc7aa07ac5a6c0931734f75cc9ba815dcbe3397 (diff)
downloadorg.eclipse.qvtd-5b5a36455a83acad8b46aec54b0d056fe3b26f7b.tar.gz
org.eclipse.qvtd-5b5a36455a83acad8b46aec54b0d056fe3b26f7b.tar.xz
org.eclipse.qvtd-5b5a36455a83acad8b46aec54b0d056fe3b26f7b.zip
[500962] Fix console bloat
-rw-r--r--plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/utilities/JavaSourceFileObject.java2
-rw-r--r--tests/org.eclipse.qvtd.all.tests/.launches/All QVTd Tests (Plugin).launch2
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java7
-rw-r--r--tests/org.eclipse.qvtd.doc.exe2016.tests/src/org/eclipse/qvtd/doc/exe2016/tests/qvtc/EXE2016InterpreterTests.java3
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java8
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiCompilerTests.java11
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java4
7 files changed, 21 insertions, 16 deletions
diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/utilities/JavaSourceFileObject.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/utilities/JavaSourceFileObject.java
index 5333b5590..c0e3c43a0 100644
--- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/utilities/JavaSourceFileObject.java
+++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/utilities/JavaSourceFileObject.java
@@ -175,7 +175,7 @@ public final class JavaSourceFileObject extends SimpleJavaFileObject
deleteJavaFiles(file);
}
else if (file.isFile() && file.getName().endsWith(".java")) {
- System.out.println("Delete " + file);
+ // System.out.println("Delete " + file);
file.delete();
}
}
diff --git a/tests/org.eclipse.qvtd.all.tests/.launches/All QVTd Tests (Plugin).launch b/tests/org.eclipse.qvtd.all.tests/.launches/All QVTd Tests (Plugin).launch
index 12c077e78..e1de8d6aa 100644
--- a/tests/org.eclipse.qvtd.all.tests/.launches/All QVTd Tests (Plugin).launch
+++ b/tests/org.eclipse.qvtd.all.tests/.launches/All QVTd Tests (Plugin).launch
@@ -28,7 +28,7 @@
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.qvtd.all.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m -ea -XX:PermSize=128M -XX:MaxPermSize=192M"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m -ea"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java
index 02e84a50b..606f8508d 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java
@@ -50,7 +50,6 @@ import org.eclipse.qvtd.pivot.qvtimperative.evaluation.QVTiEnvironmentFactory;
import org.eclipse.qvtd.pivot.qvtimperative.evaluation.QVTiIncrementalExecutor;
import org.eclipse.qvtd.pivot.qvtimperative.evaluation.QVTiTransformationExecutor;
import org.eclipse.qvtd.pivot.qvtimperative.utilities.QVTimperative;
-import org.eclipse.qvtd.runtime.evaluation.AbstractTransformer;
import org.eclipse.qvtd.runtime.evaluation.TransformationExecutor;
import org.eclipse.qvtd.runtime.evaluation.Transformer;
import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase;
@@ -97,7 +96,7 @@ public class OCL2QVTiTestCases extends LoadTestCase {
}
//
- // Execute the transformation with the interpreter
+ // Execute the transformation with the code generator
//
protected void executeModelsTX_CG(@NonNull Class<? extends Transformer> txClass, String modelName) throws Exception {
TransformationExecutor evaluator = new QVTiTransformationExecutor(getEnvironmentFactory(), txClass);
@@ -281,7 +280,7 @@ public class OCL2QVTiTestCases extends LoadTestCase {
@Test
public void testExample1_CG2() throws Exception {
- AbstractTransformer.EXCEPTIONS.setState(true);
+ // AbstractTransformer.EXCEPTIONS.setState(true);
// AbstractTransformer.INVOCATIONS.setState(true);
// DependencyAnalyzer.CALL.setState(true);
// DependencyAnalyzer.CREATE.setState(true);
@@ -539,7 +538,7 @@ public class OCL2QVTiTestCases extends LoadTestCase {
@Test
public void testExample3_Interpreted() throws Exception {
- AbstractTransformer.INVOCATIONS.setState(true);
+ // AbstractTransformer.INVOCATIONS.setState(true);
MyQVT myQVT = new MyQVT("example3");
myQVT.loadGenModels("KiamaAS.genmodel", "KiamaCS.genmodel");
ImperativeTransformation tx = myQVT.executeNewOCL2QVTi_CompilerChain("KiamaRewrite.ocl");
diff --git a/tests/org.eclipse.qvtd.doc.exe2016.tests/src/org/eclipse/qvtd/doc/exe2016/tests/qvtc/EXE2016InterpreterTests.java b/tests/org.eclipse.qvtd.doc.exe2016.tests/src/org/eclipse/qvtd/doc/exe2016/tests/qvtc/EXE2016InterpreterTests.java
index f4755a2fd..08493cf0d 100644
--- a/tests/org.eclipse.qvtd.doc.exe2016.tests/src/org/eclipse/qvtd/doc/exe2016/tests/qvtc/EXE2016InterpreterTests.java
+++ b/tests/org.eclipse.qvtd.doc.exe2016.tests/src/org/eclipse/qvtd/doc/exe2016/tests/qvtc/EXE2016InterpreterTests.java
@@ -24,7 +24,6 @@ import org.eclipse.qvtd.doc.exe2016.tests.qvtc.list2list.List2listPackage;
import org.eclipse.qvtd.pivot.qvtimperative.ImperativeTransformation;
import org.eclipse.qvtd.pivot.qvtimperative.evaluation.BasicQVTiExecutor;
import org.eclipse.qvtd.pivot.qvtimperative.utilities.QVTimperativeUtil;
-import org.eclipse.qvtd.runtime.evaluation.AbstractTransformer;
import org.eclipse.qvtd.xtext.qvtcore.tests.QVTcCompilerTests;
import org.junit.Test;
@@ -36,7 +35,7 @@ public class EXE2016InterpreterTests extends QVTcCompilerTests
@Override
@Test
public void testQVTcCompiler_Forward2Reverse() throws Exception {
- AbstractTransformer.EXCEPTIONS.setState(true);
+ // AbstractTransformer.EXCEPTIONS.setState(true);
String testFolderName = "forward2reverse";
URI testFolderURI = TESTS_BASE_URI.appendSegment(testFolderName);
DoublyLinkedListGenerator doublyLinkedListGenerator = new DoublyLinkedListGenerator();
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java
index 5c96ee423..c97a0d122 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java
@@ -46,7 +46,6 @@ import org.eclipse.qvtd.pivot.qvtimperative.evaluation.QVTiIncrementalExecutor;
import org.eclipse.qvtd.pivot.qvtimperative.evaluation.QVTiTransformationExecutor;
import org.eclipse.qvtd.pivot.qvtimperative.utilities.QVTimperative;
import org.eclipse.qvtd.pivot.qvtimperative.utilities.QVTimperativeUtil;
-import org.eclipse.qvtd.runtime.evaluation.AbstractTransformer;
import org.eclipse.qvtd.runtime.evaluation.Transformer;
import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase;
import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.TestsXMLUtil;
@@ -315,6 +314,9 @@ public class QVTcCompilerTests extends LoadTestCase
}
finally {
myQVT.dispose();
+ EPackage.Registry.INSTANCE.remove(FamiliesPackage.eNS_URI);
+ EPackage.Registry.INSTANCE.remove(Families2PersonsPackage.eNS_URI);
+ EPackage.Registry.INSTANCE.remove(PersonsPackage.eNS_URI);
}
}
@@ -394,6 +396,8 @@ public class QVTcCompilerTests extends LoadTestCase
}
finally {
myQVT.dispose();
+ EPackage.Registry.INSTANCE.remove(DoublylinkedlistPackage.eNS_URI);
+ EPackage.Registry.INSTANCE.remove(List2listPackage.eNS_URI);
}
}
@@ -492,7 +496,7 @@ public class QVTcCompilerTests extends LoadTestCase
@Test // fails through at least lack of multi-headed support, which may not be needed if better partitioned
public void testQVTcCompiler_SimpleUML2RDBMS() throws Exception {
- AbstractTransformer.INVOCATIONS.setState(true);
+ // AbstractTransformer.INVOCATIONS.setState(true);
String testFolderName = "uml2rdbms";
URI testFolderURI = TESTS_BASE_URI.appendSegment(testFolderName);
MyQVT myQVT = new MyQVT(testFolderName);
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiCompilerTests.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiCompilerTests.java
index 4946041f9..bf7019471 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiCompilerTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiCompilerTests.java
@@ -45,7 +45,6 @@ import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage;
import org.eclipse.qvtd.pivot.qvtimperative.evaluation.Execution2GraphVisitor;
import org.eclipse.qvtd.pivot.qvtimperative.evaluation.QVTiEnvironmentFactory;
import org.eclipse.qvtd.pivot.qvtimperative.evaluation.QVTiTransformationExecutor;
-import org.eclipse.qvtd.runtime.evaluation.AbstractTransformer;
import org.eclipse.qvtd.runtime.evaluation.Transformer;
import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase;
import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.TestsXMLUtil;
@@ -290,7 +289,7 @@ public class QVTiCompilerTests extends LoadTestCase
}
public void testCG_Tree2TallTree_qvti() throws Exception {
- AbstractTransformer.INVOCATIONS.setState(true);
+ // AbstractTransformer.INVOCATIONS.setState(true);
MyQVT myQVT = createQVT();
URI genModelURI = getProjectFileURI("Tree2TallTree/Tree2TallTree.genmodel");
URI transformURI = getProjectFileURI("Tree2TallTree/Tree2TallTree.qvti");
@@ -343,10 +342,10 @@ public class QVTiCompilerTests extends LoadTestCase
}
public void testCG_Tree2TallTreeInstallManual_qvti() throws Exception {
- AbstractTransformer.APPENDS.setState(true);
- AbstractTransformer.CONSUMES.setState(true);
- AbstractTransformer.EXCEPTIONS.setState(true);
- AbstractTransformer.INVOCATIONS.setState(true);
+ // AbstractTransformer.APPENDS.setState(true);
+ // AbstractTransformer.CONSUMES.setState(true);
+ // AbstractTransformer.EXCEPTIONS.setState(true);
+ // AbstractTransformer.INVOCATIONS.setState(true);
MyQVT myQVT = createQVT();
// URI genModelURI = getProjectFileURI("Tree2TallTree/Tree2TallTree.genmodel");
// URI transformURI = getProjectFileURI("Tree2TallTree/Tree2TallTreeInstall.qvti");
diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
index 4ae8560ef..818506af5 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
@@ -66,6 +66,8 @@ import org.eclipse.qvtd.xtext.qvtimperative.tests.ModelNormalizer;
import org.eclipse.qvtd.xtext.qvtimperative.tests.QVTiTestUtil;
import org.eclipse.qvtd.xtext.qvtimperativecs.QVTimperativeCSPackage;
import org.eclipse.qvtd.xtext.qvtrelation.tests.forward2reverse.Forward2ReverseNormalizer;
+import org.eclipse.qvtd.xtext.qvtrelation.tests.forward2reverse.PForward2Reverse.PForward2ReversePackage;
+import org.eclipse.qvtd.xtext.qvtrelation.tests.forward2reverse.doublylinkedlist.doublylinkedlistPackage;
import org.eclipse.qvtd.xtext.qvtrelation.tests.hstm2fstm.FlatStateMachineNormalizer;
import org.eclipse.xtext.resource.XtextResource;
import org.junit.After;
@@ -561,6 +563,8 @@ public class QVTrCompilerTests extends LoadTestCase
}
finally {
myQVT.dispose();
+ EPackage.Registry.INSTANCE.remove(doublylinkedlistPackage.eNS_URI);
+ EPackage.Registry.INSTANCE.remove(PForward2ReversePackage.eNS_URI);
}
}

Back to the top