merge from Friday

OnlineSchuhDemo/src-gen/de/sample/onlineschuhdemo/BusinessRuleTasks.java

@@ -2,6 +2,5 @@ package de.sample.onlineschuhdemo;
 
 public class BusinessRuleTasks {
 
-	public static final String VERNICHTUNG_ERMITTELN = "Vernichtung_ermitteln";
 
 }

OnlineSchuhDemo/src-gen/de/sample/onlineschuhdemo/Events.java

@@ -2,7 +2,5 @@ package de.sample.onlineschuhdemo;
 
 public class Events {
 
-	public static final String RETOURE_START = "Retoure_Start";
-	public static final String RETOURE_ENDE = "Retoure_Ende";
 
 }

OnlineSchuhDemo/src-gen/de/sample/onlineschuhdemo/ExternalServiceMockProvider.java

@@ -5,47 +5,5 @@ import java.util.Map;
 
 public class ExternalServiceMockProvider {
 
-	private static final String VAR_KUNDENNUMMER = "kundennummer";
-	private static final String VAR_FIRSTNAME = "firstname";
-	private static final String VAR_LASTNAME = "lastname";
-	private static final String VAR_SERVICEIDENTIFIER = "serviceIdentifier";
-	private static final String VAR_IBAN = "iban";
-	private static final String VAR_IBANREFUND = "ibanRefund";
-	private static final String VAR_CONFIRMATIONEMAILSENT = "confirmationEmailSent";
 
-	public static final Map<String, Object> customerProvider(Map<String, Object> input) {
-		Map<String, Object> output = new HashMap<String, Object>();
-
-		String kundennummer = (String) input.get(VAR_KUNDENNUMMER);
-
-		if("C-123A456".equals(kundennummer)) {
-			output.put(VAR_FIRSTNAME, "Max");
-			output.put(VAR_LASTNAME, "Mustermann");
-		} else if("C-987A654".equals(kundennummer)) {
-			output.put(VAR_FIRSTNAME, "Erika");
-			output.put(VAR_LASTNAME, "Mustermann");
-		}
-
-		return output;
-	}
-
-	public static final Map<String, Object> financialMock(Map<String, Object> input) {
-		Map<String, Object> output = new HashMap<String, Object>();
-
-		String serviceIdentifier = (String) input.get(VAR_SERVICEIDENTIFIER);
-		String kundennummer = (String) input.get(VAR_KUNDENNUMMER);
-		String iban = (String) input.get(VAR_IBAN);
-
-		if("getData".equals(serviceIdentifier) && "C-123A456".equals(kundennummer)) {
-			output.put(VAR_IBANREFUND, "DE12345678900000123456");
-		} else if("getData".equals(serviceIdentifier) && "C-987A654".equals(kundennummer)) {
-			output.put(VAR_IBANREFUND, "DE12345678900000987654");
-		} else if("refund".equals(serviceIdentifier) && "DE12345678900000123456".equals(iban)) {
-			output.put(VAR_CONFIRMATIONEMAILSENT, "Nein");
-		} else if("refund".equals(serviceIdentifier)) {
-			output.put(VAR_CONFIRMATIONEMAILSENT, "Ja");
-		}
-
-		return output;
-	}
 }

OnlineSchuhDemo/src-gen/de/sample/onlineschuhdemo/Gateways.java

@@ -2,17 +2,5 @@ package de.sample.onlineschuhdemo;
 
 public class Gateways {
 
-	public static final String GATEWAY_PARALLEL_LAGER_NEUSENDUNG = "Gateway_Parallel_Lager_Neusendung";
-	public static final String GATEWAY_BESCHAEDIGT = "Gateway_Beschaedigt";
-	public static final String GATEWAY_BESCHAEDIGT_CLOSE = "Gateway_Beschaedigt_Close";
-	public static final String GATEWAY_NEUSENDUNG = "Gateway_Neusendung";
-	public static final String GATEWAY_NEUSENDUNG_CLOSED = "Gateway_Neusendung_Closed";
-	public static final String GATEWAY_PARALLEL_LAGER_NEUSENDUNG_CLOSED = "Gateway_Parallel_Lager_Neusendung_Closed";
-	public static final String GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED = "Gateway_Einpackung_Fehlerhaft_Closed";
-	public static final String GATEWAY_EINPACKUNG_FEHLERHAFT = "Gateway_Einpackung_Fehlerhaft";
-	public static final String GATEWAY_AUSPACKEN = "Gateway_Auspacken";
-	public static final String GATEWAY_14EVKAP = "Gateway_14evkap";
-	public static final String GATEWAY_VERNICHTUNG = "Gateway_Vernichtung";
-	public static final String GATEWAY_VERNICHTUNG_CLOSE = "Gateway_Vernichtung_Close";
 
 }

OnlineSchuhDemo/src-gen/de/sample/onlineschuhdemo/ManualTasks.java

@@ -2,8 +2,5 @@ package de.sample.onlineschuhdemo;
 
 public class ManualTasks {
 
-	public static final String WARE_EINSORTIEREN = "Ware_einsortieren";
-	public static final String WARE_AUSPACKEN_NORMAL = "Ware_auspacken_normal";
-	public static final String WARE_AUSPACKEN_LUXUS = "Ware_auspacken_luxus";
 
 }

OnlineSchuhDemo/src-gen/de/sample/onlineschuhdemo/ServiceTasks.java

@@ -2,9 +2,5 @@ package de.sample.onlineschuhdemo;
 
 public class ServiceTasks {
 
-	public static final String WARENNUMMER_ERMITTELN = "Warennummer_ermitteln";
-	public static final String KUNDENDATEN_ERMITTELN = "Kundendaten_ermitteln";
-	public static final String FINANZDATEN_ERMITTELN = "Finanzdaten_ermitteln";
-	public static final String ERSTATTUNG = "Erstattung";
 
 }

OnlineSchuhDemo/src-gen/de/sample/onlineschuhdemo/UserTasks.java

@@ -2,12 +2,5 @@ package de.sample.onlineschuhdemo;
 
 public class UserTasks {
 
-	public static final String MANUELLE_PRUEFUNG = "Manuelle_Pruefung";
-	public static final String PAKET_PACKEN = "Paket_packen";
-	public static final String PAKET_PRUEFEN = "Paket_pruefen";
-	public static final String PAKET_SENDEN = "Paket_senden";
-	public static final String WARENDATEN_ERFASSEN = "Warendaten_erfassen";
-	public static final String WARE_VERNICHTEN = "Ware_vernichten";
-	public static final String WARE_SPENDEN = "Ware_spenden";
 
 }

OnlineSchuhDemo/testgen.json

 {
   "projectDirectories": {
     "testPackage": "de.sample.onlineschuhdemo",
-    "testPath": "\\src\\test\\java\\de\\sample\\onlineschuhdemo\\",
+    "testPath": "\\src\\test\\java\\de\\sample\\onlineschuhdemo",
     "modelPath": "\\src\\main\\resources",
-    "embeddedFilePath": "\\src\\main\\webapp",
-    "projectRootPath": "D:\\VSProjects\\fe-pda-testing-tool\\OnlineSchuhDemo"
+    "embeddedFilePath": "\\src\\main\\webapp"
   },
   "bpmnFiles": [
     {

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

@@ -373,8 +373,8 @@ public class TestService {
 			return TestgeneratorDSLObjectCreator.createScriptTaskFlowElement(flowElement.getId());
 		} else if (flowElement instanceof BusinessRuleTask) {
 			String resultVariable = BPMNParseUtils.getResultVariable((BusinessRuleTask) flowElement);
-			
-			return TestgeneratorDSLObjectCreator.createBusinessRuleTaskFlowElement(flowElement.getId(), resultVariable);
+			return TestgeneratorDSLObjectCreator.createBusinessRuleTaskFlowElement(flowElement.getId(), resultVariable, flowElement.getName());
+		
 		} else if (flowElement instanceof ServiceTask) {
 			String delegate = getDelegate((ServiceTask) flowElement);
 			String externalTopicTextual = getExternalTopic((ServiceTask) flowElement);

Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/utils/BPMNParseUtils.java

@@ -228,6 +228,10 @@ public class BPMNParseUtils {
 		String resultVariable = businessRuleTask.getAttributeValueNs(NAMESPACE_URI_BPMN, "resultVariable");
 		return resultVariable;
 	}
+//	public static String getLabel(BusinessRuleTask businessRuleTask) {
+//		String label = businessRuleTask.getAttributeValueNs(NAMESPACE_URI_BPMN, "name");
+//		return label;
+//	}
 	
 	public static List<VariableDeclaration> getHardcodedVariables(String flowElementId, List<Variable> variables,
 			BPMNIOParameters bpmnIOParameters) {