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 826e492f755ee90ee22246b2417a8eb3bb0b0e58..544fa6763e974fe68c468b2194794e282be9f71b 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 9ed40253eeaebee228b6f67e31bd2fc28c0295e7..3d9c5e0fa489b61a6eb46ca382a9797143786da7 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 98fdbba12f4bc38e0c7d79b874b5f00c770831bc..9263f63be835b49ee0f9b3979e4699f8fcfa68a8 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);