Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2011-09-15 15:55:47 +0000
committerHenrik Rentz-Reichert2011-09-15 15:55:47 +0000
commit2932338bdd7e31bd29f9f10e9934d3a2f161c988 (patch)
tree84d7782f9105598725b3c214eeb8f38f555d2291 /tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests
parent5af148b9e0d41764ef5aa8efc4a10b02e22cb692 (diff)
downloadorg.eclipse.etrice-2932338bdd7e31bd29f9f10e9934d3a2f161c988.tar.gz
org.eclipse.etrice-2932338bdd7e31bd29f9f10e9934d3a2f161c988.tar.xz
org.eclipse.etrice-2932338bdd7e31bd29f9f10e9934d3a2f161c988.zip
[tutorials, integration.tests] removed mwe related stuff
Diffstat (limited to 'tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests')
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestChoicePoint.java9
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.java17
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.mwe218
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestHandler.java9
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThread.java11
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestSendingDataByValue.java11
6 files changed, 0 insertions, 75 deletions
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestChoicePoint.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestChoicePoint.java
index 294ce4cdb..35924c572 100644
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestChoicePoint.java
+++ b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestChoicePoint.java
@@ -17,7 +17,6 @@ import static org.junit.Assert.assertEquals;
import org.eclipse.etrice.integration.ChoicePointTest.SubSystem_CPTest;
import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -27,14 +26,6 @@ import org.junit.Test;
public class IntegrationTestChoicePoint extends IntegrationTestBase {
@Before
public void setUp() throws Exception {
- // we have to launch a JUnit Plugin test since for the build we need an Eclipse environment
- // in this context the Mwe2Launcher suffers from https://bugs.eclipse.org/bugs/show_bug.cgi?id=318721
- /*
- Mwe2Launcher.main(new String[]{"/org.eclipse.etrice.integration.tests/src/de/protos/etrice/integration/test/IntegrationTestFSMGenerator.mwe2"});
- final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- final IProject project = workspace.getRoot().getProject("/org.eclipse.etrice.integration.tests");
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
- */
}
@Test (timeout=5000)
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.java
index 4149f6598..ccf7fde8e 100644
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.java
+++ b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.java
@@ -15,32 +15,15 @@ package org.eclipse.etrice.integration.tests;
import static org.junit.Assert.assertEquals;
-import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher;
-import org.eclipse.etrice.integration.tests.SubSystemHFSMTest;
-import org.eclipse.etrice.integration.tests.a_HFSM_Tester;
import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;
-import org.eclipse.etrice.runtime.java.messaging.RTServices;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
public class IntegrationTestFSMGenerator extends IntegrationTestBase {
@Before
public void setUp() throws Exception {
- // we have to launch a JUnit Plugin test since for the build we need an Eclipse environment
- // in this context the Mwe2Launcher suffers from https://bugs.eclipse.org/bugs/show_bug.cgi?id=318721
- /*
- Mwe2Launcher.main(new String[]{"/org.eclipse.etrice.integration.tests/src/de/protos/etrice/integration/test/IntegrationTestFSMGenerator.mwe2"});
- final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- final IProject project = workspace.getRoot().getProject("/org.eclipse.etrice.integration.tests");
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
- */
}
@Test (timeout=5000)
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.mwe2 b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.mwe2
deleted file mode 100644
index ead7343a2..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.mwe2
+++ /dev/null
@@ -1,18 +0,0 @@
-module integration_test_fsm
-
-import workflow.RoomGenerator
-import org.eclipse.emf.mwe.utils.*
-
-var destDir = "src-gen"
-
-Workflow {
-
- component = DirectoryCleaner {
- directory = destDir
- }
-
- component = @RoomGenerator {
- sourceDir = "model"
- targetDir = destDir
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestHandler.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestHandler.java
index dfc6d85ff..23e602e25 100644
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestHandler.java
+++ b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestHandler.java
@@ -17,7 +17,6 @@ import static org.junit.Assert.assertEquals;
import org.eclipse.etrice.integration.HandlerTest.SubSystem_HandlerTest;
import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -27,14 +26,6 @@ import org.junit.Test;
public class IntegrationTestHandler extends IntegrationTestBase {
@Before
public void setUp() throws Exception {
- // we have to launch a JUnit Plugin test since for the build we need an Eclipse environment
- // in this context the Mwe2Launcher suffers from https://bugs.eclipse.org/bugs/show_bug.cgi?id=318721
- /*
- Mwe2Launcher.main(new String[]{"/org.eclipse.etrice.integration.tests/src/de/protos/etrice/integration/test/IntegrationTestFSMGenerator.mwe2"});
- final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- final IProject project = workspace.getRoot().getProject("/org.eclipse.etrice.integration.tests");
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
- */
}
@Test (timeout=5000)
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThread.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThread.java
index 0da06b16c..ec336a155 100644
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThread.java
+++ b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThread.java
@@ -17,24 +17,13 @@ import static org.junit.Assert.assertEquals;
import org.eclipse.etrice.integration.PingPongThreadTest.SubSystem_PingPong;
import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-
-
public class IntegrationTestPingPongThread extends IntegrationTestBase {
@Before
public void setUp() throws Exception {
- // we have to launch a JUnit Plugin test since for the build we need an Eclipse environment
- // in this context the Mwe2Launcher suffers from https://bugs.eclipse.org/bugs/show_bug.cgi?id=318721
- /*
- Mwe2Launcher.main(new String[]{"/org.eclipse.etrice.integration.tests/src/de/protos/etrice/integration/test/IntegrationTestFSMGenerator.mwe2"});
- final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- final IProject project = workspace.getRoot().getProject("/org.eclipse.etrice.integration.tests");
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
- */
}
@Test (timeout=10000)
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestSendingDataByValue.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestSendingDataByValue.java
index 85bb9dfa0..d09736500 100644
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestSendingDataByValue.java
+++ b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestSendingDataByValue.java
@@ -17,24 +17,13 @@ import static org.junit.Assert.assertEquals;
import org.eclipse.etrice.integration.SendingDataByValueTest.SubSys_SendingData;
import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-
-
public class IntegrationTestSendingDataByValue extends IntegrationTestBase {
@Before
public void setUp() throws Exception {
- // we have to launch a JUnit Plugin test since for the build we need an Eclipse environment
- // in this context the Mwe2Launcher suffers from https://bugs.eclipse.org/bugs/show_bug.cgi?id=318721
- /*
- Mwe2Launcher.main(new String[]{"/org.eclipse.etrice.integration.tests/src/de/protos/etrice/integration/test/IntegrationTestFSMGenerator.mwe2"});
- final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- final IProject project = workspace.getRoot().getProject("/org.eclipse.etrice.integration.tests");
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
- */
}
@Test (timeout=5000)

Back to the top