Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-09-20 07:40:17 +0000
committerHenrik Rentz-Reichert2012-09-20 07:40:17 +0000
commitacac9bddd638319d2673d7b14c0c9579e792174d (patch)
tree3ee5de82e65df5ad6ac4e662e0e445cd0644a089 /runtime
parent357a140f8befc7f107d4114911976f1a7b8f1ba2 (diff)
downloadorg.eclipse.etrice-acac9bddd638319d2673d7b14c0c9579e792174d.tar.gz
org.eclipse.etrice-acac9bddd638319d2673d7b14c0c9579e792174d.tar.xz
org.eclipse.etrice-acac9bddd638319d2673d7b14c0c9579e792174d.zip
[runtime.java] etUnti expect order array of short
in favor of compatibility with runtime.c
Diffstat (limited to 'runtime')
-rw-r--r--runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/etunit/EtUnit.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/etunit/EtUnit.java b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/etunit/EtUnit.java
index 48ab769b0..0463dcc5f 100644
--- a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/etunit/EtUnit.java
+++ b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/etunit/EtUnit.java
@@ -27,10 +27,10 @@ import org.eclipse.etrice.runtime.java.messaging.RTServices;
public class EtUnit {
private static class OrderInfo {
- int[] list;
+ short[] list;
int current = 0;
- public OrderInfo(int[] list) {
+ public OrderInfo(short[] list) {
this.list = list;
}
}
@@ -238,7 +238,7 @@ public class EtUnit {
}
/* more specialized functions */
- public static void EXPECT_ORDER_START(int id, int[] list, int size) {
+ public static void EXPECT_ORDER_START(int id, short[] list, int size) {
OrderInfo info = new OrderInfo(list);
orderInfo.put(id, info);
}
@@ -249,7 +249,7 @@ public class EtUnit {
if (info.list[info.current] != val){
String testresult = String.format("EXPECT_ORDER %s: index=%d, expected=%d, actual=%d", msg, info.current, val, info.list[info.current]);
Integer exp = val;
- Integer act = info.list[info.current];
+ Integer act = (int) info.list[info.current];
etUnit_handleExpect(id, false, testresult, exp.toString(), act.toString());
}
else {

Back to the top