diff options
| author | Henrik Rentz-Reichert | 2011-09-12 08:52:21 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2011-09-12 08:52:21 +0000 |
| commit | 69c7ebaf93c0e02bcdaeb457dfcc0ca07b10806c (patch) | |
| tree | 228b7647507d9d67f604906e9c53c29b45b86457 | |
| parent | 48fb82b5576d0da4f4c8f16a184b51eb8648c720 (diff) | |
| download | org.eclipse.etrice-69c7ebaf93c0e02bcdaeb457dfcc0ca07b10806c.tar.gz org.eclipse.etrice-69c7ebaf93c0e02bcdaeb457dfcc0ca07b10806c.tar.xz org.eclipse.etrice-69c7ebaf93c0e02bcdaeb457dfcc0ca07b10806c.zip | |
[releng] added eclipse.feature to releng provider
added runtime launch configuration
fixed unit test
3 files changed, 18 insertions, 2 deletions
diff --git a/releng/org.eclipse.etrice.releng/build.rmap b/releng/org.eclipse.etrice.releng/build.rmap index cfc754e48..e04b3623d 100644 --- a/releng/org.eclipse.etrice.releng/build.rmap +++ b/releng/org.eclipse.etrice.releng/build.rmap @@ -7,7 +7,7 @@ <rm:locator searchPathRef="platform.binaries" failOnError="false"/>
<rm:locator searchPathRef="orbit"/>
<rm:searchPath name="releng">
- <rm:provider componentTypes="buckminster,osgi.bundle" readerType="local">
+ <rm:provider componentTypes="buckminster,osgi.bundle,eclipse.feature" readerType="local">
<rm:uri format="{0}/../../etrice_local_repo/releng/{1}">
<bc:propertyRef key="workspace.root"/>
<bc:propertyRef key="buckminster.component"/>
diff --git a/tests/org.eclipse.etrice.runtime.java.tests/org.eclipse.etrice.runtime.java.tests.launch b/tests/org.eclipse.etrice.runtime.java.tests/org.eclipse.etrice.runtime.java.tests.launch new file mode 100644 index 000000000..629e28502 --- /dev/null +++ b/tests/org.eclipse.etrice.runtime.java.tests/org.eclipse.etrice.runtime.java.tests.launch @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.etrice.runtime.java.tests"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.etrice.runtime.java.tests"/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.runtime.java.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
+</launchConfiguration>
diff --git a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/ActorClassBaseTest.java b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/ActorClassBaseTest.java index 1f8b017d7..14f478bf0 100644 --- a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/ActorClassBaseTest.java +++ b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/ActorClassBaseTest.java @@ -67,7 +67,7 @@ public class ActorClassBaseTest extends TestCase { public void testActorClassBase() {
MockRTObject topRTObject = new MockRTObject();
RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(
- new MessageService(topRTObject, new Address(0, 0, 0),"MessageService_Main", Thread.NORM_PRIORITY));
+ new MessageService(topRTObject, new Address(0, 2, 0),"MessageService_Main", Thread.NORM_PRIORITY));
Address peer_system_port_addr = new Address(0, 0, 0);
Address system_port_addr = new Address(0, 0, 1);
|