Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2017-08-04 05:08:53 -0400
committerHenrik Rentz-Reichert2017-08-04 05:08:53 -0400
commite53dc76425d5170a0fb587774bd9e37398fa99aa (patch)
tree6bbaa7c14a2413efc41c556584110bd608ecb196
parent2b481f36070bf3b5f85a2cafd1b313c51b08f502 (diff)
downloadorg.eclipse.etrice-e53dc76425d5170a0fb587774bd9e37398fa99aa.tar.gz
org.eclipse.etrice-e53dc76425d5170a0fb587774bd9e37398fa99aa.tar.xz
org.eclipse.etrice-e53dc76425d5170a0fb587774bd9e37398fa99aa.zip
changed TestHierInheritedFSM again
-rw-r--r--releng/org.eclipse.etrice.releng/buckminster.script30
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/src/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.xtend9
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/xtend-gen/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.java11
3 files changed, 30 insertions, 20 deletions
diff --git a/releng/org.eclipse.etrice.releng/buckminster.script b/releng/org.eclipse.etrice.releng/buckminster.script
index ebe390059..f27ce8257 100644
--- a/releng/org.eclipse.etrice.releng/buckminster.script
+++ b/releng/org.eclipse.etrice.releng/buckminster.script
@@ -3,7 +3,7 @@
# Run Buckminster script (nightly)
#
-setpref complianceLevel=1.6
+setpref complianceLevel=1.8
setpref targetPlatformPath="${WORKSPACE}/buildroot/target.platform"
@@ -24,23 +24,25 @@ junit -l org.eclipse.etrice.etunit.converter.tests/org.eclipse.etrice.etunit.con
junit -l org.eclipse.etrice.ui.behavior.tests/org.eclipse.etrice.ui.behavior.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.ui.behavior.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.ui.behavior.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.ui.behavior.tests.launch-out.log
junit -l org.eclipse.etrice.ui.structure.tests/org.eclipse.etrice.ui.structure.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.ui.structure.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.ui.structure.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.ui.structure.tests.launch-out.log
junit -l org.eclipse.etrice.abstractexec.behavior.tests/org.eclipse.etrice.abstractexec.behavior.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.abstractexec.behavior.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.abstractexec.behavior.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.abstractexec.behavior.tests.launch-out.log
+junit -l org.eclipse.etrice.core.genmodel.fsm.tests/org.eclipse.etrice.core.genmodel.fsm.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.core.genmodel.fsm.tests.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.core.genmodel.fsm.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.core.genmodel.fsm.tests.launch-out.log
-perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.runtime.c.tests#run_tests
-perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.runtime.cpp.tests#run_tests
-perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.generator.c.tests#run_tests
-perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.generator.cpp.tests#run_tests
-perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.generator.java.tests#run_tests
+#perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.runtime.c.tests#run_tests
+#perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.runtime.cpp.tests#run_tests
-perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.ui.runtime#create.contents
+#perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.generator.c.tests#run_tests
+#perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.generator.cpp.tests#run_tests
+#perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.generator.java.tests#run_tests
-perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.releng#export.c.generator
-perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.releng#export.cpp.generator
-perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.releng#export.java.generator
-perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.releng#copy.deliveries
+#perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.ui.runtime#create.contents
-perform -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.site#site.p2.zip
+#perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.releng#export.c.generator
+#perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.releng#export.cpp.generator
+#perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.releng#export.java.generator
+#perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.releng#copy.deliveries
-perform -D WORKSPACE=${WORKSPACE} org.eclipse.etrice.releng#create.site.index
+#perform -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.site#site.p2.zip
-perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.releng#copy.sites
+#perform -D WORKSPACE=${WORKSPACE} org.eclipse.etrice.releng#create.site.index
+
+#perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.releng#copy.sites
diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/src/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.xtend b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/src/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.xtend
index b8c209420..5e0975af4 100644
--- a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/src/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.xtend
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/src/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.xtend
@@ -28,11 +28,14 @@ import static extension org.eclipse.etrice.core.genmodel.fsm.FsmGenExtensions.*
class TestHierInheritedFSM extends FsmGenTestBase {
GraphContainer gc
+ GraphContainer gc2
@Before
def void SetUp() {
- gc = getGraphContainer("HierInheritedFSMExample.room", "TestActor2")
+ gc = getGraphContainer("HierInheritedFSMExample.room", "TestActor")
+ gc2 = getGraphContainer("HierInheritedFSMExample.room", "TestActor2")
assertNotNull("graph context was created", gc)
+ assertNotNull("graph context was created", gc2)
val logger = new NullLogger
FsmGenChecker.check(gc, logger)
@@ -70,11 +73,11 @@ class TestHierInheritedFSM extends FsmGenTestBase {
@Test
def void testOriginRefs() {
- gc.graph.nodes.filter[stateGraphNode.name == 'state0'] => [
+ gc2.graph.nodes.filter[stateGraphNode.name == 'state0'] => [
assertEquals(1, size)
assertEquals('RefinedState:TestActor$state0', EcoreUtil.getURI(head.stateGraphNode).fragment)
]
- gc.graph.links.filter[transition.name == 'tr3'] => [
+ gc2.graph.links.filter[transition.name == 'tr3'] => [
assertEquals(1, size)
assertEquals('RefinedTransition:TestActor2$tr3', EcoreUtil.getURI(head.transition).fragment)
]
diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/xtend-gen/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.java b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/xtend-gen/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.java
index fed0ec6d8..1ed8dd1d7 100644
--- a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/xtend-gen/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.java
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/xtend-gen/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.java
@@ -38,11 +38,16 @@ import org.junit.Test;
public class TestHierInheritedFSM extends FsmGenTestBase {
private GraphContainer gc;
+ private GraphContainer gc2;
+
@Before
public void SetUp() {
- GraphContainer _graphContainer = this.getGraphContainer("HierInheritedFSMExample.room", "TestActor2");
+ GraphContainer _graphContainer = this.getGraphContainer("HierInheritedFSMExample.room", "TestActor");
this.gc = _graphContainer;
+ GraphContainer _graphContainer_1 = this.getGraphContainer("HierInheritedFSMExample.room", "TestActor2");
+ this.gc2 = _graphContainer_1;
Assert.assertNotNull("graph context was created", this.gc);
+ Assert.assertNotNull("graph context was created", this.gc2);
final NullLogger logger = new NullLogger();
FsmGenChecker.check(this.gc, logger);
boolean _hasErrors = logger.hasErrors();
@@ -122,7 +127,7 @@ public class TestHierInheritedFSM extends FsmGenTestBase {
@Test
public void testOriginRefs() {
- Graph _graph = this.gc.getGraph();
+ Graph _graph = this.gc2.getGraph();
EList<Node> _nodes = _graph.getNodes();
final Function1<Node, Boolean> _function = new Function1<Node, Boolean>() {
@Override
@@ -146,7 +151,7 @@ public class TestHierInheritedFSM extends FsmGenTestBase {
}
};
ObjectExtensions.<Iterable<Node>>operator_doubleArrow(_filter, _function_1);
- Graph _graph_1 = this.gc.getGraph();
+ Graph _graph_1 = this.gc2.getGraph();
EList<Link> _links = _graph_1.getLinks();
final Function1<Link, Boolean> _function_2 = new Function1<Link, Boolean>() {
@Override

Back to the top