diff options
59 files changed, 67 insertions, 68 deletions
diff --git a/build.gradle b/build.gradle index 59f1e8142..95680d357 100644 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,6 @@ ext { commons_io_version = '+' etUnitConverter = "$rootDir/plugins/org.eclipse.etrice.etunit.converter/etUnitConverter.gradle" - etriceGenerator = "$rootDir/plugins/org.eclipse.etrice.generator/etriceGenerator.gradle" - etriceTest = "$rootDir/tests/org.eclipse.etrice.generator.common.tests/etriceTest.gradle" + etGenerator = "$rootDir/plugins/org.eclipse.etrice.generator/etGenerator.gradle" + etTest = "$rootDir/tests/org.eclipse.etrice.generator.common.tests/etTest.gradle" }
\ No newline at end of file diff --git a/plugins/org.eclipse.etrice.etunit.converter/etUnitConverter.gradle b/plugins/org.eclipse.etrice.etunit.converter/etUnitConverter.gradle index 59b455535..7055f05ff 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/etUnitConverter.gradle +++ b/plugins/org.eclipse.etrice.etunit.converter/etUnitConverter.gradle @@ -5,18 +5,17 @@ evaluationDependsOn(etUnitConverter) /** * Creates a tasks that converts etu files to xml files * @param name: The name of the new task - * @param etuProducerTask: The task that produces the etu files + * @param etuFiles: The etu files to be converted */ -ext.createEtUnitConverterTask = { name, etuProducerTask -> - def etuFiles = etuProducerTask.outputs.getFiles().collect { it.path } +ext.createEtUnitConverterTask = { name, etuFiles, suiteName = null -> def xmlFiles = etuFiles.collect { it.replace('.etu', '.xml') } return tasks.create(name: name, type: JavaExec, dependsOn: "$etUnitConverter:classes") { - dependsOn etuProducerTask main = project(etUnitConverter).mainClassName classpath = project(etUnitConverter).sourceSets.main.runtimeClasspath + if(suiteName != null) args '-suite', suiteName args etuFiles - inputs.files etuProducerTask.outputs + inputs.files etuFiles outputs.files xmlFiles } }
\ No newline at end of file diff --git a/plugins/org.eclipse.etrice.generator/etriceGenerator.gradle b/plugins/org.eclipse.etrice.generator/etGenerator.gradle index 42556974a..42556974a 100644 --- a/plugins/org.eclipse.etrice.generator/etriceGenerator.gradle +++ b/plugins/org.eclipse.etrice.generator/etGenerator.gradle diff --git a/runtime/org.eclipse.etrice.modellib.c/build.gradle b/runtime/org.eclipse.etrice.modellib.c/build.gradle index b881a7b8b..f11e40692 100644 --- a/runtime/org.eclipse.etrice.modellib.c/build.gradle +++ b/runtime/org.eclipse.etrice.modellib.c/build.gradle @@ -2,7 +2,7 @@ plugins { id 'c' } -apply from: etriceGenerator +apply from: etGenerator def models = [ 'model/PInterrupt.room', diff --git a/runtime/org.eclipse.etrice.modellib.cpp/build.gradle b/runtime/org.eclipse.etrice.modellib.cpp/build.gradle index efbb01f03..3330c2406 100644 --- a/runtime/org.eclipse.etrice.modellib.cpp/build.gradle +++ b/runtime/org.eclipse.etrice.modellib.cpp/build.gradle @@ -2,7 +2,7 @@ plugins { id 'cpp' } -apply from: etriceGenerator +apply from: etGenerator def models = [ 'model/TimingService.room' diff --git a/runtime/org.eclipse.etrice.modellib.java/build.gradle b/runtime/org.eclipse.etrice.modellib.java/build.gradle index a458f33bb..004c8614f 100644 --- a/runtime/org.eclipse.etrice.modellib.java/build.gradle +++ b/runtime/org.eclipse.etrice.modellib.java/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' } -apply from: etriceGenerator +apply from: etGenerator def models = [ 'model/ALogService.room', diff --git a/tests/org.eclipse.etrice.generator.c.tests/build.gradle b/tests/org.eclipse.etrice.generator.c.tests/build.gradle index 9f0487aa3..f706476a9 100644 --- a/tests/org.eclipse.etrice.generator.c.tests/build.gradle +++ b/tests/org.eclipse.etrice.generator.c.tests/build.gradle @@ -2,7 +2,7 @@ plugins { id 'c' } -apply from: etriceTest +apply from: etTest def genericPhysical = '../org.eclipse.etrice.generator.common.tests/models/GenericPhysical.etphys' diff --git a/tests/org.eclipse.etrice.generator.c.tests/models/SendingDataTest.room b/tests/org.eclipse.etrice.generator.c.tests/models/SendingDataTest.room index 3494a48cf..332f1c847 100644 --- a/tests/org.eclipse.etrice.generator.c.tests/models/SendingDataTest.room +++ b/tests/org.eclipse.etrice.generator.c.tests/models/SendingDataTest.room @@ -186,7 +186,7 @@ RoomModel SendingDataTest { StateMachine { Transition init: initial -> tp0 of state0 { action { - "caseId = etUnit_openAll(\".\", \"SendingDataTest\", \"org.eclipse.etrice.generator.common.tests.SendingDataTest\", \"SendingDataTest_case\");" + "caseId = etUnit_openAll(\".\", \"SendingDataTest\", \"org.eclipse.etrice.generator.c.tests.SendingDataTest\", \"SendingDataTest_case\");" "EXPECT_ORDER_START(caseId,resultlist,23);" "EXPECT_ORDER(caseId,\"<|MODEL_LOCATION|>\", 1);" "/* send the default values */" diff --git a/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.room b/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.room index ac8dc0a46..3c8518ee0 100644 --- a/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.room +++ b/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.room @@ -23,7 +23,7 @@ RoomModel StaticConfigTest { Behavior { ctor { "etUnit_open(\".\", \"StaticConfigTest\");" - "etUnit_openTestSuite(\"org.eclipse.etrice.generator.common.tests.StaticConfigTest\");" + "etUnit_openTestSuite(\"org.eclipse.etrice.generator.c.tests.StaticConfigTest\");" } dtor { "etUnit_closeTestSuite();" diff --git a/tests/org.eclipse.etrice.generator.common.tests/build.gradle b/tests/org.eclipse.etrice.generator.common.tests/build.gradle index 40882f479..8e6530812 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/build.gradle +++ b/tests/org.eclipse.etrice.generator.common.tests/build.gradle @@ -4,7 +4,7 @@ plugins { id 'java-base' } -apply from: etriceTest +apply from: etTest def genericPhysical = 'models/GenericPhysical.etphys' diff --git a/tests/org.eclipse.etrice.generator.common.tests/etriceTest.gradle b/tests/org.eclipse.etrice.generator.common.tests/etTest.gradle index 3bb72747f..7df62b1f4 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/etriceTest.gradle +++ b/tests/org.eclipse.etrice.generator.common.tests/etTest.gradle @@ -1,4 +1,4 @@ -apply from: etriceGenerator +apply from: etGenerator apply from: etUnitConverter def outputDir = 'output' @@ -31,13 +31,10 @@ ext.createTest = { lang, name, models, options = [] -> def langCap = lang.capitalize() def testName = "$name$langCap" def testNameCap = testName.capitalize() + def suiteName = "${project.name}.$testNameCap" def genDir = "$srcGenDir/$testName" def workingDir = "$outputDir/$testName" def etuFile = "$workingDir/${nameCap}.etu" - def xmlFile = "$workingDir/${nameCap}.xml" - def modellib = ":runtime:org.eclipse.etrice.modellib.$lang" - def generator = ":plugins:org.eclipse.etrice.generator.$lang" - def etUnitConverter = ':plugins:org.eclipse.etrice.etunit.converter' def generateTask = createGeneratorTask("generate$testNameCap", lang, models, genDir, options) generateTask.environment 'etModellib', "org.eclipse.etrice.modellib.$lang" @@ -104,7 +101,8 @@ ext.createTest = { lang, name, models, options = [] -> runTask.doFirst { file("$workingDir/log").mkdirs() } - def convertTask = createEtUnitConverterTask("convert$testNameCap", runTask) + def convertTask = createEtUnitConverterTask("convert$testNameCap", etuFile, suiteName) + convertTask.dependsOn runTask check.dependsOn tasks.create(name: testName, dependsOn: convertTask, group: 'verification') } diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room index 924e0722f..e9929261f 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room +++ b/tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room @@ -64,7 +64,7 @@ RoomModel ActorCommunicationTest { Behavior { ctor { "etUnit_open(\".\", \"ActorCommunicationTest\");" - "etUnit_openTestSuite(\"org.eclipse.etrice.generator.common.tests\");" + "etUnit_openTestSuite(\"org.eclipse.etrice.generator.common.tests.ActorCommunicationTest\");" } dtor { "etUnit_closeTestSuite();" diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle b/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle index f5680e988..1860582d3 100644 --- a/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle +++ b/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle @@ -2,7 +2,7 @@ plugins { id 'cpp' } -apply from: etriceTest +apply from: etTest def genericPhysical = '../org.eclipse.etrice.generator.common.tests/models/GenericPhysical.etphys' diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/models/SendingDataTest.room b/tests/org.eclipse.etrice.generator.cpp.tests/models/SendingDataTest.room index 623003187..c1558d539 100644 --- a/tests/org.eclipse.etrice.generator.cpp.tests/models/SendingDataTest.room +++ b/tests/org.eclipse.etrice.generator.cpp.tests/models/SendingDataTest.room @@ -186,7 +186,7 @@ RoomModel SendingDataTest { StateMachine { Transition init: initial -> tp0 of state0 { action { - "caseId = etUnit_openAll(\".\", \"SendingDataTest\", \"org.eclipse.etrice.generator.common.tests.SendingDataTest\", \"SendingDataTest_case\");" + "caseId = etUnit_openAll(\".\", \"SendingDataTest\", \"org.eclipse.etrice.generator.cpp.tests.SendingDataTest\", \"SendingDataTest_case\");" "EXPECT_ORDER_START(caseId,resultlist,23);" "EXPECT_ORDER(caseId,\"<|MODEL_LOCATION|>\", 1);" "/* send the default values */" diff --git a/tests/org.eclipse.etrice.generator.java.tests/build.gradle b/tests/org.eclipse.etrice.generator.java.tests/build.gradle index 0ce79733a..006dc073d 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/build.gradle +++ b/tests/org.eclipse.etrice.generator.java.tests/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java-base' } -apply from: etriceTest +apply from: etTest def genericPhysical = '../org.eclipse.etrice.generator.common.tests/models/GenericPhysical.etphys' diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.room index 8701a556f..59c71cd68 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.room @@ -30,7 +30,7 @@ RoomModel DynamicActorTest1 { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"DynamicActorTest1\", \"org.eclipse.etrice.generator.common.tests.DynamicActorTest1\", \"DynamicActorTest1_case\");" + "caseId = etUnit_openAll(\".\", \"DynamicActorTest1\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest1\", \"DynamicActorTest1_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.room index ba0f65f9b..f47a1ec41 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.room @@ -30,7 +30,7 @@ RoomModel DynamicActorTest2 { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"DynamicActorTest2\", \"org.eclipse.etrice.generator.common.tests.DynamicActorTest2\", \"DynamicActorTest2_case\");" + "caseId = etUnit_openAll(\".\", \"DynamicActorTest2\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest2\", \"DynamicActorTest2_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest3.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest3.room index e757ba820..410f28772 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest3.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest3.room @@ -22,7 +22,7 @@ RoomModel DynamicActorTest3 { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"DynamicActorTest3\", \"org.eclipse.etrice.generator.common.tests.DynamicActorTest3\", \"DynamicActorTest3_case\");" + "caseId = etUnit_openAll(\".\", \"DynamicActorTest3\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest3\", \"DynamicActorTest3_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest4.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest4.room index 7c3b95b27..57a67add5 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest4.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest4.room @@ -21,7 +21,7 @@ RoomModel DynamicActorTest4 { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"DynamicActorTest4\", \"org.eclipse.etrice.generator.common.tests.DynamicActorTest4\", \"DynamicActorTest4_case\");" + "caseId = etUnit_openAll(\".\", \"DynamicActorTest4\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest4\", \"DynamicActorTest4_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest5.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest5.room index 7b761f781..7c7b8c4a1 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest5.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest5.room @@ -21,7 +21,7 @@ RoomModel DynamicActorTest5 { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"DynamicActorTest5\", \"org.eclipse.etrice.generator.common.tests.DynamicActorTest5\", \"DynamicActorTest5_case\");" + "caseId = etUnit_openAll(\".\", \"DynamicActorTest5\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest5\", \"DynamicActorTest5_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest6.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest6.room index a38e80330..905f8c05d 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest6.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest6.room @@ -24,7 +24,7 @@ RoomModel DynamicActorTest6 { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"DynamicActorTest6\", \"org.eclipse.etrice.generator.common.tests.DynamicActorTest6\", \"DynamicActorTest6_case\");" + "caseId = etUnit_openAll(\".\", \"DynamicActorTest6\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest6\", \"DynamicActorTest6_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.room index 32648c0e6..8a5c7bba8 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.room @@ -42,7 +42,7 @@ RoomModel DynamicActorTest7 { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"DynamicActorTest7\", \"org.eclipse.etrice.generator.common.tests.DynamicActorTest7\", \"DynamicActorTest7_case\");" + "caseId = etUnit_openAll(\".\", \"DynamicActorTest7\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest7\", \"DynamicActorTest7_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.room index f7ab9895d..112e47693 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.room @@ -50,7 +50,7 @@ RoomModel DynamicConfigTest { Behavior { ctor { "etUnit_open(\".\", \"DynamicConfigTest\");" - "etUnit_openTestSuite(\"org.eclipse.etrice.generator.common.tests.DynamicConfigTest\");" + "etUnit_openTestSuite(\"org.eclipse.etrice.generator.java.tests.DynamicConfigTest\");" "caseId = etUnit_openTestCase(\"DynamicConfigTest_case_Testee_ac\");" } dtor { diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/SendingDataTest.room b/tests/org.eclipse.etrice.generator.java.tests/models/SendingDataTest.room index ce9056bdb..2fdd40bdb 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/SendingDataTest.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/SendingDataTest.room @@ -178,7 +178,7 @@ RoomModel SendingDataTest { StateMachine { Transition init: initial -> tp0 of state0 { action { - "caseId = etUnit_openAll(\".\", \"SendingDataTest\", \"org.eclipse.etrice.generator.common.tests.SendingDataTest\", \"SendingDataTest_case\");" + "caseId = etUnit_openAll(\".\", \"SendingDataTest\", \"org.eclipse.etrice.generator.java.tests.SendingDataTest\", \"SendingDataTest_case\");" "EXPECT_ORDER_START(caseId,resultlist,23);" "EXPECT_ORDER(caseId,\"<|MODEL_LOCATION|>\", 1);" "// send the default values" diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.room b/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.room index 3d3ba6b49..c76fe713e 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.room @@ -23,7 +23,7 @@ RoomModel StaticConfigTest { Behavior { ctor { "etUnit_open(\".\", \"StaticConfigTest\");" - "etUnit_openTestSuite(\"org.eclipse.etrice.generator.common.tests.StaticConfigTest\");" + "etUnit_openTestSuite(\"org.eclipse.etrice.generator.java.tests.StaticConfigTest\");" } dtor { "etUnit_closeTestSuite();" diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room b/tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room index bf9b8f9c5..757233bf1 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room @@ -117,7 +117,7 @@ RoomModel StoreRestoreTest { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"StoreRestoreTest\", \"org.eclipse.etrice.generator.common.tests.StoreRestoreTest\", \"StoreRestoreTest_case\");" + "caseId = etUnit_openAll(\".\", \"StoreRestoreTest\", \"org.eclipse.etrice.generator.java.tests.StoreRestoreTest\", \"StoreRestoreTest_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/TCPTest.room b/tests/org.eclipse.etrice.generator.java.tests/models/TCPTest.room index 6671d6d3d..9227b9a29 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/TCPTest.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/TCPTest.room @@ -41,7 +41,7 @@ RoomModel TCPTest { }
Behavior {
ctor {
- "caseId = etUnit_openAll(\".\", \"TCPTest\", \"org.eclipse.etrice.generator.common.tests.TCPTest\", \"TCPTest_case\");"
+ "caseId = etUnit_openAll(\".\", \"TCPTest\", \"org.eclipse.etrice.generator.java.tests.TCPTest\", \"TCPTest_case\");"
}
dtor {
"etUnit_closeAll(caseId);"
diff --git a/tests/org.eclipse.etrice.runtime.c.tests/build.gradle b/tests/org.eclipse.etrice.runtime.c.tests/build.gradle index cf2f3e1e4..4b711fc94 100644 --- a/tests/org.eclipse.etrice.runtime.c.tests/build.gradle +++ b/tests/org.eclipse.etrice.runtime.c.tests/build.gradle @@ -35,6 +35,7 @@ task run(type: Exec, dependsOn: assemble, group: 'verification') { doFirst { file('log/testlog').mkdirs() } } -createEtUnitConverterTask('convert', run) +createEtUnitConverterTask('convert', [etuFileRuntimeTest, etuFileEtUnitTest]) +convert.dependsOn run check.dependsOn convert
\ No newline at end of file diff --git a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/RunCRuntimeTestcases.c b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/RunCRuntimeTestcases.c index 0a932fb44..16ad8a4da 100644 --- a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/RunCRuntimeTestcases.c +++ b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/RunCRuntimeTestcases.c @@ -56,7 +56,7 @@ void RunCRuntimeTestcases(void){ /* special situation for testing openAll and closeAll of etUnit * this has to be done outside of etUnit_open and etUnit_close */ - id = etUnit_openAll("log/testlog","TestEtUnitSpecial", "etUnit", "openAll and closeAll"); + id = etUnit_openAll("log/testlog","TestEtUnitSpecial", "etUnit", "org.eclipse.etrice.runtime.c.tests.openAll_and_closeAll"); EXPECT_TRUE(id, "Open and Close", ET_TRUE); etUnit_closeAll(id); diff --git a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtDatatypes.c b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtDatatypes.c index 84cbb0ff9..267feb3be 100644 --- a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtDatatypes.c +++ b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtDatatypes.c @@ -85,7 +85,7 @@ void TestEtDatatypes_FLOAT(etInt16 id) { } void TestEtDatatypes_runSuite(void) { - etUnit_openTestSuite("TestDatatypes"); + etUnit_openTestSuite("org.eclipse.etrice.runtime.c.tests.TestDatatypes"); ADD_TESTCASE(TestEtDatatypes_IntegerSize); ADD_TESTCASE(TestEtDatatypes_IntegerSign); ADD_TESTCASE(TestEtDatatypes_Boolean); diff --git a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtMemory.c b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtMemory.c index a46c00f17..f93239901 100644 --- a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtMemory.c +++ b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtMemory.c @@ -185,7 +185,7 @@ static void TestEtMemory_testFreeListOverflow(etInt16 id) { } void TestEtMemory_runSuite(void){ - etUnit_openTestSuite("TestMemory"); + etUnit_openTestSuite("org.eclipse.etrice.runtime.c.tests.TestMemory"); ADD_TESTCASE(TestEtMemory_testFixedSize); ADD_TESTCASE(TestEtMemory_testFreeList); ADD_TESTCASE(TestEtMemory_testFreeListOverflow); diff --git a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtMessage.c b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtMessage.c index 84e4022df..2ac07f2f3 100644 --- a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtMessage.c +++ b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtMessage.c @@ -38,7 +38,7 @@ void TestEtMessage_testBasicMessage(etInt16 id){ } void TestEtMessage_runSuite(void){ - etUnit_openTestSuite("TestMessage"); + etUnit_openTestSuite("org.eclipse.etrice.runtime.c.tests.TestMessage"); ADD_TESTCASE(TestEtMessage_testBasicMessage); etUnit_closeTestSuite(); } diff --git a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtMessageQueue.c b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtMessageQueue.c index f7cb75c4e..a2deeb162 100644 --- a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtMessageQueue.c +++ b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtMessageQueue.c @@ -92,7 +92,7 @@ void TestEtMessageQueue_testMassiveMessaging(etInt16 id){ } void TestEtMessageQueue_runSuite(void){ - etUnit_openTestSuite("TestEtMessageQueue"); + etUnit_openTestSuite("org.eclipse.etrice.runtime.c.tests.TestEtMessageQueue"); ADD_TESTCASE(TestEtMessageQueue_testPushPop); ADD_TESTCASE(TestEtMessageQueue_testMassiveMessaging); etUnit_closeTestSuite(); diff --git a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtMessageService.c b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtMessageService.c index 0867bf366..6fdf18a58 100644 --- a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtMessageService.c +++ b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtMessageService.c @@ -293,7 +293,7 @@ void TestEtMessageService_getMessagePoolLowWaterMark(etInt16 id){ void TestEtMessageService_runSuite(void){ - etUnit_openTestSuite("TestEtMessageService"); + etUnit_openTestSuite("org.eclipse.etrice.runtime.c.tests.TestEtMessageService"); ADD_TESTCASE(TestEtMessageService_init); ADD_TESTCASE(TestEtMessageService_GetPushPopReturn); ADD_TESTCASE(TestEtMessageService_GetReturn); diff --git a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtQueue.c b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtQueue.c index c32de2627..dc1ea3ffa 100644 --- a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtQueue.c +++ b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtQueue.c @@ -62,7 +62,7 @@ static void TestEtQueue_test(etInt16 id){ } void TestEtQueue_runSuite(void){ - etUnit_openTestSuite("TestQueue"); + etUnit_openTestSuite("org.eclipse.etrice.runtime.c.tests.TestQueue"); ADD_TESTCASE(TestEtQueue_test); etUnit_closeTestSuite(); } diff --git a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtTimer.c b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtTimer.c index fb574e6b2..f031baaa9 100644 --- a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtTimer.c +++ b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtTimer.c @@ -116,7 +116,7 @@ static void TestEtTimer_multiTimer (etInt16 id) { } void TestEtTimer_runSuite(void){ - etUnit_openTestSuite("TestEtTimer"); + etUnit_openTestSuite("org.eclipse.etrice.runtime.c.tests.TestEtTimer"); ADD_TESTCASE(TestEtTimer_lifecycle); ADD_TESTCASE(TestEtTimer_multiTimer); etUnit_closeTestSuite(); diff --git a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtUnit.c b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtUnit.c index 4bf2c137e..5a39e30c9 100644 --- a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtUnit.c +++ b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/TestEtUnit.c @@ -59,7 +59,7 @@ void TestEtUnit_Expect_Order(etInt16 id){ } void TestEtUnit_runSuite(void){ - etUnit_openTestSuite("TestEtUnit"); + etUnit_openTestSuite("org.eclipse.etrice.runtime.c.tests.TestEtUnit"); ADD_TESTCASE(TestEtUnit_Expect_Order); ADD_TESTCASE(TestEtUnit_Expect); etUnit_closeTestSuite(); diff --git a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/helpers/TestEtTimeHelpers.c b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/helpers/TestEtTimeHelpers.c index c1693cafa..8cc33d926 100644 --- a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/helpers/TestEtTimeHelpers.c +++ b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/helpers/TestEtTimeHelpers.c @@ -171,7 +171,7 @@ static void TestEtTimeHelpers_subtract (etInt16 id) { } void TestEtTimeHelpers_runSuite(void){ - etUnit_openTestSuite("TestEtTimeHelpers"); + etUnit_openTestSuite("org.eclipse.etrice.runtime.c.tests.TestEtTimeHelpers"); ADD_TESTCASE(TestEtTimeHelpers_convertToMSec); ADD_TESTCASE(TestEtTimeHelpers_convertToEtTime); ADD_TESTCASE(TestEtTimeHelpers_copy); diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle b/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle index 74624fe04..d9d197a0c 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle @@ -35,6 +35,7 @@ task run(type: Exec, dependsOn: assemble, group: 'verification') { doFirst { file('log/testlog').mkdirs() } } -createEtUnitConverterTask('convert', run) +createEtUnitConverterTask('convert', etuFile) +convert.dependsOn run check.dependsOn convert
\ No newline at end of file diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/MapTest.h b/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/MapTest.h index fceac394e..895d805fd 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/MapTest.h +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/MapTest.h @@ -20,7 +20,7 @@ class MapTest : public etTestSuite { public: MapTest() : - etTestSuite("MapTest"){ + etTestSuite("org.eclipse.etrice.runtime.cpp.tests.MapTest"){ } protected: diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/PairTest.h b/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/PairTest.h index 145d1cc4a..b6b71d114 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/PairTest.h +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/PairTest.h @@ -20,7 +20,7 @@ class PairTest : public etTestSuite { public: PairTest() : - etTestSuite("PairTest"){ + etTestSuite("org.eclipse.etrice.runtime.cpp.tests.PairTest"){ } protected: diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/SetTest.h b/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/SetTest.h index b76490d58..59d31826e 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/SetTest.h +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/SetTest.h @@ -20,7 +20,7 @@ class SetTest : public etTestSuite { public: SetTest() : - etTestSuite("SetTest"){ + etTestSuite("org.eclipse.etrice.runtime.cpp.tests.SetTest"){ } protected: diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/StaticArrayTest.h b/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/StaticArrayTest.h index af59bb9e6..9b29cdc1a 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/StaticArrayTest.h +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/StaticArrayTest.h @@ -20,7 +20,7 @@ class StaticArrayTest : public etTestSuite { public: StaticArrayTest() : - etTestSuite("StaticArrayTest"){ + etTestSuite("org.eclipse.etrice.runtime.cpp.tests.StaticArrayTest"){ } protected: diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/StaticDequeTest.h b/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/StaticDequeTest.h index b09d7bba0..41ceeea85 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/StaticDequeTest.h +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/StaticDequeTest.h @@ -17,7 +17,7 @@ class StaticDequeTest : public etTestSuite { public: - StaticDequeTest(void) : etTestSuite("StaticDequeTest") {} + StaticDequeTest(void) : etTestSuite("org.eclipse.etrice.runtime.cpp.tests.StaticDequeTest") {} protected: void runAllTestCases(void); diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/StaticStringTest.h b/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/StaticStringTest.h index fcbc86beb..096c27da7 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/StaticStringTest.h +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/StaticStringTest.h @@ -20,7 +20,7 @@ class StaticStringTest : public etTestSuite { public: StaticStringTest() : - etTestSuite("StaticStringTest"){ + etTestSuite("org.eclipse.etrice.runtime.cpp.tests.StaticStringTest"){ } protected: diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/StringTest.h b/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/StringTest.h index 7a7cb4871..1210fd26d 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/StringTest.h +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/StringTest.h @@ -20,7 +20,7 @@ class StringTest : public etTestSuite { public: StringTest() : - etTestSuite("StringTest"){ + etTestSuite("org.eclipse.etrice.runtime.cpp.tests.StringTest"){ } protected: diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/VectorTest.h b/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/VectorTest.h index d997a9cc3..5bc8f60aa 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/VectorTest.h +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/containers/VectorTest.h @@ -20,7 +20,7 @@ class VectorTest : public etTestSuite { public: VectorTest() : - etTestSuite("VectorTest"){ + etTestSuite("org.eclipse.etrice.runtime.cpp.tests.VectorTest"){ } protected: diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/DebuggingServiceTest.h b/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/DebuggingServiceTest.h index 212d38e8f..f00650d82 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/DebuggingServiceTest.h +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/DebuggingServiceTest.h @@ -23,7 +23,7 @@ using namespace etRuntime; class DebuggingServiceTest: public etTestSuite { public: DebuggingServiceTest() : - etTestSuite("DebuggingServiceTest") { + etTestSuite("org.eclipse.etrice.runtime.cpp.tests.DebuggingServiceTest") { } protected: diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCFilterTest.h b/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCFilterTest.h index f1de8d669..8b5879d16 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCFilterTest.h +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCFilterTest.h @@ -18,7 +18,7 @@ class MSCFilterTest: public etTestSuite { public: MSCFilterTest() : - etTestSuite("MSCFilterTest") { + etTestSuite("org.eclipse.etrice.runtime.cpp.tests.MSCFilterTest") { } protected: diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCFunctionObjectTest.h b/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCFunctionObjectTest.h index 3415f4c8b..86a8ac5d0 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCFunctionObjectTest.h +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCFunctionObjectTest.h @@ -18,7 +18,7 @@ class MSCFunctionObjectTest: public etTestSuite { public: MSCFunctionObjectTest() : - etTestSuite("MSFunctionObjectTest") { + etTestSuite("org.eclipse.etrice.runtime.cpp.tests.MSFunctionObjectTest") { } protected: diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCLoggerTest.h b/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCLoggerTest.h index 0a2491a01..b19e5bf77 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCLoggerTest.h +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCLoggerTest.h @@ -18,7 +18,7 @@ class MSCLoggerTest: public etTestSuite { public: MSCLoggerTest(void) : - etTestSuite("MSCLoggerTest") { + etTestSuite("org.eclipse.etrice.runtime.cpp.tests.MSCLoggerTest") { } protected: diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/AddressTest.h b/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/AddressTest.h index 6266c84d4..557b98918 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/AddressTest.h +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/AddressTest.h @@ -20,7 +20,7 @@ class AddressTest: public etTestSuite { public: AddressTest(void) : - etTestSuite("AddressTest") { + etTestSuite("org.eclipse.etrice.runtime.cpp.tests.AddressTest") { } protected: diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageDispatcherTest.h b/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageDispatcherTest.h index beab56e2a..0972986f8 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageDispatcherTest.h +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageDispatcherTest.h @@ -20,7 +20,7 @@ class MessageDispatcherTest: public etTestSuite { public: MessageDispatcherTest(void) : - etTestSuite("MessageDispatcherTest") { + etTestSuite("org.eclipse.etrice.runtime.cpp.tests.MessageDispatcherTest") { } protected: diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageSeQueueTest.h b/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageSeQueueTest.h index d5053d12a..37634f32d 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageSeQueueTest.h +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageSeQueueTest.h @@ -18,7 +18,7 @@ class MessageSeQueueTest: public etTestSuite { public: MessageSeQueueTest(void) : - etTestSuite("MessageSeQueueTest") { + etTestSuite("org.eclipse.etrice.runtime.cpp.tests.MessageSeQueueTest") { } protected: diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageServiceControllerTest.cpp b/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageServiceControllerTest.cpp index 439d9c079..c0950fbe0 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageServiceControllerTest.cpp +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageServiceControllerTest.cpp @@ -20,7 +20,7 @@ using namespace etRuntime; MessageServiceControllerTest::MessageServiceControllerTest() : - etTestSuite("MessageServiceControllerTest") { + etTestSuite("org.eclipse.etrice.runtime.cpp.tests.MessageServiceControllerTest") { etTime interval; interval.sec = 5; diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageServiceTest.cpp b/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageServiceTest.cpp index 728b8efff..e90143afd 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageServiceTest.cpp +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageServiceTest.cpp @@ -19,7 +19,7 @@ using namespace etRuntime; MessageServiceTest::MessageServiceTest() : - etTestSuite("MessageServiceTest"), m_senderTerminated(0) { + etTestSuite("org.eclipse.etrice.runtime.cpp.tests.MessageServiceTest"), m_senderTerminated(0) { RTServices::getInstance().getMsgSvcCtrl().resetAll(); diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageTest.h b/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageTest.h index 213e8ae3a..7d20118b4 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageTest.h +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/MessageTest.h @@ -18,7 +18,7 @@ class MessageTest: public etTestSuite { public: MessageTest(void) : - etTestSuite("MessageTest") { + etTestSuite("org.eclipse.etrice.runtime.cpp.tests.MessageTest") { } protected: diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/RTObjectTest.h b/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/RTObjectTest.h index 3bd46eaf1..7922c8c14 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/RTObjectTest.h +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/RTObjectTest.h @@ -18,7 +18,7 @@ class RTObjectTest: public etTestSuite { public: RTObjectTest(void) : - etTestSuite("RTObject Test") { + etTestSuite("org.eclipse.etrice.runtime.cpp.tests.RTObject Test") { } protected: diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/StaticMessageMemoryTest.h b/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/StaticMessageMemoryTest.h index 44b74d060..3cf26bd52 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/StaticMessageMemoryTest.h +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/messaging/StaticMessageMemoryTest.h @@ -18,7 +18,7 @@ class StaticMessageMemoryTest: public etTestSuite { public: StaticMessageMemoryTest(void) : - etTestSuite("StaticMessageMemoryTest") { + etTestSuite("org.eclipse.etrice.runtime.cpp.tests.StaticMessageMemoryTest") { } protected: |