Skip to content

Commit 82efdf8

Browse files
committed
Merge pull request #38 from ModelDriven/ST6Ri-61a
2 parents 9f7867b + 9083c3d commit 82efdf8

28 files changed

+3404
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
4+
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5+
<classpathentry kind="src" path="src">
6+
<attributes>
7+
<attribute name="test" value="true"/>
8+
</attributes>
9+
</classpathentry>
10+
<classpathentry kind="output" path="bin"/>
11+
</classpath>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/bin/
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>org.omg.sysml.uml.ecore.importer.tests</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.pde.ManifestBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.pde.SchemaBuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
</buildSpec>
24+
<natures>
25+
<nature>org.eclipse.pde.PluginNature</nature>
26+
<nature>org.eclipse.jdt.core.javanature</nature>
27+
</natures>
28+
</projectDescription>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
encoding/<project>=UTF-8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
4+
org.eclipse.jdt.core.compiler.compliance=1.8
5+
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
6+
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7+
org.eclipse.jdt.core.compiler.source=1.8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Manifest-Version: 1.0
2+
Bundle-ManifestVersion: 2
3+
Bundle-Name: Custom UML Importer Tests
4+
Bundle-SymbolicName: org.omg.sysml.uml.ecore.importer.tests
5+
Bundle-Version: 1.0.0.qualifier
6+
Automatic-Module-Name: org.omg.sysml.uml.ecore.importer.tests
7+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
8+
Require-Bundle: org.omg.sysml.uml.ecore.importer;bundle-version="1.0.0",
9+
org.junit,
10+
org.eclipse.core.runtime,
11+
org.eclipse.emf.importer,
12+
org.eclipse.uml2.uml.ecore.importer,
13+
org.eclipse.uml2.uml,
14+
org.apache.commons.io
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
The custom UML importer can be tested in two ways:
2+
3+
1) using the launch configuration : to check how org.omg.sysml.uml.ecore.importer.CustomUML2EcoreConverter changes the generation of composite properties.
4+
NOTE: it is hard to completely reproduce the EMF behaviour from SysML.uml => SysML.ecore,SysML.genmodel, so this test only focus on the UML2Ecore conversion.
5+
Its only purpose to ease the implementation of the custom UML2Ecore converter.
6+
7+
2) by launching a runtime to test the ecore generation in situation. Launch a runtime (which include org.omg.sysml.uml.ecore.importer), import org.omg.sysml and regenerate the ecore using the custom importer.
8+
In the end the custom importer should be integrated into the target plaform.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
3+
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
4+
<listEntry value="/org.omg.sysml.uml.ecore.importer.tests/src/org/omg/sysml/uml/ecore/importer/tests/UML2EcoreTest.java"/>
5+
</listAttribute>
6+
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
7+
<listEntry value="1"/>
8+
</listAttribute>
9+
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
10+
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
11+
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
12+
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
13+
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.omg.sysml.uml.ecore.importer.tests.UML2EcoreTest"/>
14+
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.omg.sysml.uml.ecore.importer.tests"/>
15+
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
16+
</launchConfiguration>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
source.. = src/
2+
output.. = bin/
3+
bin.includes = META-INF/,\
4+
.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
The generated Ecore files here are not the same as the one in org.omg.sysml:
2+
They are the result of the "Load" action of the UMLImporter wizard.
3+
4+
SysML_from_tests_before_ST6RI-61.reference is a reference of the EPackage obtained by the conversion before any change was made (as with the default UML importer).
5+
6+

0 commit comments

Comments
 (0)