diff options
author | Sebastien Revol | 2016-05-10 12:56:31 +0000 |
---|---|---|
committer | jeremie.tatibouet | 2016-05-11 11:21:42 +0000 |
commit | edbf6ed0c9047eb9c6cad360a091a1e7cc8f6bfd (patch) | |
tree | e98c38dcd38a42a297efcc5edc8eb92a5ebfaa58 | |
parent | be125e71e6b8d9a54d04fa6b438cd79829179fff (diff) | |
download | org.eclipse.papyrus-moka-edbf6ed0c9047eb9c6cad360a091a1e7cc8f6bfd.tar.gz org.eclipse.papyrus-moka-edbf6ed0c9047eb9c6cad360a091a1e7cc8f6bfd.tar.xz org.eclipse.papyrus-moka-edbf6ed0c9047eb9c6cad360a091a1e7cc8f6bfd.zip |
Added tests and fixed build issues
Change-Id: I8462b0e8e73407ce25df8d8b9a6cadd65d727099
Signed-off-by: Sebastien Revol <sebastien.revol@cea.fr>
19 files changed, 114 insertions, 9 deletions
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF index f179b49d..b69271e8 100644 --- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF +++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF @@ -4,7 +4,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.uml2.uml.profile.standard;visibility:=reexport,
org.eclipse.uml2.types;visibility:=reexport,
org.eclipse.uml2.uml;bundle-version="5.1.0";visibility:=reexport,
- org.eclipse.papyrus.moka.fmi;bundle-version="2.0.0"
+ org.eclipse.papyrus.moka.fmi;bundle-version="2.0.0",
+ org.eclipse.uml2.uml.resources;bundle-version="5.2.0"
Bundle-ActivationPolicy: lazy
Bundle-Version: 2.0.0.qualifier
Bundle-ClassPath: .
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/build.properties b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/build.properties index bd91e64b..02eea1be 100644 --- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/build.properties +++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/build.properties @@ -1,7 +1,9 @@ -source.. = src/
+source.. = src/,\
+ src-gen/
bin.includes = META-INF/,\
.,\
plugin.xml,\
model/,\
about.html
src.includes = about.html
+output.. = bin/
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/.classpath b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/.classpath index 7498423d..b862a296 100644 --- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/.classpath +++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/.classpath @@ -2,6 +2,6 @@ <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/build.properties b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/build.properties index 4ce25931..586a95b4 100644 --- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/build.properties +++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/build.properties @@ -1,7 +1,8 @@ source.. = src/
bin.includes = META-INF/,\
- transforms/,\
- about.html
+ about.html,\
+ .
jars.compile.order = .
source.. = src/
src.includes = about.html
+source.. = src/
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/pom.xml b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/pom.xml new file mode 100644 index 00000000..aaaa5bc4 --- /dev/null +++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/pom.xml @@ -0,0 +1,18 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <!-- Parent POM (i.e., Tools) --> + <parent> + <artifactId>org.eclipse.papyrus.moka.bundles.fmi.tools</artifactId> + <groupId>org.eclipse.papyrus.moka.bundles.fmi.tools</groupId> + <version>2.0.0-SNAPSHOT</version> + </parent> + + <!-- POM Description --> + <artifactId>org.eclipse.papyrus.moka.fmi.profile.ui</artifactId> + <packaging>eclipse-plugin</packaging> + <name>org.eclipse.papyrus.moka.fmi.profile.ui</name> + <description>Papyrus integration of FMI 2.0 profile</description> + +</project>
\ No newline at end of file diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/build.properties b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/build.properties index e78d0eaf..4f8dbcee 100644 --- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/build.properties +++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/build.properties @@ -1,4 +1,5 @@ -source.. = src/
+source.. = src/,\
+ src-gen/
bin.includes = META-INF/,\
.,\
plugin.xml,\
@@ -7,4 +8,5 @@ bin.includes = META-INF/,\ plugin.properties
src.includes = schema/fmi2ModelDescription.xsd,\
about.html
+output.. = bin/
diff --git a/bundles/fmi/tools/pom.xml b/bundles/fmi/tools/pom.xml index efe1591d..bc1e6512 100644 --- a/bundles/fmi/tools/pom.xml +++ b/bundles/fmi/tools/pom.xml @@ -23,6 +23,7 @@ <module>com.sun.jna</module>
<module>org.eclipse.papyrus.moka.fmi</module>
<module>org.eclipse.papyrus.moka.fmi.fmi2uml</module>
+ <module>org.eclipse.papyrus.moka.fmi.profile.ui</module>
</modules>
</project>
\ No newline at end of file diff --git a/tests/org.eclipse.papyrus.moka.fmi.test/.classpath b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/.classpath index eca7bdba..eca7bdba 100644 --- a/tests/org.eclipse.papyrus.moka.fmi.test/.classpath +++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/.classpath diff --git a/tests/org.eclipse.papyrus.moka.fmi.test/.project b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/.project index 337bba57..337bba57 100644 --- a/tests/org.eclipse.papyrus.moka.fmi.test/.project +++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/.project diff --git a/tests/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF index 0e1b49d6..0be4f6c6 100644 --- a/tests/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF +++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF @@ -2,12 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Test plugin Bundle-SymbolicName: org.eclipse.papyrus.moka.fmi.test -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;bundle-version="4.12.0", org.eclipse.papyrus.moka.fmi;bundle-version="2.0.0", org.eclipse.core.runtime;bundle-version="3.12.0", - org.eclipse.emf.compare.uml2;bundle-version="2.4.0", org.eclipse.papyrus.moka.fmi.fmi2uml;bundle-version="2.0.0", org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.0" Bundle-Activator: org.eclipse.papyrus.moka.fmi.test.Activator diff --git a/tests/org.eclipse.papyrus.moka.fmi.test/TestFMI.launch b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/TestFMI.launch index 3dd684e2..3dd684e2 100644 --- a/tests/org.eclipse.papyrus.moka.fmi.test/TestFMI.launch +++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/TestFMI.launch diff --git a/tests/org.eclipse.papyrus.moka.fmi.test/build.properties b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/build.properties index 342f3ffd..342f3ffd 100644 --- a/tests/org.eclipse.papyrus.moka.fmi.test/build.properties +++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/build.properties diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/pom.xml b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/pom.xml new file mode 100644 index 00000000..a6375a51 --- /dev/null +++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/pom.xml @@ -0,0 +1,20 @@ +<?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>
+
+ <!-- Parent POM (i.e., Tests) -->
+ <parent>
+ <groupId>org.eclipse.papyrus.moka.tests.fmi</groupId>
+ <artifactId>org.eclipse.papyrus.moka.tests.fmi</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <!-- POM description -->
+ <artifactId>org.eclipse.papyrus.moka.fmi.test</artifactId>
+ <packaging>eclipse-test-plugin</packaging>
+ <name>org.eclipse.papyrus.moka.fmi.test</name>
+
+</project>
\ No newline at end of file diff --git a/tests/org.eclipse.papyrus.moka.fmi.test/resources/PV.fmu b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV.fmu Binary files differindex 0fed7142..0fed7142 100644 --- a/tests/org.eclipse.papyrus.moka.fmi.test/resources/PV.fmu +++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV.fmu diff --git a/tests/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/Activator.java b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/Activator.java index dc331a2e..dc331a2e 100644 --- a/tests/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/Activator.java +++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/Activator.java diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/AllTests.java b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/AllTests.java new file mode 100644 index 00000000..dee4caf2 --- /dev/null +++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/AllTests.java @@ -0,0 +1,11 @@ +package org.eclipse.papyrus.moka.fmi.test;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses({TestFMI.class})public class AllTests {
+
+
+}
diff --git a/tests/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/TestFMI.java b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/TestFMI.java index bc90545c..bc90545c 100644 --- a/tests/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/TestFMI.java +++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/TestFMI.java diff --git a/tests/fmi/pom.xml b/tests/fmi/pom.xml new file mode 100644 index 00000000..326a12d4 --- /dev/null +++ b/tests/fmi/pom.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- Parent POM (i.e., Tests) -->
+ <parent>
+ <groupId>org.eclipse.papyrus.moka.tests</groupId>
+ <artifactId>org.eclipse.papyrus.moka.tests</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <!-- POM Description -->
+ <groupId>org.eclipse.papyrus.moka.tests.fmi</groupId>
+ <artifactId>org.eclipse.papyrus.moka.tests.fmi</artifactId>
+ <packaging>pom</packaging>
+ <name>FMI tests (FMI folder)</name>
+
+ <build>
+ <plugins>
+ <!-- Tests execution -->
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <failIfNoTests>false</failIfNoTests>
+ <useUIHarness>true</useUIHarness>
+ <useUIThread>true</useUIThread>
+ <includes>
+ <include>**/AllTests.java</include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Modules to build -->
+ <modules>
+ <module>org.eclipse.papyrus.moka.fmi.test</module>
+ </modules>
+
+</project>
diff --git a/tests/pom.xml b/tests/pom.xml index b79df257..8a090843 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -20,6 +20,7 @@ <!-- Modules to build -->
<modules>
<module>semantics</module>
+ <module>fmi</module>
<module>org.eclipse.payrus.moka.tests.framework</module>
</modules>
|