Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/.cproject15
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.c7
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.h19
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.c3
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.h9
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/src/RunAllTestcases.c2
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/src/test/generator/RunCGeneratorTestcases.c4
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/src/test/generator/TestDataClass.c2
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/RunCRuntimeTestcases.c2
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessage.c4
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessageQueue.c4
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessageService.c4
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessageService.h2
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtUnit.c4
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/tmp/testlog/TestCRuntime.xml2
15 files changed, 44 insertions, 39 deletions
diff --git a/tests/org.eclipse.etrice.generator.c.tests/.cproject b/tests/org.eclipse.etrice.generator.c.tests/.cproject
index f811adc92..1d83d6c28 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/.cproject
+++ b/tests/org.eclipse.etrice.generator.c.tests/.cproject
@@ -20,7 +20,9 @@
<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.debug.1377401325" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.debug"/>
<builder buildPath="${workspace_loc:/org.eclipse.etrice.generator.c.tests/Debug}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.1914462916" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug.2128193487" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug">
- <option id="gnu.both.asm.option.include.paths.646571697" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths"/>
+ <option id="gnu.both.asm.option.include.paths.646571697" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.runtime.c}&quot;"/>
+ </option>
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1636502349" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
<tool id="cdt.managedbuild.tool.gnu.archiver.mingw.base.1852443642" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base"/>
@@ -32,7 +34,8 @@
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.mingw.exe.debug.option.optimization.level.836528711" name="Optimization Level" superClass="gnu.c.compiler.mingw.exe.debug.option.optimization.level" valueType="enumerated"/>
<option id="gnu.c.compiler.mingw.exe.debug.option.debugging.level.1206340557" name="Debug Level" superClass="gnu.c.compiler.mingw.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
<option id="gnu.c.compiler.option.include.paths.937550345" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.runtime.c/src}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.runtime.c/src/common}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.runtime.c/src/platforms/generic}&quot;"/>
</option>
<option id="gnu.c.compiler.option.misc.other.674019116" name="Other flags" superClass="gnu.c.compiler.option.misc.other" value="-c -fmessage-length=0 -Wconversion" valueType="string"/>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.215126527" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
@@ -60,7 +63,13 @@
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
- <externalSettings containerId="org.eclipse.etrice.runtime.c;cdt.managedbuild.config.gnu.mingw.lib.debug.505530637" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
+ <externalSettings containerId="org.eclipse.etrice.runtime.c;cdt.managedbuild.config.gnu.mingw.lib.debug.505530637" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier">
+ <externalSetting>
+ <entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/org.eclipse.etrice.runtime.c"/>
+ <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/org.eclipse.etrice.runtime.c/Debug"/>
+ <entry flags="RESOLVED" kind="libraryFile" name="org.eclipse.etrice.runtime.c"/>
+ </externalSetting>
+ </externalSettings>
</storageModule>
</cconfiguration>
<cconfiguration id="cdt.managedbuild.config.gnu.mingw.exe.release.1445732435">
diff --git a/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.c b/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.c
index 7683d9062..f89049ff7 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.c
+++ b/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.c
@@ -9,13 +9,12 @@
#include <string.h>
-//--------------------- begin user code
+/*--------------------- begin user code ---------------------*/
// usercode3
-//--------------------- end user code
+/*--------------------- end user code ---------------------*/
-// TODO: do we need setters and getters for C and C++ ?
-//--------------------- operations
+/*--------------------- operations ---------------------*/
int32 DataClass1_MultiplyWithAttr1(DataClass1* self, int32 value) {
return self->Attr1*value;
}
diff --git a/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.h b/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.h
index 948491f86..f1d7a6fb0 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.h
+++ b/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.h
@@ -10,31 +10,30 @@
#include "etDatatypes.h"
-/* TODO: includes only for used DataClasses, also for other models */
#include "DataClass2.h"
-//--------------------- begin user code
+/*--------------------- begin user code ---------------------*/
// usercode1
-//--------------------- end user code
+/*--------------------- end user code ---------------------*/
typedef struct {
- //--------------------- begin user code
- // usercode2
- //--------------------- end user code
- //--------------------- attributes
+ /*--------------------- attributes ---------------------*/
int32 Attr1;
DataClass2 ComplexAttr;
float32 Attr3;
} DataClass1;
-// TODO: do we need setters and getters for C and C++ ?
-//--------------------- operations
+/*--------------------- operations ---------------------*/
int32 DataClass1_MultiplyWithAttr1(DataClass1* self, int32 value);
float32 DataClass1_MultiplyWithAttr3(DataClass1* self, float32 value);
-// deep copy
+/* deep copy */
void DataClass1_deepCopy(DataClass1* source, DataClass1* target);
+/*--------------------- begin user code ---------------------*/
+ // usercode2
+/*--------------------- end user code ---------------------*/
+
#endif /* _DATACLASS1_H_ */
diff --git a/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.c b/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.c
index 1fd7e1572..ab4bbb274 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.c
+++ b/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.c
@@ -10,9 +10,8 @@
#include <string.h>
-// TODO: do we need setters and getters for C and C++ ?
-//--------------------- operations
+/*--------------------- operations ---------------------*/
void DataClass2_Operation1(DataClass2* self) {
/*nothing to do*/
}
diff --git a/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.h b/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.h
index 4b1f3164f..4b08b4125 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.h
+++ b/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.h
@@ -10,23 +10,22 @@
#include "etDatatypes.h"
-/* TODO: includes only for used DataClasses, also for other models */
typedef struct {
- //--------------------- attributes
+ /*--------------------- attributes ---------------------*/
int32 Attr1;
float32 Attr2;
int32 Attr3;
} DataClass2;
-// TODO: do we need setters and getters for C and C++ ?
-//--------------------- operations
+/*--------------------- operations ---------------------*/
void DataClass2_Operation1(DataClass2* self);
-// deep copy
+/* deep copy */
void DataClass2_deepCopy(DataClass2* source, DataClass2* target);
+
#endif /* _DATACLASS2_H_ */
diff --git a/tests/org.eclipse.etrice.generator.c.tests/src/RunAllTestcases.c b/tests/org.eclipse.etrice.generator.c.tests/src/RunAllTestcases.c
index d62450db8..38bfdfbdb 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/src/RunAllTestcases.c
+++ b/tests/org.eclipse.etrice.generator.c.tests/src/RunAllTestcases.c
@@ -14,7 +14,7 @@
#include "test/generator/RunCGeneratorTestcases.h"
#include "test/runtime/RunCRuntimeTestcases.h"
-#include "etMSCLogger.h"
+#include "debugging/etMSCLogger.h"
void runTestCases(void);
diff --git a/tests/org.eclipse.etrice.generator.c.tests/src/test/generator/RunCGeneratorTestcases.c b/tests/org.eclipse.etrice.generator.c.tests/src/test/generator/RunCGeneratorTestcases.c
index 615ba7422..ae0e95690 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/src/test/generator/RunCGeneratorTestcases.c
+++ b/tests/org.eclipse.etrice.generator.c.tests/src/test/generator/RunCGeneratorTestcases.c
@@ -20,8 +20,8 @@
#include "RunCGeneratorTestcases.h"
#include "TestDataClass.h"
-#include "etUnit.h"
-#include "etMSCLogger.h"
+#include "etUnit/etUnit.h"
+#include "debugging/etMSCLogger.h"
diff --git a/tests/org.eclipse.etrice.generator.c.tests/src/test/generator/TestDataClass.c b/tests/org.eclipse.etrice.generator.c.tests/src/test/generator/TestDataClass.c
index e3c521dd3..4ecaf4213 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/src/test/generator/TestDataClass.c
+++ b/tests/org.eclipse.etrice.generator.c.tests/src/test/generator/TestDataClass.c
@@ -21,7 +21,7 @@
#include "TestDataClass.h"
-#include "etUnit.h"
+#include "etUnit/etUnit.h"
#include "../../../src-gen/cGenRef/DataClass1.h"
diff --git a/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/RunCRuntimeTestcases.c b/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/RunCRuntimeTestcases.c
index a9a502f3b..a8536fe89 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/RunCRuntimeTestcases.c
+++ b/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/RunCRuntimeTestcases.c
@@ -27,7 +27,7 @@
#include "TestEtMessageService.h"
#include "TestEtUnit.h"
-#include "etUnit.h"
+#include "etUnit/etUnit.h"
void RunCRuntimeTestcases(void){
diff --git a/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessage.c b/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessage.c
index c360b0a84..a0e6b55b9 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessage.c
+++ b/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessage.c
@@ -13,8 +13,8 @@
#include "TestEtMessage.h"
#include <stddef.h>
-#include "etUnit.h"
-#include "etMessage.h"
+#include "etUnit/etUnit.h"
+#include "messaging/etMessage.h"
diff --git a/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessageQueue.c b/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessageQueue.c
index 3a453962c..30228fc98 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessageQueue.c
+++ b/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessageQueue.c
@@ -11,8 +11,8 @@
*******************************************************************************/
#include "TestEtMessageQueue.h"
-#include "etUnit.h"
-#include "etMessageQueue.h"
+#include "etUnit/etUnit.h"
+#include "messaging/etMessageQueue.h"
void TestEtMessageQueue_testPushPop(void){
diff --git a/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessageService.c b/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessageService.c
index 867576097..9c1499ea8 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessageService.c
+++ b/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessageService.c
@@ -11,8 +11,8 @@
*******************************************************************************/
#include "TestEtMessageService.h"
-#include "etUnit.h"
-#include "etMessageService.h"
+#include "etUnit/etUnit.h"
+#include "messaging/etMessageService.h"
/* mocking for MessageDispatcher */
diff --git a/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessageService.h b/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessageService.h
index 43a85baee..b8925ebdd 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessageService.h
+++ b/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessageService.h
@@ -13,7 +13,7 @@
#ifndef _TESTRMESSAGESERVICE_H_
#define _TESTRMESSAGESERVICE_H_
-#include "etMessageService.h"
+#include "messaging/etMessageService.h"
void TestEtMessageService_runSuite(void);
diff --git a/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtUnit.c b/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtUnit.c
index 3f01d0587..42359c26a 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtUnit.c
+++ b/tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtUnit.c
@@ -19,7 +19,7 @@
*/
#include "TestEtUnit.h"
-#include "etUnit.h"
+#include "etUnit/etUnit.h"
void TestEtUnit_Expect(void){
EXPECT_TRUE("EXPECT_TRUE", TRUE);
@@ -37,7 +37,7 @@ void TestEtUnit_Expect(void){
/* float values */
EXPECT_EQUAL_FLOAT32("EXPECT_EQUAL_FLOAT32", (etFloat32) 123.456, (etFloat32) 123.456, (etFloat32) 0.0001);
- EXPECT_EQUAL_FLOAT64("EXPECT_EQUAL_FLOAT64", (etFloat64) 123.456, (etFloat64) 123.456, (etFloat64) 0.0001);
+ EXPECT_EQUAL_FLOAT32("EXPECT_EQUAL_FLOAT32", (etFloat32) 123.456, (etFloat32) 123.456, (etFloat32) 0.0001);
/* Pointers */
etUInt16 value;
diff --git a/tests/org.eclipse.etrice.generator.c.tests/tmp/testlog/TestCRuntime.xml b/tests/org.eclipse.etrice.generator.c.tests/tmp/testlog/TestCRuntime.xml
index 54d6818aa..a59852cc4 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/tmp/testlog/TestCRuntime.xml
+++ b/tests/org.eclipse.etrice.generator.c.tests/tmp/testlog/TestCRuntime.xml
@@ -4,7 +4,7 @@
</testsuite>
<testsuite name="TestEtMessageQueue" tests="0" failures="0" errors="0" time="0">
<testcase name="TestEtMessageQueue_testPushPop" time="0"/>
- <testcase name="TestEtMessageQueue_testMassiveMessaging" time="0"/>
+ <testcase name="TestEtMessageQueue_testMassiveMessaging" time="15"/>
</testsuite>
<testsuite name="TestEtMessageService" tests="0" failures="0" errors="0" time="0">
<testcase name="TestEtMessageService_init" time="0"/>

Back to the top