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

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

@@ -109,7 +109,7 @@ public class TestService {
 
 	public TestService() {
 	}
-
+	
 	public List<de.fhmuenster.masterthesis.testgeneratorDSL.Loop> initLoops(Project project) {
 		Path testFilePath = ProjectDirectoryUtils.getTestspecificationPath(project.getProjectDirectories());
 		String testpackage = project.getProjectDirectories().getTestPackage();
@@ -803,42 +803,28 @@ public class TestService {
 	
 	private List<Variable> mapExpressionToReadVariable(String expression, List<Variable> variables) {
 		List<Variable> inputVariables = new ArrayList<Variable>();
+		String[] operators = {"==", "<", ">"}; // <,> is the same as >=, <= while using string function contains
+		
 		if(expression != null) {
-			if(expression.contains("==")) {
-				Pattern pattern = Pattern.compile("\\{(.*?)\\=");
-				Matcher matcher = pattern.matcher(expression);
-				if (matcher.find()) {
-				    for(Variable var: variables) {
-					    if(matcher.group(1).equals(var.getName())) {
-					    	inputVariables.add(var);
-					    }
-				    }
-				}
-				pattern = Pattern.compile("\\{(.*?)\\ =");
-				matcher = pattern.matcher(expression);
-				if (matcher.find()) {
-				    for(Variable var: variables) {
-					    if(matcher.group(1).equals(var.getName())) {
-					    	inputVariables.add(var);
-					    }
-				    }
-				}
-			}
-			if(expression.contains("==") == false) {
-				Pattern pattern = Pattern.compile("\\{(.*?)\\}");
-				Matcher matcher = pattern.matcher(expression);
-				if (matcher.find()) {
-				    for(Variable var: variables) {
-					    if(matcher.group(1).equals(var.getName())) {
-					    	inputVariables.add(var);
-					    }
-				    }
+			for(String operator : operators)
+			{
+				if(expression.contains(operator))
+				{
+					Pattern pattern = Pattern.compile("\\{(.*?)\\}");
+					Matcher matcher = pattern.matcher(expression);
+					if (matcher.find()) {
+						for(Variable var: variables) {
+							if(expression.contains(var.getName())) {
+								inputVariables.add(var);
+							}
+						}
+					}					
 				}
-			}
+			}	
 		}
 		return inputVariables;
 	}
-
+	
 	private List<Variable> getReadVariables(String flowElementId, BPMNIOParameters bpmnIOParameters, List<Variable> variables, BPMNFormFields formFields) {
 		List<String> inputVariableNames = new ArrayList<>();
 		inputVariableNames.addAll(bpmnIOParameters.getInputVariables(flowElementId));