Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Belle2017-09-14 09:10:30 +0000
committerJan Belle2017-09-14 09:10:30 +0000
commitc6d7647c8c42a751c2ff5ec9c10faeb6569463c5 (patch)
tree386597857a50d129e8ce1637c2974db9081482ee /tests/org.eclipse.etrice.generator.common.tests
parentd4cd43005dc9479d21b819f31dcc6cb51e020131 (diff)
downloadorg.eclipse.etrice-c6d7647c8c42a751c2ff5ec9c10faeb6569463c5.tar.gz
org.eclipse.etrice-c6d7647c8c42a751c2ff5ec9c10faeb6569463c5.tar.xz
org.eclipse.etrice-c6d7647c8c42a751c2ff5ec9c10faeb6569463c5.zip
[tests] fixed test suite names
Diffstat (limited to 'tests/org.eclipse.etrice.generator.common.tests')
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/build.gradle2
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/etTest.gradle (renamed from tests/org.eclipse.etrice.generator.common.tests/etriceTest.gradle)10
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room2
3 files changed, 6 insertions, 8 deletions
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();"

Back to the top