Added Order to dsl and testcollection.java

Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/bpmn/data/BPMNTestcase.java

@@ -12,6 +12,7 @@ public class BPMNTestcase {
 	private List<String> mocks;
 	private int priority;
 	private String flag;
+	private int order;
 	
 	public BPMNTestcase() {
 		this.taskVariableList = new ArrayList<>();
@@ -72,6 +73,14 @@ public class BPMNTestcase {
 	public void setPriority(int priority) {
 		this.priority = priority;
 	}
+	
+	public int getOrder() {
+		return order;
+	}
+
+	public void setOrder(int order) {
+		this.order = order;
+	}
 
 	public String getFlag() {
 		return flag;

Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/prioritization/PrioritizationService.java

@@ -77,13 +77,13 @@ public class PrioritizationService {
 		
 		this.sumDependencies(dependenciesRead, dependenciesWrite, dependenciesRemove);
 		
-		this.newDSL.serialize();
+		
 		
 		HashMap<String, Integer> testPriorities = this.sumTestPriorities();
 		this.setTestPriorities(testPriorities);
 		this.setTestOrder(testPriorities);
 		
-		
+		this.newDSL.serialize();
 	}
 	
 	/**
@@ -93,14 +93,25 @@ public class PrioritizationService {
 	private void setTestOrder(HashMap<String, Integer> testPriorities)
 	{
 		HashMap<String, Integer> sortedList = PrioritizationService.sortByValue(testPriorities);
-		
+		List<Test> testList = this.newDSL.getTests();
 		int i = 1;
 		for (String key : sortedList.keySet()){
 	        System.out.println("[TEST] " + key + " with priority " + sortedList.get(key) + " [JUNIT] Order: " + i);
-	        i++;
+	        
 	        
 	        // TODO: dem Test die Order hinzufügen
-	        // test.setOrder(i);
+	        for(Test test: testList) {
+	        	if(test.getName().equals(key)) {
+	        		test.setOrder(i);
+	        		try {
+						this.newDSL.serialize();
+					} catch (IOException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+	        	}
+	        }
+	        i++;
 	    }
 	}
 	

Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/change/ChangeController.java

@@ -234,26 +234,7 @@ public class ChangeController {
 				}
 				
 			}
-		}
-// 		for (int i=0; i<newFlows.size();i++) {
-//		System.out.println(matchingFlows[i][0].getName()+"   "+matchingFlows[i][1].getName());
-//		}
-//		for (int i=0; i<newFlows.size();i++) {
-//			System.out.print(matchingFlows[i][0].getName()+" ---");
-//			try {
-//				System.out.print(matchingFlows[i][1].getName()+" ---");
-//			} catch (Exception e) {
-//				System.out.print("kein passender Flow gefunden");
-//				if(matchingFlows[i][1]==null){
-//					System.out.println(i);
-//				}
-//			}
-//			System.out.println("");
-//			
-//
-//		}
-//		
-		
+		}		
 		
 		//Alte DSL kopieren und neu generieren
 		Path testFilePath = ProjectDirectoryUtils.getTestspecificationPath(project.getProjectDirectories());
@@ -338,8 +319,6 @@ public class ChangeController {
 						
 					}
 					
-					
-					
 					//Prüfen, ob ggf Tasks gelöscht wurden
 					List<TaskVariables> variableListToSet = new ArrayList<>();
 					for(TaskVariables tv : bpmnTestcase.getTaskVariableList()) {
@@ -374,8 +353,7 @@ public class ChangeController {
 								typeChanged = true;
 							}
 						}
-						
-						
+									
 						List<VariableValue> variableValuesToSet = new ArrayList<>();
 						if(!typeChanged) {
 							List<String> deletedInputVariables = new ArrayList<>();
@@ -385,7 +363,6 @@ public class ChangeController {
 								}
 							}
 							
-							
 							for(VariableValue vv : tv.getVariableValues()) {
 								if(!deletedInputVariables.contains(vv.getVariable())) {
 									variableValuesToSet.add(vv);
@@ -418,15 +395,10 @@ public class ChangeController {
 					bpmnTestcase.getMocks().clear();
 					bpmnTestcase.getMocks().addAll(mocksToAdd);
 					
-					
-					
-					
 					testService.addTest(bpmnTestcase, project.getProjectDirectories());
 				}
 			}
 			
-			
-			
 			newDSL = null;
 			newDSL = new TestgeneratorDSLSerializer(newDSLFile.toString());
 			

Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/converters/TestConverter.java

@@ -68,11 +68,12 @@ public class TestConverter {
 		
 		// @Tim, @Henning Priorität hier hinzufügen
 		int prio = testcase.getPriority();
+		int order = testcase.getOrder();
 		
 		//Flag
 		Flag flag = Flag.get(testcase.getFlag());
 		
-		return TestgeneratorDSLObjectCreator.createTest(testcase.getName(), flow, variableDeclarationsList, endCheckDeclaration, mocks, prio, flag);
+		return TestgeneratorDSLObjectCreator.createTest(testcase.getName(), flow, variableDeclarationsList, endCheckDeclaration, mocks, prio, flag, order);
 	}
 
 	public static FlowElement getFlowElement(List<FlowElement> flowElements, String name) {
@@ -115,6 +116,7 @@ public class TestConverter {
 		bpmnTestcase.setEndChecks(endCheckList);
 		bpmnTestcase.setMocks(mocks);
 		bpmnTestcase.setPriority(testcase.getPriority());
+		bpmnTestcase.setOrder(testcase.getOrder());
 		bpmnTestcase.setFlag(testcase.getFlag().name());
 
 		return bpmnTestcase;