From f3e31341d83f5952c0e5c7d5b57a3c3052d0b2e9 Mon Sep 17 00:00:00 2001
From: tfli <tfli@d-velop.de>
Date: Tue, 4 Jan 2022 15:26:48 +0100
Subject: [PATCH] Added order to dsl and testcollection.java
---
.../src/de/fhmuenster/masterthesis/TestgeneratorDSL.xtext | 1 +
.../masterthesis/generator/TestgeneratorDSLGenerator.xtend | 2 +-
.../serialization/TestgeneratorDSLObjectCreator.java | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/TestgeneratorDSL.xtext b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/TestgeneratorDSL.xtext
index 826e492..544fa67 100644
--- a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/TestgeneratorDSL.xtext
+++ b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/TestgeneratorDSL.xtext
@@ -166,6 +166,7 @@ FlowReference:
Test:
'Test' name=ID 'for' flowReference=FlowReference
('with' 'priority' priority=INT)?
+ ('with' 'order' order=INT)?
('with' 'flag' ASSOCIATION flag=Flag)?
(declarations+=VariableDeclarations (SEPARATOR declarations+=VariableDeclarations)*)?
(endCheck=EndChecks)?
diff --git a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/generator/TestgeneratorDSLGenerator.xtend b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/generator/TestgeneratorDSLGenerator.xtend
index 9ed4025..3d9c5e0 100644
--- a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/generator/TestgeneratorDSLGenerator.xtend
+++ b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/generator/TestgeneratorDSLGenerator.xtend
@@ -351,7 +351,7 @@ class TestgeneratorDSLGenerator extends AbstractGenerator {
val Testcase testcase = c.build(bpmnTestcase);
appendLine("\t@Test");
- appendLine("\t@Order(" + test.getPriority() + (")"));
+ appendLine("\t@Order(" + test.getOrder() + (")"));
addDeployment(bpmnDiagram.getDeployments());
diff --git a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/TestgeneratorDSLObjectCreator.java b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/TestgeneratorDSLObjectCreator.java
index 98fdbba..9263f63 100644
--- a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/TestgeneratorDSLObjectCreator.java
+++ b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/TestgeneratorDSLObjectCreator.java
@@ -431,7 +431,7 @@ public class TestgeneratorDSLObjectCreator {
return manualMock;
}
- public static Test createTest(String name, Flow flow, List<VariableDeclarations> variableDeclarations, EndChecks endChecks, List<Mock> mocks, int priority, Flag flag) {
+ public static Test createTest(String name, Flow flow, List<VariableDeclarations> variableDeclarations, EndChecks endChecks, List<Mock> mocks, int priority, Flag flag, int order) {
FlowReference flowReference = TestgeneratorDSLFactory.eINSTANCE.createFlowReference();
flowReference.setRef(flow);
@@ -447,6 +447,7 @@ public class TestgeneratorDSLObjectCreator {
test.setName(name);
test.setFlowReference(flowReference);
test.setPriority(priority);
+ test.setOrder(order);
test.setFlag(flag);
test.getDeclarations().addAll(variableDeclarations);
test.getMocks().addAll(mockRefs);
--
GitLab