diff options
author | Henrik Rentz-Reichert | 2013-08-08 20:31:26 +0000 |
---|---|---|
committer | Henrik Rentz-Reichert | 2013-08-08 20:31:26 +0000 |
commit | d9833dc4be18cd6755a3bbf9554c7e47c9d3b4b4 (patch) | |
tree | 4c241d2fc3847199161cbf1bca551ed404778864 /tests | |
parent | 2af0dfc2f970f9e87d4a30a0ae4207c418933c41 (diff) | |
download | org.eclipse.etrice-d9833dc4be18cd6755a3bbf9554c7e47c9d3b4b4.tar.gz org.eclipse.etrice-d9833dc4be18cd6755a3bbf9554c7e47c9d3b4b4.tar.xz org.eclipse.etrice-d9833dc4be18cd6755a3bbf9554c7e47c9d3b4b4.zip |
[runtime.java, runtime.java.tests] fixed tests
Diffstat (limited to 'tests')
4 files changed, 13 insertions, 11 deletions
diff --git a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/messaging/MessageServiceTest.java b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/messaging/MessageServiceTest.java index 1176df8fb..212cca5fd 100644 --- a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/messaging/MessageServiceTest.java +++ b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/messaging/MessageServiceTest.java @@ -19,14 +19,16 @@ public class MessageServiceTest extends TestCase { public void testRun() { + MessageServiceController msgSvcCtrl = RTServices.getInstance().getMsgSvcCtrl(); + msgSvcCtrl.resetAll(); // testing basic functionality of MessageService and Dispatcher - MessageService msg_service1 = new MessageService(null, ExecMode.BLOCKED, 0, 0, 0, "MessageService1", Thread.NORM_PRIORITY); - MessageService msg_service2 = new MessageService(null, ExecMode.BLOCKED, 0, 0, 0, "MessageService2", Thread.NORM_PRIORITY); - MessageService msg_service3 = new MessageService(null, ExecMode.BLOCKED, 0, 0, 0, "MessageService3", Thread.NORM_PRIORITY); - MessageService msg_service4 = new MessageService(null, ExecMode.BLOCKED, 0, 0, 0, "MessageService4", Thread.NORM_PRIORITY); - MessageService msg_service5 = new MessageService(null, ExecMode.BLOCKED, 0, 0, 0, "MessageService5", Thread.NORM_PRIORITY); - MessageService msg_service6 = new MessageService(null, ExecMode.BLOCKED, 0, 0, 0, "MessageService6", Thread.NORM_PRIORITY); + MessageService msg_service1 = new MessageService(null, ExecMode.BLOCKED, 0, 0, msgSvcCtrl.getNewID(), "MessageService1", Thread.NORM_PRIORITY); + MessageService msg_service2 = new MessageService(null, ExecMode.BLOCKED, 0, 0, msgSvcCtrl.getNewID(), "MessageService2", Thread.NORM_PRIORITY); + MessageService msg_service3 = new MessageService(null, ExecMode.BLOCKED, 0, 0, msgSvcCtrl.getNewID(), "MessageService3", Thread.NORM_PRIORITY); + MessageService msg_service4 = new MessageService(null, ExecMode.BLOCKED, 0, 0, msgSvcCtrl.getNewID(), "MessageService4", Thread.NORM_PRIORITY); + MessageService msg_service5 = new MessageService(null, ExecMode.BLOCKED, 0, 0, msgSvcCtrl.getNewID(), "MessageService5", Thread.NORM_PRIORITY); + MessageService msg_service6 = new MessageService(null, ExecMode.BLOCKED, 0, 0, msgSvcCtrl.getNewID(), "MessageService6", Thread.NORM_PRIORITY); DummyMessageReceiver receiver1 = new DummyMessageReceiver(new Address(0,0,1)); DummyMessageReceiver receiver2 = new DummyMessageReceiver(new Address(0,1,2)); 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 29e0ccd31..8e548d0ca 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 @@ -50,7 +50,7 @@ public class ActorClassBaseTest extends TestCase { TopRTObject topRTObject = new TopRTObject("TOP"); MessageServiceController msgSvcCtrl = RTServices.getInstance().getMsgSvcCtrl(); msgSvcCtrl.addMsgSvc( - new MessageService(topRTObject, ExecMode.BLOCKED, 0, 0, msgSvcCtrl.getNMsgSvc(), "MessageService_Main", Thread.NORM_PRIORITY)); + new MessageService(topRTObject, ExecMode.BLOCKED, 0, 0, msgSvcCtrl.getNewID(), "MessageService_Main", Thread.NORM_PRIORITY)); // PathNames ActorClassBase actor = new MockActor(topRTObject, "MockActor1"); diff --git a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/PortBaseTest.java b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/PortBaseTest.java index 26e12b942..8a3266b98 100644 --- a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/PortBaseTest.java +++ b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/PortBaseTest.java @@ -29,9 +29,9 @@ public class PortBaseTest extends TestCase { msgSvcCtrl.resetAll(); msgSvcCtrl.addMsgSvc( - new MessageService(null, ExecMode.BLOCKED, 0, 0, msgSvcCtrl.getNMsgSvc(), "MessageService_0", Thread.NORM_PRIORITY)); + new MessageService(null, ExecMode.BLOCKED, 0, 0, msgSvcCtrl.getNewID(), "MessageService_0", Thread.NORM_PRIORITY)); msgSvcCtrl.addMsgSvc( - new MessageService(null, ExecMode.BLOCKED, 0, 0, msgSvcCtrl.getNMsgSvc(), "MessageService_1", Thread.NORM_PRIORITY)); + new MessageService(null, ExecMode.BLOCKED, 0, 0, msgSvcCtrl.getNewID(), "MessageService_1", Thread.NORM_PRIORITY)); MockSubSystem top = new MockSubSystem(null, "TOP"); RTServices.getInstance().setSubSystem(top); diff --git a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/ReplicatedPortBaseTest.java b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/ReplicatedPortBaseTest.java index ab0a826b3..271005d1d 100644 --- a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/ReplicatedPortBaseTest.java +++ b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/ReplicatedPortBaseTest.java @@ -47,9 +47,9 @@ public class ReplicatedPortBaseTest { msgSvcCtrl.resetAll(); msgSvcCtrl.addMsgSvc( - new MessageService(null, ExecMode.BLOCKED, 0, 0, msgSvcCtrl.getNMsgSvc(), "MessageService_0", Thread.NORM_PRIORITY)); + new MessageService(null, ExecMode.BLOCKED, 0, 0, msgSvcCtrl.getNewID(), "MessageService_0", Thread.NORM_PRIORITY)); msgSvcCtrl.addMsgSvc( - new MessageService(null, ExecMode.BLOCKED, 0, 0, msgSvcCtrl.getNMsgSvc(), "MessageService_1", Thread.NORM_PRIORITY)); + new MessageService(null, ExecMode.BLOCKED, 0, 0, msgSvcCtrl.getNewID(), "MessageService_1", Thread.NORM_PRIORITY)); } |