[526567] Re-instate MiniOCLCSParsingTest
diff --git a/doc/org.eclipse.qvtd.doc.miniocl/.gitignore b/doc/org.eclipse.qvtd.doc.miniocl/.gitignore
index ae3c172..09e3bc9 100644
--- a/doc/org.eclipse.qvtd.doc.miniocl/.gitignore
+++ b/doc/org.eclipse.qvtd.doc.miniocl/.gitignore
@@ -1 +1,2 @@
/bin/
+/target/
diff --git a/doc/org.eclipse.qvtd.doc.minioclcs.xtext/.gitignore b/doc/org.eclipse.qvtd.doc.minioclcs.xtext/.gitignore
index 177151f..b6d9e05 100644
--- a/doc/org.eclipse.qvtd.doc.minioclcs.xtext/.gitignore
+++ b/doc/org.eclipse.qvtd.doc.minioclcs.xtext/.gitignore
@@ -1,2 +1,3 @@
/bin/
/.antlr-generator-3.2.0-patch.jar
+/target/
diff --git a/doc/pom.xml b/doc/pom.xml
index 172f7e8..e86ee3a 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -14,7 +14,7 @@
</parent>
<modules>
<module>org.eclipse.qvtd.doc</module>
- <!--module>org.eclipse.qvtd.doc.miniocl</module-->
- <!--module>org.eclipse.qvtd.doc.minioclcs.xtext</module-->
+ <module>org.eclipse.qvtd.doc.miniocl</module>
+ <module>org.eclipse.qvtd.doc.minioclcs.xtext</module>
</modules>
</project>
\ No newline at end of file
diff --git "a/tests/org.eclipse.qvtd.all.tests/.launches/All QVTd Tests \050Plugin\051.launch" "b/tests/org.eclipse.qvtd.all.tests/.launches/All QVTd Tests \050Plugin\051.launch"
index 364d7b5..0c40fe6 100644
--- "a/tests/org.eclipse.qvtd.all.tests/.launches/All QVTd Tests \050Plugin\051.launch"
+++ "b/tests/org.eclipse.qvtd.all.tests/.launches/All QVTd Tests \050Plugin\051.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="-DtestNameSuffix=plugin -Xms40m -Xmx1024m -ea"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-DtestNameSuffix=plugin -ea"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
diff --git a/tests/org.eclipse.qvtd.all.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.qvtd.all.tests/META-INF/MANIFEST.MF
index 521b3c7..40d8a0d 100644
--- a/tests/org.eclipse.qvtd.all.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.qvtd.all.tests/META-INF/MANIFEST.MF
@@ -18,7 +18,8 @@
org.eclipse.qvtd.xtext.qvtrelation.tests;bundle-version="[0.15.0,1.0.0)",
org.eclipse.qvtd.umlx.tests;bundle-version="[0.15.0,1.0.0)",
org.eclipse.qvtd.doc.bigmde2016.tests,
- org.eclipse.qvtd.doc.exe2016.tests
+ org.eclipse.qvtd.doc.exe2016.tests,
+ org.eclipse.qvtd.doc.minioclcs.xtext.tests
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/tests/org.eclipse.qvtd.all.tests/src/org/eclipse/qvtd/all/tests/AllQVTdTests.java b/tests/org.eclipse.qvtd.all.tests/src/org/eclipse/qvtd/all/tests/AllQVTdTests.java
index 1707ed5..2281eff 100644
--- a/tests/org.eclipse.qvtd.all.tests/src/org/eclipse/qvtd/all/tests/AllQVTdTests.java
+++ b/tests/org.eclipse.qvtd.all.tests/src/org/eclipse/qvtd/all/tests/AllQVTdTests.java
@@ -1,15 +1,13 @@
/*******************************************************************************
- * Copyright (c) 2002, 2017 IBM Corporation and others.
+ * Copyright (c) 2012, 2017 Willink Transformations and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * IBM - Initial API and implementation
- * E.D.Willink - Bug 298634
+ * E.D.Willink - initial API and implementation
*******************************************************************************/
-
package org.eclipse.qvtd.all.tests;
import java.util.Arrays;
@@ -18,6 +16,7 @@
import org.eclipse.qvtd.compiler.tests.AllCompilerTests;
import org.eclipse.qvtd.doc.bigmde2016.tests.AllbigMDE2016Tests;
import org.eclipse.qvtd.doc.exe2016.tests.Allexe2016Tests;
+import org.eclipse.qvtd.doc.minioclcs.xtext.tests.MiniOCLCSParsingTest;
import org.eclipse.qvtd.umlx.tests.AllUMLXTests;
import org.eclipse.qvtd.xtext.qvtbase.tests.QVTbaseLibraryTests;
import org.eclipse.qvtd.xtext.qvtcore.tests.AllQVTcoreTests;
@@ -53,7 +52,7 @@
// result.addTest(AllATLTests.suite()); // ATL uses a different ANTLR to Xtext - must be run separately
result.addTest(AllbigMDE2016Tests.suite()); // NB this is very slow since we are -ea
result.addTest(Allexe2016Tests.suite()); // NB this is very slow since we are -ea
- // result.addTestSuite(MiniOCLCSParsingTest.class);
+ result.addTestSuite(MiniOCLCSParsingTest.class);
return result;
}
diff --git a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/.gitignore b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/.gitignore
index ae3c172..09e3bc9 100644
--- a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/.gitignore
+++ b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/.gitignore
@@ -1 +1,2 @@
/bin/
+/target/
diff --git a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/build.properties b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/build.properties
index fbebcf0..fe73bcd 100644
--- a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/build.properties
+++ b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/build.properties
@@ -2,5 +2,6 @@
bin.includes = .,\
META-INF/,\
about.html,\
- plugin.properties
+ plugin.properties,\
+ models/
src.includes = about.html
diff --git a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src/org/eclipse/qvtd/doc/minioclcs/xtext/tests/models/simple_invariants.mocl b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/models/simple_invariants.mocl
similarity index 100%
rename from tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src/org/eclipse/qvtd/doc/minioclcs/xtext/tests/models/simple_invariants.mocl
rename to tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/models/simple_invariants.mocl
diff --git a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src/org/eclipse/qvtd/doc/minioclcs/xtext/tests/models/simple_packages.mocl b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/models/simple_packages.mocl
similarity index 100%
rename from tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src/org/eclipse/qvtd/doc/minioclcs/xtext/tests/models/simple_packages.mocl
rename to tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/models/simple_packages.mocl
diff --git a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/pom.xml b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/pom.xml
new file mode 100644
index 0000000..a78f306
--- /dev/null
+++ b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.qvtd-tests</groupId>
+ <artifactId>org.eclipse.qvtd.doc.minioclcs.xtext.tests</artifactId>
+ <version>0.15.0-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+ <parent>
+ <groupId>org.eclipse.qvtd-tests</groupId>
+ <artifactId>org.eclipse.qvtd.tests-folder</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>**/MiniOCLCSParsingTest.java</include>
+ </includes>
+ <argLine>-DtestNameSuffix="maven" -ea</argLine>
+ <workingDirectory>${project.build.directory}/test-projects</workingDirectory>
+ <reportsDirectory>${project.build.directory}/surefire-reports/standalone</reportsDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <!--debugPort>5005</debugPort-->
+ <testClass>org.eclipse.qvtd.doc.minioclcs.xtext.tests.MiniOCLCSParsingTest</testClass>
+ <useUIHarness>true</useUIHarness>
+ <useUIThread>true</useUIThread>
+ <argLine>-DtestNameSuffix="tycho" -ea</argLine>
+ <reportsDirectory>${project.build.directory}/surefire-reports/plugin</reportsDirectory>
+ <systemProperties>
+ <TYCHO_UI_TEST>true</TYCHO_UI_TEST><!-- See Bug 526252 -->
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src/org/eclipse/qvtd/doc/minioclcs/xtext/tests/MiniOCLCSParsingTest.java b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src/org/eclipse/qvtd/doc/minioclcs/xtext/tests/MiniOCLCSParsingTest.java
index 2d0450b..b04c1db 100644
--- a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src/org/eclipse/qvtd/doc/minioclcs/xtext/tests/MiniOCLCSParsingTest.java
+++ b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src/org/eclipse/qvtd/doc/minioclcs/xtext/tests/MiniOCLCSParsingTest.java
@@ -1,12 +1,20 @@
-/*
- * generated by Xtext 2.10.0-SNAPSHOT
- */
+/*******************************************************************************
+ * Copyright (c) 2014, 2017 Willink Transformations and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * E.D.Willink - initial API and implementation
+ *******************************************************************************/
package org.eclipse.qvtd.doc.minioclcs.xtext.tests;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.ocl.pivot.resource.ProjectManager;
import org.eclipse.qvtd.doc.MiniOCLCSStandaloneSetup;
import org.eclipse.qvtd.doc.minioclcs.RootCS;
import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase;
@@ -22,24 +30,23 @@
MiniOCLCSStandaloneSetup.doSetup();
}
-
protected RootCS parse(String fileName) {
URI fileURI = getModelsURI(fileName);
ResourceSet rSet = new ResourceSetImpl();
+ ProjectManager.CLASS_PATH.initializeResourceSet(rSet);
Resource resoure = rSet.getResource(fileURI, true);
return (RootCS) resoure.getContents().get(0);
}
@Test
public void testSimpleMiniOCL_PackagesDef() {
- RootCS result = parse("models/simple_packages.mocl");
+ RootCS result = parse("simple_packages.mocl");
assertNotNull(result);
}
@Test
public void testSimpleMiniOCL_Invariant() {
- RootCS result = parse("models/simple_invariants.mocl");
+ RootCS result = parse("simple_invariants.mocl");
assertNotNull(result);
}
-
}
diff --git a/tests/pom.xml b/tests/pom.xml
index fd34ecc..fe8e57a 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -20,7 +20,7 @@
<!--module>org.eclipse.qvtd.cs2as.compiler.tests</module-->
<module>org.eclipse.qvtd.doc.bigmde2016.tests</module>
<module>org.eclipse.qvtd.doc.exe2016.tests</module>
- <!--module>org.eclipse.qvtd.doc.minioclcs.xtext.tests</module-->
+ <module>org.eclipse.qvtd.doc.minioclcs.xtext.tests</module>
<module>org.eclipse.qvtd.umlx.tests</module>
<module>org.eclipse.qvtd.xtext.qvtbase.tests</module>
<module>org.eclipse.qvtd.xtext.qvtcore.tests</module>
