Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2013-07-26 10:08:10 +0000
committerHenrik Rentz-Reichert2013-07-26 10:08:10 +0000
commitfcf13383e1bd4d14331adf291ddfaf2eab0b4eeb (patch)
tree382be928f13b05d1d4f6f82272b2311660f97516
parent4f6f960093a1314b923d1132d15089d12a70a7d7 (diff)
downloadorg.eclipse.etrice-v_0.4.0.M1a.tar.gz
org.eclipse.etrice-v_0.4.0.M1a.tar.xz
org.eclipse.etrice-v_0.4.0.M1a.zip
[runtime.java.tests] fixed testsv_0.4.0.M1a
Address.toString() was changed and logic to determine thread also
-rw-r--r--tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/messaging/AddressTest.java2
-rw-r--r--tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/messaging/MessageTest.java2
-rw-r--r--tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/EventMessageTest.java2
-rw-r--r--tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/EventWithDataMessageTest.java2
-rw-r--r--tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/MockEventReceiver.java11
5 files changed, 5 insertions, 14 deletions
diff --git a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/messaging/AddressTest.java b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/messaging/AddressTest.java
index eb03269d7..3d4fd2e53 100644
--- a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/messaging/AddressTest.java
+++ b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/messaging/AddressTest.java
@@ -22,7 +22,7 @@ public class AddressTest extends TestCase {
}
public void testToString() {
Address addr = new Address(1,2,3);
- assertEquals("Address(nodeID=1,threadID=2,objectID=3)", addr.toString());
+ assertEquals("Address(n=1,t=2,o=3)", addr.toString());
}
}
diff --git a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/messaging/MessageTest.java b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/messaging/MessageTest.java
index 82d6f136b..d156fc38e 100644
--- a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/messaging/MessageTest.java
+++ b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/messaging/MessageTest.java
@@ -26,7 +26,7 @@ public class MessageTest extends TestCase {
public void testToString() {
Message msg = new Message(new Address(1,2,3));
- assertEquals("Message(Address(nodeID=1,threadID=2,objectID=3))", msg.toString());
+ assertEquals("Message(Address(n=1,t=2,o=3))", msg.toString());
}
diff --git a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/EventMessageTest.java b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/EventMessageTest.java
index da1804ea2..c334bce9c 100644
--- a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/EventMessageTest.java
+++ b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/EventMessageTest.java
@@ -29,6 +29,6 @@ public class EventMessageTest extends TestCase {
public void testToString() {
EventMessage msg = new EventMessage(new Address(1,2,3), 789);
- assertEquals("EventMessage(Address(nodeID=1,threadID=2,objectID=3), evt=789)", msg.toString());
+ assertEquals("EventMessage(Address(n=1,t=2,o=3), evt=789)", msg.toString());
}
}
diff --git a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/EventWithDataMessageTest.java b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/EventWithDataMessageTest.java
index 02ca0c43f..9892c3b24 100644
--- a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/EventWithDataMessageTest.java
+++ b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/EventWithDataMessageTest.java
@@ -31,6 +31,6 @@ public class EventWithDataMessageTest extends TestCase {
public void testToString() {
EventWithDataMessage msg = new EventWithDataMessage(new Address(1,2,3), 789, "eTrice");
- assertEquals("EventWithDataMessage(Address(nodeID=1,threadID=2,objectID=3), evt=789, data=(eTrice))", msg.toString());
+ assertEquals("EventWithDataMessage(Address(n=1,t=2,o=3), evt=789, data=(eTrice))", msg.toString());
}
}
diff --git a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/MockEventReceiver.java b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/MockEventReceiver.java
index 4d35490c7..89c84c490 100644
--- a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/MockEventReceiver.java
+++ b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/MockEventReceiver.java
@@ -13,9 +13,8 @@
package org.eclipse.etrice.runtime.java.modelbase;
import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.RTObject;
-class MockEventReceiver extends RTObject implements IEventReceiver, IInterfaceItemOwner {
+class MockEventReceiver extends EventReceiver implements IEventReceiver, IInterfaceItemOwner {
protected MockEventReceiver(IRTObject parent, String name) {
super(parent, name);
@@ -41,12 +40,4 @@ class MockEventReceiver extends RTObject implements IEventReceiver, IInterfaceIt
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.etrice.runtime.java.modelbase.IEventReceiver#getThread()
- */
- @Override
- public int getThread() {
- return 0;
- }
-
} \ No newline at end of file

Back to the top