Skip to content
Snippets Groups Projects
Commit 22af9852 authored by Chrissi's avatar Chrissi
Browse files

remove last naming errors in query factory creation

parent 00671142
No related branches found
No related tags found
No related merge requests found
...@@ -133,7 +133,7 @@ object QueryMethods { ...@@ -133,7 +133,7 @@ object QueryMethods {
result = PredefTypes.Boolean, result = PredefTypes.Boolean,
params = Seq(SMethodParameter("v", targetClass)), params = Seq(SMethodParameter("v", targetClass)),
implementation = Seq(SMethodStatement(content = "if (v == null) return false", usedTypes = Set.empty), 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} != null) {", usedTypes = Set.empty),
SMethodStatement(content = s"if (${realRef.getName}.${getStatement}() == v) return false", 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), SMethodStatement(content = s"${realRef.getName}.deleteElement()", usedTypes = Set.empty),
...@@ -183,7 +183,7 @@ object QueryMethods { ...@@ -183,7 +183,7 @@ object QueryMethods {
name = s"add${realRef.getName.capitalize}", name = s"add${realRef.getName.capitalize}",
result = PredefTypes.Boolean, result = PredefTypes.Boolean,
params = Seq(SMethodParameter("v", targetClass)), 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 = s"new ${refClass.getName}${thisStatement}", usedTypes = Set.empty),
SMethodStatement(content = "return true", usedTypes = Set.empty)))) SMethodStatement(content = "return true", usedTypes = Set.empty))))
sourceClass.addMethod(new SMethod( sourceClass.addMethod(new SMethod(
......
...@@ -7,10 +7,10 @@ import org.rosi_project.model_sync.generator.Creation ...@@ -7,10 +7,10 @@ import org.rosi_project.model_sync.generator.Creation
object ApplicationTest extends App { object ApplicationTest extends App {
runTestLibrary(Creation.rolesum) //runTestLibrary(Creation.rolesum)
//runCombinedTest(Creation.rolesum) //runCombinedTest(Creation.rolesum)
//runShrinkingModel(Creation.rolesum) //runShrinkingModel(Creation.rolesum)
//runTestAML(Creation.rolesum) runTestAML(Creation.rolesum)
//TTC Case examples //TTC Case examples
//runTTC2019(Creation.rolecomb) //runTTC2019(Creation.rolecomb)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment