From 22af9852b23e7acfb1dd4753157b68e9fd96871f Mon Sep 17 00:00:00 2001 From: Chrissi <christopher@hbsc-werner.de> Date: Wed, 7 Aug 2019 14:32:22 +0200 Subject: [PATCH] remove last naming errors in query factory creation --- .../rosi_project/model_sync/generator/sync/QueryMethods.scala | 4 ++-- .../model_sync/generator/test/ApplicationTest.scala | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/scala/org/rosi_project/model_sync/generator/sync/QueryMethods.scala b/src/main/scala/org/rosi_project/model_sync/generator/sync/QueryMethods.scala index 857bf7e..560a1fe 100644 --- a/src/main/scala/org/rosi_project/model_sync/generator/sync/QueryMethods.scala +++ b/src/main/scala/org/rosi_project/model_sync/generator/sync/QueryMethods.scala @@ -133,7 +133,7 @@ object QueryMethods { result = PredefTypes.Boolean, params = Seq(SMethodParameter("v", targetClass)), implementation = Seq(SMethodStatement(content = "if (v == null) return false", usedTypes = Set.empty), - SMethodStatement(content = "if (!containsRole(v.asInstanceOf[AQueryViewRole])) return false", usedTypes = Set.empty), + SMethodStatement(content = s"if (!containsRole(v.asInstanceOf[${PredefRsumTypes.AQUERY_VIEW_ROLE_STYPE.getName}])) return false", usedTypes = Set.empty), SMethodStatement(content = s"if (${realRef.getName} != null) {", usedTypes = Set.empty), SMethodStatement(content = s"if (${realRef.getName}.${getStatement}() == v) return false", usedTypes = Set.empty), SMethodStatement(content = s"${realRef.getName}.deleteElement()", usedTypes = Set.empty), @@ -183,7 +183,7 @@ object QueryMethods { name = s"add${realRef.getName.capitalize}", result = PredefTypes.Boolean, params = Seq(SMethodParameter("v", targetClass)), - implementation = Seq(SMethodStatement(content = s"if (has${realRef.getName.capitalize}(v) || !containsRole(v.asInstanceOf[AQueryViewRole])) return false", usedTypes = Set.empty), + implementation = Seq(SMethodStatement(content = s"if (has${realRef.getName.capitalize}(v) || !containsRole(v.asInstanceOf[${PredefRsumTypes.AQUERY_VIEW_ROLE_STYPE.getName}])) return false", usedTypes = Set.empty), SMethodStatement(content = s"new ${refClass.getName}${thisStatement}", usedTypes = Set.empty), SMethodStatement(content = "return true", usedTypes = Set.empty)))) sourceClass.addMethod(new SMethod( diff --git a/src/main/scala/org/rosi_project/model_sync/generator/test/ApplicationTest.scala b/src/main/scala/org/rosi_project/model_sync/generator/test/ApplicationTest.scala index 98b0637..a2c5a44 100644 --- a/src/main/scala/org/rosi_project/model_sync/generator/test/ApplicationTest.scala +++ b/src/main/scala/org/rosi_project/model_sync/generator/test/ApplicationTest.scala @@ -7,10 +7,10 @@ import org.rosi_project.model_sync.generator.Creation object ApplicationTest extends App { - runTestLibrary(Creation.rolesum) + //runTestLibrary(Creation.rolesum) //runCombinedTest(Creation.rolesum) //runShrinkingModel(Creation.rolesum) - //runTestAML(Creation.rolesum) + runTestAML(Creation.rolesum) //TTC Case examples //runTTC2019(Creation.rolecomb) -- GitLab