added test flag inherited from flow

Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/migration/MigrationService.java

@@ -24,6 +24,7 @@ import de.fhmuenster.masterthesis.testgeneratorDSL.ScriptTaskFlowElement;
 import de.fhmuenster.masterthesis.testgeneratorDSL.UserTaskFlowElement;
 import de.fhmuenster.masterthesis.testgeneratorDSL.SequenceFlowElement;
 import de.fhmuenster.masterthesis.testgeneratorDSL.ServiceTaskFlowElement;
+import de.fhmuenster.masterthesis.testgeneratorDSL.Test;
 import de.fhmuenster.masterthesis.testgeneratorDSL.BusinessRuleTaskFlowElement;
 import de.fhmuenster.masterthesis.testgeneratorDSL.Flag;
 import de.fhmuenster.masterthesis.utils.TestgeneratorDSLUtils;
@@ -57,9 +58,7 @@ public class MigrationService {
 		
 		System.out.println("Ergebnis addAction");
 		for(FlowChangeWrapper fcw : activityAddActionResults) {
-			System.out.println("+++ Neu: " + fcw.getFlowElement().getName() + " [" + fcw.getActionType() + "] in Flow " + fcw.getFlow().getName()
-					+ " mit Status: " + fcw.getMigrationResult().getPriority());
-			
+
 			try {
 				Flag maxFlag = Flag.NONE;
 				List<FlowElementReference> fers = newDSL.getFlow(fcw.getFlow().getName()).getInclElements();
@@ -77,6 +76,17 @@ public class MigrationService {
 				flow.setFlag(flowFlag);
 				int score = this.calcScore(flow.getFlag());
 				flow.setScore(score);
+				
+				//Anhand der neuen Flows das Flag auch für die zugehörigen Tests setzen
+				//Test-Flags setzen
+				List<Flow> newFlows = newDSL.getFlows();
+				for(Flow f : newFlows) {
+					for(Test t : newDSL.getTestsForFlow(f)) {
+						t.setFlag(f.getFlag());
+					}
+				}
+				
+				
 				newDSL.serialize();
 			} catch (IOException e) {
 				//

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

@@ -111,7 +111,7 @@ public class ChangeController {
 		
 		try {
 			TestgeneratorDSLSerializer oldDSL = new TestgeneratorDSLSerializer(oldDSLFile.toString());
-			TestgeneratorDSLSerializer newDSL = new TestgeneratorDSLSerializer(newDSLFile.toString());
+			
 
 			/*
 			 * Prioritäten der Tests der neuen DSL hinzufügen
@@ -119,10 +119,6 @@ public class ChangeController {
 			 */
 			List<Flow> flows = oldDSL.getFlows();
 			
-			MigrationResultWrapper migrationResultWrapper = migrationService.detectChanges(oldDSL, newDSL);
-			
-			migrationResultWrapperDTO = migrationService.convertMigrationResultWrapper(migrationResultWrapper);
-				
 			for(Flow flow : flows)
 			{
 				List<Test> oldTests = oldDSL.getTestsForFlow(flow);					
@@ -132,6 +128,12 @@ public class ChangeController {
 				}
 			}
 			
+			TestgeneratorDSLSerializer newDSL = new TestgeneratorDSLSerializer(newDSLFile.toString());
+			
+			MigrationResultWrapper migrationResultWrapper = migrationService.detectChanges(oldDSL, newDSL);
+			
+			migrationResultWrapperDTO = migrationService.convertMigrationResultWrapper(migrationResultWrapper);
+			
 			return migrationResultWrapperDTO;
 			
 		} catch (IOException e) {