summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortjung2012-09-23 13:07:48 (EDT)
committertjung2012-09-23 13:07:48 (EDT)
commitedd2a134a6c3d3b257190e7b9c3cb68c3cb8136b (patch)
treebddcc39ec1baba9c87d7eeaaa99c99f87959593d
parent411c88e8e71ba34af3578edbc75a7fa178ebdeaf (diff)
downloadorg.eclipse.etrice-edd2a134a6c3d3b257190e7b9c3cb68c3cb8136b.zip
org.eclipse.etrice-edd2a134a6c3d3b257190e7b9c3cb68c3cb8136b.tar.gz
org.eclipse.etrice-edd2a134a6c3d3b257190e7b9c3cb68c3cb8136b.tar.bz2
[modellib.c] language.room added
-rw-r--r--plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java11
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zipbin14483 -> 14409 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zipbin19385 -> 19385 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zipbin127687 -> 126580 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zipbin37335 -> 37335 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zipbin103445 -> 100453 bytes
-rw-r--r--runtime/org.eclipse.etrice.modellib.c/model/Language.room3
-rw-r--r--runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/etunit/EtUnit.java18
8 files changed, 15 insertions, 17 deletions
diff --git a/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java b/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java
deleted file mode 100644
index 85ec425..0000000
--- a/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.eclipse.etrice.generator.generator;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.generator.IFileSystemAccess;
-import org.eclipse.xtext.generator.IGenerator;
-
-@SuppressWarnings("all")
-public class FSMtestGenerator implements IGenerator {
- public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
- }
-}
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
index 10fa06c..6c339e4 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
index 157ea24..6047c15 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
index a0fe136..7797f0b 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
index 5476dce..27f2d14 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
index 4819516..7489f72 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
Binary files differ
diff --git a/runtime/org.eclipse.etrice.modellib.c/model/Language.room b/runtime/org.eclipse.etrice.modellib.c/model/Language.room
new file mode 100644
index 0000000..04e441a
--- /dev/null
+++ b/runtime/org.eclipse.etrice.modellib.c/model/Language.room
@@ -0,0 +1,3 @@
+RoomModel room.basic.language {
+ PrimitiveType languageIndicator: ptInteger -> int8 default "2"
+} \ No newline at end of file
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 3fdde42..a868760 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
@@ -57,6 +57,7 @@ public class EtUnit {
out = new BufferedWriter(fstream);
out.write("etUnit report\n");
+ out.flush();
}
catch (IOException e) {
System.err.println("unable to open "+path);
@@ -86,6 +87,7 @@ public class EtUnit {
if (out!=null) {
try {
out.write("ts start: "+testSuiteName+"\n");
+ out.flush();
} catch (IOException e) {
e.printStackTrace();
}
@@ -101,6 +103,7 @@ public class EtUnit {
if (out!=null) {
try {
out.write("tc start "+caseId+": "+testCaseName+"\n");
+ out.flush();
} catch (IOException e) {
e.printStackTrace();
}
@@ -116,6 +119,7 @@ public class EtUnit {
if (out!=null) {
try {
out.write("tc end "+id+": "+time+"\n");
+ out.flush();
} catch (IOException e) {
e.printStackTrace();
}
@@ -293,7 +297,7 @@ public class EtUnit {
/* nothing to do because no failure */
}
else {
- if (!failed.contains(id)) {
+ // if (!failed.contains(id)) {
/* first failure will be remembered */
failed.add(id);
@@ -304,17 +308,19 @@ public class EtUnit {
int line = stackTraceElement.getLineNumber();
try {
- if (act!=null && exp!=null)
+ if (act!=null && exp!=null){
out.write("tc fail "+id+": #"+exp+"#"+act+"#"+fullClassName+":"+line+"#"+resulttext+"\n");
- else
+ out.flush();}
+ else{
out.write("tc fail "+id+": ###"+fullClassName+":"+line+"#"+resulttext+"\n");
+ out.flush();}
} catch (IOException e) {
e.printStackTrace();
}
- }
- else{
+ //}
+ //else{
/* more than one error will be ignored */
- }
+ //}
}
}