Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2011-07-08 02:29:06 -0400
committerHenrik Rentz-Reichert2011-07-08 02:29:06 -0400
commit6399bb64e65757508b7cd6a22acc7f7004e8d223 (patch)
tree5c18b2311653797b7de86d5b5dd0f31977a405ee /tests/org.eclipse.etrice.runtime.java.tests
parent599354faadebd8707895930077fbd9cd8f95cdf6 (diff)
downloadorg.eclipse.etrice-6399bb64e65757508b7cd6a22acc7f7004e8d223.tar.gz
org.eclipse.etrice-6399bb64e65757508b7cd6a22acc7f7004e8d223.tar.xz
org.eclipse.etrice-6399bb64e65757508b7cd6a22acc7f7004e8d223.zip
[core.room, generator, runtime, modellib] protocol messages can have zero or one data objects (primitive or data class)
Diffstat (limited to 'tests/org.eclipse.etrice.runtime.java.tests')
-rw-r--r--tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/ActorClassBaseTest.java2
-rw-r--r--tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/EventWithDataMessageTest.java6
-rw-r--r--tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/PortBaseTest.java2
3 files changed, 5 insertions, 5 deletions
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 8b0c6d702..1f8b017d7 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
@@ -48,7 +48,7 @@ public class ActorClassBaseTest extends TestCase {
public Address getAddress() {
return null;
}
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object... data) {
+ public void receiveEvent(InterfaceItemBase ifitem, int evt, Object data) {
}
@Override
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 41f228d23..0a837d7ed 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
@@ -25,12 +25,12 @@ public class EventWithDataMessageTest extends TestCase {
assertEquals(123, msg1.getEvtId());
assertEquals(456, msg2.getEvtId());
- assertEquals("abc", msg1.getData()[0]);
- assertEquals("def", msg2.getData()[0]);
+ assertEquals("abc", msg1.getData());
+ assertEquals("def", msg2.getData());
}
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(nodeID=1,threadID=2,objectID=3), evt=789, data=(eTrice))", msg.toString());
}
}
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 50d91ba39..aff2e6bff 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
@@ -38,7 +38,7 @@ public class PortBaseTest extends TestCase {
@Override
public void receiveEvent(InterfaceItemBase ifitem, int evt,
- Object... data) {
+ Object data) {
// TODO Auto-generated method stub
}

Back to the top