Merge branch 'master' of https://git.fh-muenster.de/fe/fe-pda-testing-tool

Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/bpmn/processfragmentation/BPMNVariableIOScanner.java

@@ -173,10 +173,13 @@ public class BPMNVariableIOScanner {
 						{						
 							case "delegateExpression":
 								String strExpression = expression.getValue(currentElement).toString();
-								Pattern pattern = Pattern.compile("\"(.*?)\"", Pattern.DOTALL);
-								Matcher matcher = pattern.matcher(strExpression);
-								while (matcher.find()) {
-									removeVars.add(matcher.group(1));	// Contains String with all variables from removeVar Expression
+								if(strExpression.contains("execution.removeVariable"))		// check the String for a removeVariable*s Expression	
+								{
+									Pattern pattern = Pattern.compile("\"(.*?)\"", Pattern.DOTALL);
+									Matcher matcher = pattern.matcher(strExpression);
+									while (matcher.find()) {
+										removeVars.add(matcher.group(1));					// Contains String with all variables from removeVar Expression
+									}
 								}
 								break;
 							default:

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

@@ -709,7 +709,7 @@ public class MigrationService {
 		HashMap<String, List<VariableReference>> hashMapInputVariables = new HashMap<>();
 		
 		for(UserTaskFlowElement e : oldDSL.getUserTaskFlowElements()) {
-			hashMapInputVariables.put(e.getName(), e.getInputVariables());
+			hashMapInputVariables.put(e.getName(), e.getReadVariables());
 		}
 		
 		List<UserTaskFlowElement> neededUserTasks = new ArrayList<>();
@@ -720,7 +720,7 @@ public class MigrationService {
 			if(oldInputVariables != null) {
 				//Die UserTask ist auch in der neuen DSL vorhanden
 				//Prüfen, ob es eine neue InputVariable gibt (nur Anzahl prüfen reicht nicht)
-				List<VariableReference> newVariables = e.getInputVariables();
+				List<VariableReference> newVariables = e.getReadVariables();
 				
 				List<VariableReference> newInputVariables = new BasicEList<>();
 				
@@ -782,7 +782,7 @@ public class MigrationService {
 		HashMap<String, List<VariableReference>> hashMapInputVariables = new HashMap<>();
 		
 		for(UserTaskFlowElement e : oldDSL.getUserTaskFlowElements()) {
-			hashMapInputVariables.put(e.getName(), e.getInputVariables());
+			hashMapInputVariables.put(e.getName(), e.getReadVariables());
 		}
 		
 		List<UserTaskFlowElement> neededUserTasks = new ArrayList<>();
@@ -792,7 +792,7 @@ public class MigrationService {
 				
 				//Die UserTask ist auch in der neuen DSL vorhanden
 				//Prüfen, ob es eine neue InputVariable gibt (nur Anzahl prüfen reicht nicht)
-				List<VariableReference> newVariables = e.getInputVariables();
+				List<VariableReference> newVariables = e.getReadVariables();
 				
 				List<VariableReference> deletedInputVariables = new BasicEList<>();
 				//System.out.println(newVariables.toString());
@@ -1157,8 +1157,8 @@ public class MigrationService {
 				if(old instanceof UserTaskFlowElement && newDSL.getFlowElements(Arrays.asList(old.getName())).get(0) instanceof UserTaskFlowElement) {
 					UserTaskFlowElement newElement = (UserTaskFlowElement) newDSL.getFlowElements(Arrays.asList(old.getName())).get(0);
 					UserTaskFlowElement oldElement = (UserTaskFlowElement) old;
-					oldVariableReference = oldElement.getInputVariables();
-					newVariableReference = newElement.getInputVariables();
+					oldVariableReference = oldElement.getReadVariables();
+					newVariableReference = newElement.getReadVariables();
 					originalNewElement = newElement;
 				}
 				else {
@@ -2116,7 +2116,7 @@ public class MigrationService {
 		if (element instanceof UserTaskFlowElement) {
 			UserTaskFlowElement ue = (UserTaskFlowElement) element;
 			
-			for(VariableReference vr : ue.getInputVariables()) {
+			for(VariableReference vr : ue.getReadVariables()) {
 				if(vr.getValidationStatus().equals(ValidationState.REQUIRED)) {
 					return true;
 				}

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

@@ -39,30 +39,36 @@ public class PrioritizationService {
 	}
 
 	public void prioritize() {
-		Map<String, List<VariableReference>> readVariablesOldDSL, writeVariablesOldDSL, readVariablesNewDSL, writeVariablesNewDSL;
+		Map<String, List<VariableReference>> readVariablesOldDSL, writeVariablesOldDSL, readVariablesNewDSL, writeVariablesNewDSL, removeVariablesOldDSL, removeVariablesNewDSL;
 		
-		readVariablesOldDSL = this.getReadVariables(this.oldDSL);
-		writeVariablesOldDSL = this.getWriteVariables(this.oldDSL);
+		readVariablesOldDSL 	= this.getReadVariables(this.oldDSL);
+		writeVariablesOldDSL	= this.getWriteVariables(this.oldDSL);
+		removeVariablesOldDSL 	= this.getRemoveVariables(this.oldDSL);
 				
-		readVariablesNewDSL = this.getReadVariables(this.newDSL);
-		writeVariablesNewDSL = this.getWriteVariables(this.newDSL);
+		readVariablesNewDSL 	= this.getReadVariables(this.newDSL);
+		writeVariablesNewDSL 	= this.getWriteVariables(this.newDSL);
+		removeVariablesNewDSL 	= this.getRemoveVariables(this.oldDSL);
 		
 		this.readVariables = readVariablesNewDSL;
 		this.writeVariables = writeVariablesNewDSL;		
 				
-		HashMap<String, List<String>> changesReadVariables	= this.checkVariables(readVariablesOldDSL, readVariablesNewDSL);
-		HashMap<String, List<String>> changesWriteVariables	= this.checkVariables(writeVariablesOldDSL, writeVariablesNewDSL);
+		HashMap<String, List<String>> changesReadVariables		= this.checkVariables(readVariablesOldDSL, readVariablesNewDSL);
+		HashMap<String, List<String>> changesWriteVariables		= this.checkVariables(writeVariablesOldDSL, writeVariablesNewDSL);
+		HashMap<String, List<String>> changesRemoveVariables	= this.checkVariables(writeVariablesOldDSL, writeVariablesNewDSL);
 		
 		HashMap<String, List<String>> changesReadVariablesOLD	= this.checkVariables(readVariablesNewDSL, readVariablesOldDSL);
 		HashMap<String, List<String>> changesWriteVariablesOLD	= this.checkVariables(writeVariablesNewDSL, writeVariablesOldDSL);
+		HashMap<String, List<String>> changesRemoveVariablesOLD	= this.checkVariables(writeVariablesOldDSL, writeVariablesNewDSL);
 		
-		HashMap<String, List<String>> differentReadVariables = this.checkDifferences(changesReadVariablesOLD, changesReadVariables);
-		HashMap<String, List<String>> differentWriteVariables = this.checkDifferences(changesWriteVariablesOLD, changesWriteVariables);
+		HashMap<String, List<String>> differentReadVariables 	= this.checkDifferences(changesReadVariablesOLD, changesReadVariables);
+		HashMap<String, List<String>> differentWriteVariables 	= this.checkDifferences(changesWriteVariablesOLD, changesWriteVariables);
+		HashMap<String, List<String>> differentRemoveVariables 	= this.checkDifferences(changesRemoveVariablesOLD, changesRemoveVariables);
 
-		HashMap<String, Integer> dependenciesRead = this.checkFlowsWhereVariableExists(differentReadVariables);
-		HashMap<String, Integer> dependenciesWrite = this.checkFlowsWhereVariableExists(differentWriteVariables);
+		HashMap<String, Integer> dependenciesRead 	= this.checkFlowsWhereVariableExists(differentReadVariables);
+		HashMap<String, Integer> dependenciesWrite 	= this.checkFlowsWhereVariableExists(differentWriteVariables);
+		HashMap<String, Integer> dependenciesRemove = this.checkFlowsWhereVariableExists(differentRemoveVariables);
 		
-		this.sumDependencies(dependenciesRead, dependenciesWrite);
+		this.sumDependencies(dependenciesRead, dependenciesWrite, dependenciesRemove);
 		
 		this.dumpDependencyList(this.newDSL.getFlows());		
 		try {
@@ -162,7 +168,7 @@ public class PrioritizationService {
 		
 	}
 	
-	private void sumDependencies(HashMap<String, Integer> firstList, HashMap<String, Integer> secondList)
+	private void sumDependencies(HashMap<String, Integer> firstList, HashMap<String, Integer> secondList, HashMap<String, Integer> removeList)
 	{
 		for(Map.Entry<String, Integer> elem1 : firstList.entrySet())
 		{
@@ -175,7 +181,17 @@ public class PrioritizationService {
 				Integer flowDependency	= elem2.getValue();
 				
 				if(currentFlowElement.equals(flowElement)) {
-					// Sum the dependencies
+					int sum = dependencyFlow + flowDependency;
+					this.dependencyList.put(currentFlowElement, sum);
+				}
+			}
+			
+			for(Map.Entry<String, Integer> elem3 : removeList.entrySet())
+			{
+				String flowElement		= elem3.getKey();
+				Integer flowDependency	= elem3.getValue();
+				
+				if(currentFlowElement.equals(flowElement)) {
 					int sum = dependencyFlow + flowDependency;
 					this.dependencyList.put(currentFlowElement, sum);
 				}
@@ -280,6 +296,72 @@ public class PrioritizationService {
 		return returnMap;
 	}
 	
+	/**
+	 * 
+	 * @param dsl
+	 * @return
+	 */
+	
+	private Map<String, List<VariableReference>> getRemoveVariables(TestgeneratorDSLSerializer dsl) {
+		
+		Map<String, List<VariableReference>> mapFlowToRemoveVariables = new HashMap<String, List<VariableReference>>();		
+		
+		try {
+			List<Flow> flows 		= dsl.getFlows();
+			for(Flow f: flows) 
+			{
+				List<FlowElementReference> fer = f.getInclElements();
+	
+				for(FlowElementReference flowElementReference: fer)
+				{
+					FlowElement flowElement = flowElementReference.getRef();
+	
+					if(flowElementReference.getRef() instanceof ManualTaskFlowElement) 
+					{
+						ManualTaskFlowElement manualTask = (ManualTaskFlowElement) flowElementReference.getRef();
+						List<VariableReference> removeVariables = manualTask.getRemoveVariables();
+						mapFlowToRemoveVariables.put(flowElement.getName(), removeVariables);
+					}
+					else if(flowElementReference.getRef() instanceof UserTaskFlowElement) 
+					{
+						UserTaskFlowElement userTask = (UserTaskFlowElement) flowElementReference.getRef();
+						List<VariableReference> removeVariables = userTask.getRemoveVariables();
+						mapFlowToRemoveVariables.put(flowElement.getName(), removeVariables);
+					}
+					else if(flowElementReference.getRef() instanceof ScriptTaskFlowElement) 
+					{
+						ScriptTaskFlowElement scriptTask = (ScriptTaskFlowElement) flowElementReference.getRef();
+						List<VariableReference> removeVariables = scriptTask.getRemoveVariables();
+						mapFlowToRemoveVariables.put(flowElement.getName(), removeVariables);
+					}
+					else if(flowElementReference.getRef() instanceof DelegateServiceTaskFlowElement) 
+					{
+						DelegateServiceTaskFlowElement delegateTask = (DelegateServiceTaskFlowElement) flowElementReference.getRef();
+						List<VariableReference> removeVariables = delegateTask.getRemoveVariables();
+						mapFlowToRemoveVariables.put(flowElement.getName(), removeVariables);
+					}
+					else if(flowElementReference.getRef() instanceof ExternalServiceTaskFlowElement) 
+					{
+						ExternalServiceTaskFlowElement externalTask = (ExternalServiceTaskFlowElement) flowElementReference.getRef();
+						List<VariableReference> removeVariables = externalTask.getRemoveVariables();
+						mapFlowToRemoveVariables.put(flowElement.getName(), removeVariables);
+					}
+					else if(flowElementReference.getRef() instanceof BusinessRuleTaskFlowElement) 
+					{
+						BusinessRuleTaskFlowElement  businessTask = (BusinessRuleTaskFlowElement) flowElementReference.getRef();
+						List<VariableReference> removeVariables = businessTask.getRemoveVariables();
+						mapFlowToRemoveVariables.put(flowElement.getName(), removeVariables);
+					}
+				}
+			}
+		}
+		catch(Exception e) {
+			
+		}
+		
+		return mapFlowToRemoveVariables;
+	}
+	
 	/**	
 	 * Function to get the WriteVariables from the DSL
 	 * @param dsl
@@ -302,37 +384,37 @@ public class PrioritizationService {
 					if(flowElementReference.getRef() instanceof ManualTaskFlowElement) 
 					{
 						ManualTaskFlowElement manualTask = (ManualTaskFlowElement) flowElementReference.getRef();
-						List<VariableReference> writeVariables = manualTask.getOutputVariables();
+						List<VariableReference> writeVariables = manualTask.getWriteVariables();
 						mapFlowToWriteVariables.put(flowElement.getName(), writeVariables);
 					}
 					else if(flowElementReference.getRef() instanceof UserTaskFlowElement) 
 					{
 						UserTaskFlowElement userTask = (UserTaskFlowElement) flowElementReference.getRef();
-						List<VariableReference> writeVariables = userTask.getOutputVariables();
+						List<VariableReference> writeVariables = userTask.getWriteVariables();
 						mapFlowToWriteVariables.put(flowElement.getName(), writeVariables);
 					}
 					else if(flowElementReference.getRef() instanceof ScriptTaskFlowElement) 
 					{
 						ScriptTaskFlowElement scriptTask = (ScriptTaskFlowElement) flowElementReference.getRef();
-						List<VariableReference> writeVariables = scriptTask.getOutputVariables();
+						List<VariableReference> writeVariables = scriptTask.getWriteVariables();
 						mapFlowToWriteVariables.put(flowElement.getName(), writeVariables);
 					}
 					else if(flowElementReference.getRef() instanceof DelegateServiceTaskFlowElement) 
 					{
 						DelegateServiceTaskFlowElement delegateTask = (DelegateServiceTaskFlowElement) flowElementReference.getRef();
-						List<VariableReference> writeVariables = delegateTask.getOutputVariables();
+						List<VariableReference> writeVariables = delegateTask.getWriteVariables();
 						mapFlowToWriteVariables.put(flowElement.getName(), writeVariables);
 					}
 					else if(flowElementReference.getRef() instanceof ExternalServiceTaskFlowElement) 
 					{
 						ExternalServiceTaskFlowElement externalTask = (ExternalServiceTaskFlowElement) flowElementReference.getRef();
-						List<VariableReference> writeVariables = externalTask.getOutputVariables();
+						List<VariableReference> writeVariables = externalTask.getWriteVariables();
 						mapFlowToWriteVariables.put(flowElement.getName(), writeVariables);
 					}
 					else if(flowElementReference.getRef() instanceof BusinessRuleTaskFlowElement) 
 					{
 						BusinessRuleTaskFlowElement  businessTask = (BusinessRuleTaskFlowElement) flowElementReference.getRef();
-						List<VariableReference> writeVariables = businessTask.getOutputVariables();
+						List<VariableReference> writeVariables = businessTask.getWriteVariables();
 						mapFlowToWriteVariables.put(flowElement.getName(), writeVariables);
 					}
 				}
@@ -367,37 +449,37 @@ public class PrioritizationService {
 					if(flowElementReference.getRef() instanceof ManualTaskFlowElement) 
 					{
 						ManualTaskFlowElement manualTask = (ManualTaskFlowElement) flowElementReference.getRef();
-						List<VariableReference> readVariables = manualTask.getInputVariables();
+						List<VariableReference> readVariables = manualTask.getReadVariables();
 						mapFlowToReadVariables.put(flowElement.getName(), readVariables);
 					}
 					else if(flowElementReference.getRef() instanceof UserTaskFlowElement) 
 					{
 						UserTaskFlowElement userTask = (UserTaskFlowElement) flowElementReference.getRef();
-						List<VariableReference> readVariables = userTask.getInputVariables();
+						List<VariableReference> readVariables = userTask.getReadVariables();
 						mapFlowToReadVariables.put(flowElement.getName(), readVariables);
 					}
 					else if(flowElementReference.getRef() instanceof ScriptTaskFlowElement) 
 					{
 						ScriptTaskFlowElement scriptTask = (ScriptTaskFlowElement) flowElementReference.getRef();
-						List<VariableReference> readVariables = scriptTask.getInputVariables();
+						List<VariableReference> readVariables = scriptTask.getReadVariables();
 						mapFlowToReadVariables.put(flowElement.getName(), readVariables);
 					}
 					else if(flowElementReference.getRef() instanceof DelegateServiceTaskFlowElement) 
 					{
 						DelegateServiceTaskFlowElement delegateTask = (DelegateServiceTaskFlowElement) flowElementReference.getRef();
-						List<VariableReference> readVariables = delegateTask.getInputVariables();
+						List<VariableReference> readVariables = delegateTask.getReadVariables();
 						mapFlowToReadVariables.put(flowElement.getName(), readVariables);
 					}
 					else if(flowElementReference.getRef() instanceof ExternalServiceTaskFlowElement) 
 					{
 						ExternalServiceTaskFlowElement externalTask = (ExternalServiceTaskFlowElement) flowElementReference.getRef();
-						List<VariableReference> readVariables = externalTask.getInputVariables();
+						List<VariableReference> readVariables = externalTask.getReadVariables();
 						mapFlowToReadVariables.put(flowElement.getName(), readVariables);
 					}
 					else if(flowElementReference.getRef() instanceof BusinessRuleTaskFlowElement) 
 					{
 						BusinessRuleTaskFlowElement  businessTask = (BusinessRuleTaskFlowElement) flowElementReference.getRef();
-						List<VariableReference> readVariables = businessTask.getInputVariables();	
+						List<VariableReference> readVariables = businessTask.getReadVariables();	
 						mapFlowToReadVariables.put(flowElement.getName(), readVariables);
 					}
 				}

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

@@ -291,9 +291,9 @@ public class ChangeController {
 						if(oldDSL.getFlowElements(Arrays.asList(tv.getTask())).get(0) instanceof UserTaskFlowElement
 								&& newDSL.getFlowElements(Arrays.asList(tv.getTask())).get(0) instanceof UserTaskFlowElement) {
 							UserTaskFlowElement oldUserTask = (UserTaskFlowElement) oldDSL.getFlowElements(Arrays.asList(tv.getTask())).get(0);
-							oldInputVariables = oldUserTask.getInputVariables();
+							oldInputVariables = oldUserTask.getReadVariables();
 							UserTaskFlowElement newUserTask = (UserTaskFlowElement) newDSL.getFlowElements(Arrays.asList(tv.getTask())).get(0);
-							newInputVariables = newUserTask.getInputVariables();
+							newInputVariables = newUserTask.getReadVariables();
 						}
 						else {
 							if(oldDSL.getFlowElements(Arrays.asList(tv.getTask())).get(0) instanceof StartFlowElement

Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/test/TestController.java

@@ -146,7 +146,7 @@ public class TestController {
 			if(e instanceof UserTaskFlowElement) {
 				UserTaskFlowElement ue = (UserTaskFlowElement) e;
 				int vrIndex = 0;
-				for(VariableReference vr : ue.getInputVariables()) {
+				for(VariableReference vr : ue.getReadVariables()) {
 					VariableValue vv = userInputDtos.get(index).getInputVariables().get(vrIndex);
 					vv.setVariable(vr.getRef().getName());
 					vv.setValue(null);

Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/test/TestService.java

@@ -453,7 +453,7 @@ public class TestService {
 				FlowElement e = serializer.getFlowElements(Arrays.asList(t.getTask())).get(0);
 				if(e instanceof UserTaskFlowElement) {
 					UserTaskFlowElement ue = (UserTaskFlowElement) e;
-					for(VariableReference vr : ue.getInputVariables()) {
+					for(VariableReference vr : ue.getReadVariables()) {
 						for(VariableValue vv : t.getVariableValues()) {
 							if(vv.getVariable().equals(vr.getRef().getName())) {
 								if(vr.getValidationStatus().equals(ValidationState.REQUIRED)) {