From 286bf96c4e3e307a3190302d4061b848eb5df089 Mon Sep 17 00:00:00 2001 From: Henning Schmeink <hs344225@fh-muenster.de> Date: Fri, 12 Nov 2021 17:14:03 +0100 Subject: [PATCH] Priority will update/save if there are changes in the testtemplate --- .../onlineschuhdemo/Testcollection.java | 596 +----------------- .../Testcollection.bpmn-testgen | 24 +- .../service/converters/TestConverter.java | 2 +- .../rest/service/test/TestController.java | 4 - .../rest/service/test/TestService.java | 1 + 5 files changed, 34 insertions(+), 593 deletions(-) diff --git a/OnlineSchuhDemo/src-gen/de/sample/onlineschuhdemo/Testcollection.java b/OnlineSchuhDemo/src-gen/de/sample/onlineschuhdemo/Testcollection.java index 7d1d743..c4f3f5d 100644 --- a/OnlineSchuhDemo/src-gen/de/sample/onlineschuhdemo/Testcollection.java +++ b/OnlineSchuhDemo/src-gen/de/sample/onlineschuhdemo/Testcollection.java @@ -65,339 +65,13 @@ public class Testcollection { @Test @Deployment(resources = {"retoure.bpmn", "\\schuh_vernichtung_spende.dmn"}) - public void normalverpackungAuspacken() { - - ProcessInstance processInstance = runtimeService() // - .startProcessInstanceByKey("Retoure", withVariables(VAR_BESCHAEDIGT, false, VAR_ERSTATTUNG, false, VAR_KUNDENNUMMER, "C-123A456")); // - - assertThat(processInstance) // - .isStarted() // - .hasPassed(Events.RETOURE_START) // - .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT) // - .hasPassed(ManualTasks.WARE_EINSORTIEREN) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT_CLOSE) // - .hasNotPassed(ServiceTasks.KUNDENDATEN_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG) // - .hasNotPassed(UserTasks.MANUELLE_PRUEFUNG) // - .hasNotPassed(ServiceTasks.WARENNUMMER_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasNotPassed(UserTasks.PAKET_PACKEN) // - .hasNotPassed(UserTasks.PAKET_PRUEFEN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasNotPassed(Gateways.GATEWAY_AUSPACKEN) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_NORMAL) // - .hasNotPassed(Gateways.GATEWAY_14EVKAP) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasNotPassed(UserTasks.PAKET_PACKEN) // - .hasNotPassed(UserTasks.PAKET_PRUEFEN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasNotPassed(UserTasks.PAKET_SENDEN) // - .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG_CLOSED) // - .hasNotPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG_CLOSED) // - .hasNotPassed(Events.RETOURE_ENDE) // - .hasNotPassed(ServiceTasks.FINANZDATEN_ERMITTELN) // - .hasNotPassed(ServiceTasks.ERSTATTUNG) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_LUXUS) // - .hasNotPassed(UserTasks.WARENDATEN_ERFASSEN) // - .hasNotPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG) // - .hasNotPassed(UserTasks.WARE_VERNICHTEN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // - .hasNotPassed(UserTasks.WARE_SPENDEN) // - .isNotEnded(); // - - Map<String, Object> variableSnapshot0 = runtimeService() // - .getVariables(processInstance.getId()); // - List<LockedExternalTask> lockedTasks0 = lockTasks("customer"); - complete(getLockedTask(lockedTasks0, ServiceTasks.KUNDENDATEN_ERMITTELN), ExternalServiceMockProvider.customerProvider(variableSnapshot0)); - - assertThat(processInstance) // - .hasPassed(Events.RETOURE_START) // - .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT) // - .hasPassed(ManualTasks.WARE_EINSORTIEREN) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT_CLOSE) // - .hasPassed(ServiceTasks.KUNDENDATEN_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_NEUSENDUNG) // - .hasNotPassed(UserTasks.MANUELLE_PRUEFUNG) // - .hasNotPassed(ServiceTasks.WARENNUMMER_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasNotPassed(UserTasks.PAKET_PACKEN) // - .hasNotPassed(UserTasks.PAKET_PRUEFEN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasNotPassed(Gateways.GATEWAY_AUSPACKEN) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_NORMAL) // - .hasNotPassed(Gateways.GATEWAY_14EVKAP) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasNotPassed(UserTasks.PAKET_PACKEN) // - .hasNotPassed(UserTasks.PAKET_PRUEFEN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasNotPassed(UserTasks.PAKET_SENDEN) // - .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG_CLOSED) // - .hasNotPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG_CLOSED) // - .hasNotPassed(Events.RETOURE_ENDE) // - .hasNotPassed(ServiceTasks.FINANZDATEN_ERMITTELN) // - .hasNotPassed(ServiceTasks.ERSTATTUNG) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_LUXUS) // - .hasNotPassed(UserTasks.WARENDATEN_ERFASSEN) // - .hasNotPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG) // - .hasNotPassed(UserTasks.WARE_VERNICHTEN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // - .hasNotPassed(UserTasks.WARE_SPENDEN) // - .isNotEnded(); // - - complete(task(UserTasks.MANUELLE_PRUEFUNG)); - - assertThat(processInstance) // - .hasPassed(Events.RETOURE_START) // - .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT) // - .hasPassed(ManualTasks.WARE_EINSORTIEREN) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT_CLOSE) // - .hasPassed(ServiceTasks.KUNDENDATEN_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_NEUSENDUNG) // - .hasPassed(UserTasks.MANUELLE_PRUEFUNG) // - .hasPassed(ServiceTasks.WARENNUMMER_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasNotPassed(UserTasks.PAKET_PACKEN) // - .hasNotPassed(UserTasks.PAKET_PRUEFEN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasNotPassed(Gateways.GATEWAY_AUSPACKEN) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_NORMAL) // - .hasNotPassed(Gateways.GATEWAY_14EVKAP) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasNotPassed(UserTasks.PAKET_PACKEN) // - .hasNotPassed(UserTasks.PAKET_PRUEFEN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasNotPassed(UserTasks.PAKET_SENDEN) // - .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG_CLOSED) // - .hasNotPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG_CLOSED) // - .hasNotPassed(Events.RETOURE_ENDE) // - .hasNotPassed(ServiceTasks.FINANZDATEN_ERMITTELN) // - .hasNotPassed(ServiceTasks.ERSTATTUNG) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_LUXUS) // - .hasNotPassed(UserTasks.WARENDATEN_ERFASSEN) // - .hasNotPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG) // - .hasNotPassed(UserTasks.WARE_VERNICHTEN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // - .hasNotPassed(UserTasks.WARE_SPENDEN) // - .isNotEnded(); // - - complete(task(UserTasks.PAKET_PACKEN), withVariables(VAR_PAKETTYP, "Normalverpackung")); - - assertThat(processInstance) // - .hasPassed(Events.RETOURE_START) // - .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT) // - .hasPassed(ManualTasks.WARE_EINSORTIEREN) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT_CLOSE) // - .hasPassed(ServiceTasks.KUNDENDATEN_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_NEUSENDUNG) // - .hasPassed(UserTasks.MANUELLE_PRUEFUNG) // - .hasPassed(ServiceTasks.WARENNUMMER_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasPassed(UserTasks.PAKET_PACKEN) // - .hasNotPassed(UserTasks.PAKET_PRUEFEN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasNotPassed(Gateways.GATEWAY_AUSPACKEN) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_NORMAL) // - .hasNotPassed(Gateways.GATEWAY_14EVKAP) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasPassed(UserTasks.PAKET_PACKEN) // - .hasNotPassed(UserTasks.PAKET_PRUEFEN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasNotPassed(UserTasks.PAKET_SENDEN) // - .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG_CLOSED) // - .hasNotPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG_CLOSED) // - .hasNotPassed(Events.RETOURE_ENDE) // - .hasNotPassed(ServiceTasks.FINANZDATEN_ERMITTELN) // - .hasNotPassed(ServiceTasks.ERSTATTUNG) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_LUXUS) // - .hasNotPassed(UserTasks.WARENDATEN_ERFASSEN) // - .hasNotPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG) // - .hasNotPassed(UserTasks.WARE_VERNICHTEN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // - .hasNotPassed(UserTasks.WARE_SPENDEN) // - .isNotEnded(); // - - complete(task(UserTasks.PAKET_PRUEFEN), withVariables(VAR_PAKET, false)); - - assertThat(processInstance) // - .hasPassed(Events.RETOURE_START) // - .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT) // - .hasPassed(ManualTasks.WARE_EINSORTIEREN) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT_CLOSE) // - .hasPassed(ServiceTasks.KUNDENDATEN_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_NEUSENDUNG) // - .hasPassed(UserTasks.MANUELLE_PRUEFUNG) // - .hasPassed(ServiceTasks.WARENNUMMER_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasPassed(UserTasks.PAKET_PACKEN) // - .hasPassed(UserTasks.PAKET_PRUEFEN) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasPassed(Gateways.GATEWAY_AUSPACKEN) // - .hasPassed(ManualTasks.WARE_AUSPACKEN_NORMAL) // - .hasPassed(Gateways.GATEWAY_14EVKAP) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasPassed(UserTasks.PAKET_PACKEN) // - .hasPassed(UserTasks.PAKET_PRUEFEN) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasNotPassed(UserTasks.PAKET_SENDEN) // - .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG_CLOSED) // - .hasNotPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG_CLOSED) // - .hasNotPassed(Events.RETOURE_ENDE) // - .hasNotPassed(ServiceTasks.FINANZDATEN_ERMITTELN) // - .hasNotPassed(ServiceTasks.ERSTATTUNG) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_LUXUS) // - .hasNotPassed(UserTasks.WARENDATEN_ERFASSEN) // - .hasNotPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG) // - .hasNotPassed(UserTasks.WARE_VERNICHTEN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // - .hasNotPassed(UserTasks.WARE_SPENDEN) // - .isNotEnded(); // - - complete(task(UserTasks.PAKET_PACKEN), withVariables(VAR_PAKETTYP, "Luxusverpackung")); - - assertThat(processInstance) // - .hasPassed(Events.RETOURE_START) // - .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT) // - .hasPassed(ManualTasks.WARE_EINSORTIEREN) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT_CLOSE) // - .hasPassed(ServiceTasks.KUNDENDATEN_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_NEUSENDUNG) // - .hasPassed(UserTasks.MANUELLE_PRUEFUNG) // - .hasPassed(ServiceTasks.WARENNUMMER_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasPassed(UserTasks.PAKET_PACKEN) // - .hasPassed(UserTasks.PAKET_PRUEFEN) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasPassed(Gateways.GATEWAY_AUSPACKEN) // - .hasPassed(ManualTasks.WARE_AUSPACKEN_NORMAL) // - .hasPassed(Gateways.GATEWAY_14EVKAP) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasPassed(UserTasks.PAKET_PACKEN) // - .hasPassed(UserTasks.PAKET_PRUEFEN) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasNotPassed(UserTasks.PAKET_SENDEN) // - .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG_CLOSED) // - .hasNotPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG_CLOSED) // - .hasNotPassed(Events.RETOURE_ENDE) // - .hasNotPassed(ServiceTasks.FINANZDATEN_ERMITTELN) // - .hasNotPassed(ServiceTasks.ERSTATTUNG) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_LUXUS) // - .hasNotPassed(UserTasks.WARENDATEN_ERFASSEN) // - .hasNotPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG) // - .hasNotPassed(UserTasks.WARE_VERNICHTEN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // - .hasNotPassed(UserTasks.WARE_SPENDEN) // - .isNotEnded(); // - - complete(task(UserTasks.PAKET_PRUEFEN), withVariables(VAR_PAKET, true)); - - assertThat(processInstance) // - .hasPassed(Events.RETOURE_START) // - .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT) // - .hasPassed(ManualTasks.WARE_EINSORTIEREN) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT_CLOSE) // - .hasPassed(ServiceTasks.KUNDENDATEN_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_NEUSENDUNG) // - .hasPassed(UserTasks.MANUELLE_PRUEFUNG) // - .hasPassed(ServiceTasks.WARENNUMMER_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasPassed(UserTasks.PAKET_PACKEN) // - .hasPassed(UserTasks.PAKET_PRUEFEN) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasPassed(Gateways.GATEWAY_AUSPACKEN) // - .hasPassed(ManualTasks.WARE_AUSPACKEN_NORMAL) // - .hasPassed(Gateways.GATEWAY_14EVKAP) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasPassed(UserTasks.PAKET_PACKEN) // - .hasPassed(UserTasks.PAKET_PRUEFEN) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasNotPassed(UserTasks.PAKET_SENDEN) // - .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG_CLOSED) // - .hasNotPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG_CLOSED) // - .hasNotPassed(Events.RETOURE_ENDE) // - .hasNotPassed(ServiceTasks.FINANZDATEN_ERMITTELN) // - .hasNotPassed(ServiceTasks.ERSTATTUNG) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_LUXUS) // - .hasNotPassed(UserTasks.WARENDATEN_ERFASSEN) // - .hasNotPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG) // - .hasNotPassed(UserTasks.WARE_VERNICHTEN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // - .hasNotPassed(UserTasks.WARE_SPENDEN) // - .isNotEnded(); // - - complete(task(UserTasks.PAKET_SENDEN)); - - assertThat(processInstance) // - .hasPassed(Events.RETOURE_START) // - .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT) // - .hasPassed(ManualTasks.WARE_EINSORTIEREN) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT_CLOSE) // - .hasPassed(ServiceTasks.KUNDENDATEN_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_NEUSENDUNG) // - .hasPassed(UserTasks.MANUELLE_PRUEFUNG) // - .hasPassed(ServiceTasks.WARENNUMMER_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasPassed(UserTasks.PAKET_PACKEN) // - .hasPassed(UserTasks.PAKET_PRUEFEN) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasPassed(Gateways.GATEWAY_AUSPACKEN) // - .hasPassed(ManualTasks.WARE_AUSPACKEN_NORMAL) // - .hasPassed(Gateways.GATEWAY_14EVKAP) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasPassed(UserTasks.PAKET_PACKEN) // - .hasPassed(UserTasks.PAKET_PRUEFEN) // - .hasPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasPassed(UserTasks.PAKET_SENDEN) // - .hasPassed(Gateways.GATEWAY_NEUSENDUNG_CLOSED) // - .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG_CLOSED) // - .hasPassed(Events.RETOURE_ENDE) // - .hasNotPassed(ServiceTasks.FINANZDATEN_ERMITTELN) // - .hasNotPassed(ServiceTasks.ERSTATTUNG) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_LUXUS) // - .hasNotPassed(UserTasks.WARENDATEN_ERFASSEN) // - .hasNotPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG) // - .hasNotPassed(UserTasks.WARE_VERNICHTEN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // - .hasNotPassed(UserTasks.WARE_SPENDEN) // - .isEnded() // - .variables() // - .contains(entry(VAR_KUNDENNUMMER, "C-123A456"), entry(VAR_VORNAME, "Max"), entry(VAR_ERSTATTUNG, false), entry(VAR_NACHNAME, "Mustermann"), entry(VAR_BESCHAEDIGT, false)); // - - } - - @Test - @Deployment(resources = {"retoure.bpmn", "\\schuh_vernichtung_spende.dmn"}) - public void vernichtenErstattung() { - - ProcessInstance processInstance = runtimeService() // - .startProcessInstanceByKey("Retoure", withVariables(VAR_BESCHAEDIGT, true, VAR_ERSTATTUNG, true, VAR_KUNDENNUMMER, "C-123A456")); // + public void TestHenning() { assertThat(processInstance) // - .isStarted() // - .hasPassed(Events.RETOURE_START) // .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG) // .hasPassed(Gateways.GATEWAY_BESCHAEDIGT) // - .hasNotPassed(UserTasks.WARENDATEN_ERFASSEN) // - .hasNotPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG) // - .hasNotPassed(UserTasks.WARE_VERNICHTEN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // - .hasNotPassed(Gateways.GATEWAY_BESCHAEDIGT_CLOSE) // + .hasPassed(ManualTasks.WARE_EINSORTIEREN) // + .hasPassed(Gateways.GATEWAY_BESCHAEDIGT_CLOSE) // .hasNotPassed(ServiceTasks.KUNDENDATEN_ERMITTELN) // .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG) // .hasNotPassed(ServiceTasks.FINANZDATEN_ERMITTELN) // @@ -405,7 +79,6 @@ public class Testcollection { .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG_CLOSED) // .hasNotPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG_CLOSED) // .hasNotPassed(Events.RETOURE_ENDE) // - .hasNotPassed(ManualTasks.WARE_EINSORTIEREN) // .hasNotPassed(UserTasks.MANUELLE_PRUEFUNG) // .hasNotPassed(ServiceTasks.WARENNUMMER_ERMITTELN) // .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // @@ -417,74 +90,11 @@ public class Testcollection { .hasNotPassed(ManualTasks.WARE_AUSPACKEN_NORMAL) // .hasNotPassed(Gateways.GATEWAY_14EVKAP) // .hasNotPassed(ManualTasks.WARE_AUSPACKEN_LUXUS) // - .hasNotPassed(UserTasks.WARE_SPENDEN) // - .isNotEnded(); // - - complete(task(UserTasks.WARENDATEN_ERFASSEN), withVariables(VAR_MARKE, "Luxury Foot", VAR_PREIS, 350)); - - assertThat(processInstance) // - .hasPassed(Events.RETOURE_START) // - .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT) // - .hasPassed(UserTasks.WARENDATEN_ERFASSEN) // - .hasPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_VERNICHTUNG) // + .hasNotPassed(UserTasks.WARENDATEN_ERFASSEN) // + .hasNotPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // + .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG) // .hasNotPassed(UserTasks.WARE_VERNICHTEN) // .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // - .hasNotPassed(Gateways.GATEWAY_BESCHAEDIGT_CLOSE) // - .hasNotPassed(ServiceTasks.KUNDENDATEN_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG) // - .hasNotPassed(ServiceTasks.FINANZDATEN_ERMITTELN) // - .hasNotPassed(ServiceTasks.ERSTATTUNG) // - .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG_CLOSED) // - .hasNotPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG_CLOSED) // - .hasNotPassed(Events.RETOURE_ENDE) // - .hasNotPassed(ManualTasks.WARE_EINSORTIEREN) // - .hasNotPassed(UserTasks.MANUELLE_PRUEFUNG) // - .hasNotPassed(ServiceTasks.WARENNUMMER_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasNotPassed(UserTasks.PAKET_PACKEN) // - .hasNotPassed(UserTasks.PAKET_PRUEFEN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasNotPassed(UserTasks.PAKET_SENDEN) // - .hasNotPassed(Gateways.GATEWAY_AUSPACKEN) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_NORMAL) // - .hasNotPassed(Gateways.GATEWAY_14EVKAP) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_LUXUS) // - .hasNotPassed(UserTasks.WARE_SPENDEN) // - .isNotEnded(); // - - complete(task(UserTasks.WARE_VERNICHTEN)); - - assertThat(processInstance) // - .hasPassed(Events.RETOURE_START) // - .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT) // - .hasPassed(UserTasks.WARENDATEN_ERFASSEN) // - .hasPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_VERNICHTUNG) // - .hasPassed(UserTasks.WARE_VERNICHTEN) // - .hasPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT_CLOSE) // - .hasNotPassed(ServiceTasks.KUNDENDATEN_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG) // - .hasNotPassed(ServiceTasks.FINANZDATEN_ERMITTELN) // - .hasNotPassed(ServiceTasks.ERSTATTUNG) // - .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG_CLOSED) // - .hasNotPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG_CLOSED) // - .hasNotPassed(Events.RETOURE_ENDE) // - .hasNotPassed(ManualTasks.WARE_EINSORTIEREN) // - .hasNotPassed(UserTasks.MANUELLE_PRUEFUNG) // - .hasNotPassed(ServiceTasks.WARENNUMMER_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasNotPassed(UserTasks.PAKET_PACKEN) // - .hasNotPassed(UserTasks.PAKET_PRUEFEN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasNotPassed(UserTasks.PAKET_SENDEN) // - .hasNotPassed(Gateways.GATEWAY_AUSPACKEN) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_NORMAL) // - .hasNotPassed(Gateways.GATEWAY_14EVKAP) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_LUXUS) // .hasNotPassed(UserTasks.WARE_SPENDEN) // .isNotEnded(); // @@ -494,14 +104,9 @@ public class Testcollection { complete(getLockedTask(lockedTasks0, ServiceTasks.KUNDENDATEN_ERMITTELN), ExternalServiceMockProvider.customerProvider(variableSnapshot0)); assertThat(processInstance) // - .hasPassed(Events.RETOURE_START) // .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG) // .hasPassed(Gateways.GATEWAY_BESCHAEDIGT) // - .hasPassed(UserTasks.WARENDATEN_ERFASSEN) // - .hasPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_VERNICHTUNG) // - .hasPassed(UserTasks.WARE_VERNICHTEN) // - .hasPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // + .hasPassed(ManualTasks.WARE_EINSORTIEREN) // .hasPassed(Gateways.GATEWAY_BESCHAEDIGT_CLOSE) // .hasPassed(ServiceTasks.KUNDENDATEN_ERMITTELN) // .hasPassed(Gateways.GATEWAY_NEUSENDUNG) // @@ -510,7 +115,6 @@ public class Testcollection { .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG_CLOSED) // .hasNotPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG_CLOSED) // .hasNotPassed(Events.RETOURE_ENDE) // - .hasNotPassed(ManualTasks.WARE_EINSORTIEREN) // .hasNotPassed(UserTasks.MANUELLE_PRUEFUNG) // .hasNotPassed(ServiceTasks.WARENNUMMER_ERMITTELN) // .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // @@ -522,6 +126,11 @@ public class Testcollection { .hasNotPassed(ManualTasks.WARE_AUSPACKEN_NORMAL) // .hasNotPassed(Gateways.GATEWAY_14EVKAP) // .hasNotPassed(ManualTasks.WARE_AUSPACKEN_LUXUS) // + .hasNotPassed(UserTasks.WARENDATEN_ERFASSEN) // + .hasNotPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // + .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG) // + .hasNotPassed(UserTasks.WARE_VERNICHTEN) // + .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // .hasNotPassed(UserTasks.WARE_SPENDEN) // .isNotEnded(); // @@ -532,14 +141,9 @@ public class Testcollection { complete(getLockedTask(lockedTasks1, ServiceTasks.FINANZDATEN_ERMITTELN), ExternalServiceMockProvider.financialMock(variableSnapshot1)); assertThat(processInstance) // - .hasPassed(Events.RETOURE_START) // .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG) // .hasPassed(Gateways.GATEWAY_BESCHAEDIGT) // - .hasPassed(UserTasks.WARENDATEN_ERFASSEN) // - .hasPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_VERNICHTUNG) // - .hasPassed(UserTasks.WARE_VERNICHTEN) // - .hasPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // + .hasPassed(ManualTasks.WARE_EINSORTIEREN) // .hasPassed(Gateways.GATEWAY_BESCHAEDIGT_CLOSE) // .hasPassed(ServiceTasks.KUNDENDATEN_ERMITTELN) // .hasPassed(Gateways.GATEWAY_NEUSENDUNG) // @@ -548,7 +152,6 @@ public class Testcollection { .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG_CLOSED) // .hasNotPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG_CLOSED) // .hasNotPassed(Events.RETOURE_ENDE) // - .hasNotPassed(ManualTasks.WARE_EINSORTIEREN) // .hasNotPassed(UserTasks.MANUELLE_PRUEFUNG) // .hasNotPassed(ServiceTasks.WARENNUMMER_ERMITTELN) // .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // @@ -560,6 +163,11 @@ public class Testcollection { .hasNotPassed(ManualTasks.WARE_AUSPACKEN_NORMAL) // .hasNotPassed(Gateways.GATEWAY_14EVKAP) // .hasNotPassed(ManualTasks.WARE_AUSPACKEN_LUXUS) // + .hasNotPassed(UserTasks.WARENDATEN_ERFASSEN) // + .hasNotPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // + .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG) // + .hasNotPassed(UserTasks.WARE_VERNICHTEN) // + .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // .hasNotPassed(UserTasks.WARE_SPENDEN) // .isNotEnded(); // @@ -570,14 +178,9 @@ public class Testcollection { complete(getLockedTask(lockedTasks2, ServiceTasks.ERSTATTUNG), ExternalServiceMockProvider.financialMock(variableSnapshot2)); assertThat(processInstance) // - .hasPassed(Events.RETOURE_START) // .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG) // .hasPassed(Gateways.GATEWAY_BESCHAEDIGT) // - .hasPassed(UserTasks.WARENDATEN_ERFASSEN) // - .hasPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_VERNICHTUNG) // - .hasPassed(UserTasks.WARE_VERNICHTEN) // - .hasPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // + .hasPassed(ManualTasks.WARE_EINSORTIEREN) // .hasPassed(Gateways.GATEWAY_BESCHAEDIGT_CLOSE) // .hasPassed(ServiceTasks.KUNDENDATEN_ERMITTELN) // .hasPassed(Gateways.GATEWAY_NEUSENDUNG) // @@ -586,7 +189,6 @@ public class Testcollection { .hasPassed(Gateways.GATEWAY_NEUSENDUNG_CLOSED) // .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG_CLOSED) // .hasPassed(Events.RETOURE_ENDE) // - .hasNotPassed(ManualTasks.WARE_EINSORTIEREN) // .hasNotPassed(UserTasks.MANUELLE_PRUEFUNG) // .hasNotPassed(ServiceTasks.WARENNUMMER_ERMITTELN) // .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // @@ -598,19 +200,24 @@ public class Testcollection { .hasNotPassed(ManualTasks.WARE_AUSPACKEN_NORMAL) // .hasNotPassed(Gateways.GATEWAY_14EVKAP) // .hasNotPassed(ManualTasks.WARE_AUSPACKEN_LUXUS) // + .hasNotPassed(UserTasks.WARENDATEN_ERFASSEN) // + .hasNotPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // + .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG) // + .hasNotPassed(UserTasks.WARE_VERNICHTEN) // + .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // .hasNotPassed(UserTasks.WARE_SPENDEN) // .isEnded() // .variables() // - .contains(entry(VAR_KUNDENNUMMER, "C-123A456"), entry(VAR_EMAILGESENDET, "Nein"), entry(VAR_MARKE, "Luxury Foot"), entry(VAR_IBAN, "DE12345678900000123456"), entry(VAR_VORNAME, "Max"), entry(VAR_ERSTATTUNG, true), entry(VAR_NACHNAME, "Mustermann"), entry(VAR_BESCHAEDIGT, true)); // + .contains(entry(VAR_KUNDENNUMMER, "123123123312")); // } @Test @Deployment(resources = {"retoure.bpmn", "\\schuh_vernichtung_spende.dmn"}) - public void TestHenninh() { + public void Test2() { ProcessInstance processInstance = runtimeService() // - .startProcessInstanceByKey("Retoure"); // + .startProcessInstanceByKey("Retoure", withVariables(VAR_KUNDENNUMMER, "123132")); // assertThat(processInstance) // .isStarted() // @@ -819,153 +426,4 @@ public class Testcollection { .isEnded(); // } - - @Test - @Deployment(resources = {"retoure.bpmn", "\\schuh_vernichtung_spende.dmn"}) - public void TestHenning() { - - assertThat(processInstance) // - .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT) // - .hasPassed(ManualTasks.WARE_EINSORTIEREN) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT_CLOSE) // - .hasNotPassed(ServiceTasks.KUNDENDATEN_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG) // - .hasNotPassed(ServiceTasks.FINANZDATEN_ERMITTELN) // - .hasNotPassed(ServiceTasks.ERSTATTUNG) // - .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG_CLOSED) // - .hasNotPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG_CLOSED) // - .hasNotPassed(Events.RETOURE_ENDE) // - .hasNotPassed(UserTasks.MANUELLE_PRUEFUNG) // - .hasNotPassed(ServiceTasks.WARENNUMMER_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasNotPassed(UserTasks.PAKET_PACKEN) // - .hasNotPassed(UserTasks.PAKET_PRUEFEN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasNotPassed(UserTasks.PAKET_SENDEN) // - .hasNotPassed(Gateways.GATEWAY_AUSPACKEN) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_NORMAL) // - .hasNotPassed(Gateways.GATEWAY_14EVKAP) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_LUXUS) // - .hasNotPassed(UserTasks.WARENDATEN_ERFASSEN) // - .hasNotPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG) // - .hasNotPassed(UserTasks.WARE_VERNICHTEN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // - .hasNotPassed(UserTasks.WARE_SPENDEN) // - .isNotEnded(); // - - Map<String, Object> variableSnapshot0 = runtimeService() // - .getVariables(processInstance.getId()); // - List<LockedExternalTask> lockedTasks0 = lockTasks("customer"); - complete(getLockedTask(lockedTasks0, ServiceTasks.KUNDENDATEN_ERMITTELN), ExternalServiceMockProvider.customerProvider(variableSnapshot0)); - - assertThat(processInstance) // - .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT) // - .hasPassed(ManualTasks.WARE_EINSORTIEREN) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT_CLOSE) // - .hasPassed(ServiceTasks.KUNDENDATEN_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_NEUSENDUNG) // - .hasNotPassed(ServiceTasks.FINANZDATEN_ERMITTELN) // - .hasNotPassed(ServiceTasks.ERSTATTUNG) // - .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG_CLOSED) // - .hasNotPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG_CLOSED) // - .hasNotPassed(Events.RETOURE_ENDE) // - .hasNotPassed(UserTasks.MANUELLE_PRUEFUNG) // - .hasNotPassed(ServiceTasks.WARENNUMMER_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasNotPassed(UserTasks.PAKET_PACKEN) // - .hasNotPassed(UserTasks.PAKET_PRUEFEN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasNotPassed(UserTasks.PAKET_SENDEN) // - .hasNotPassed(Gateways.GATEWAY_AUSPACKEN) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_NORMAL) // - .hasNotPassed(Gateways.GATEWAY_14EVKAP) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_LUXUS) // - .hasNotPassed(UserTasks.WARENDATEN_ERFASSEN) // - .hasNotPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG) // - .hasNotPassed(UserTasks.WARE_VERNICHTEN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // - .hasNotPassed(UserTasks.WARE_SPENDEN) // - .isNotEnded(); // - - Map<String, Object> variableSnapshot1 = runtimeService() // - .getVariables(processInstance.getId()); // - variableSnapshot1.put(VAR_SERVICEIDENTIFIER, "getData"); - List<LockedExternalTask> lockedTasks1 = lockTasks(lockedTasks0, "financial"); - complete(getLockedTask(lockedTasks1, ServiceTasks.FINANZDATEN_ERMITTELN), ExternalServiceMockProvider.financialMock(variableSnapshot1)); - - assertThat(processInstance) // - .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT) // - .hasPassed(ManualTasks.WARE_EINSORTIEREN) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT_CLOSE) // - .hasPassed(ServiceTasks.KUNDENDATEN_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_NEUSENDUNG) // - .hasPassed(ServiceTasks.FINANZDATEN_ERMITTELN) // - .hasNotPassed(ServiceTasks.ERSTATTUNG) // - .hasNotPassed(Gateways.GATEWAY_NEUSENDUNG_CLOSED) // - .hasNotPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG_CLOSED) // - .hasNotPassed(Events.RETOURE_ENDE) // - .hasNotPassed(UserTasks.MANUELLE_PRUEFUNG) // - .hasNotPassed(ServiceTasks.WARENNUMMER_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasNotPassed(UserTasks.PAKET_PACKEN) // - .hasNotPassed(UserTasks.PAKET_PRUEFEN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasNotPassed(UserTasks.PAKET_SENDEN) // - .hasNotPassed(Gateways.GATEWAY_AUSPACKEN) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_NORMAL) // - .hasNotPassed(Gateways.GATEWAY_14EVKAP) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_LUXUS) // - .hasNotPassed(UserTasks.WARENDATEN_ERFASSEN) // - .hasNotPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG) // - .hasNotPassed(UserTasks.WARE_VERNICHTEN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // - .hasNotPassed(UserTasks.WARE_SPENDEN) // - .isNotEnded(); // - - Map<String, Object> variableSnapshot2 = runtimeService() // - .getVariables(processInstance.getId()); // - variableSnapshot2.put(VAR_SERVICEIDENTIFIER, "refund"); - List<LockedExternalTask> lockedTasks2 = lockTasks(lockedTasks1, "financial"); - complete(getLockedTask(lockedTasks2, ServiceTasks.ERSTATTUNG), ExternalServiceMockProvider.financialMock(variableSnapshot2)); - - assertThat(processInstance) // - .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT) // - .hasPassed(ManualTasks.WARE_EINSORTIEREN) // - .hasPassed(Gateways.GATEWAY_BESCHAEDIGT_CLOSE) // - .hasPassed(ServiceTasks.KUNDENDATEN_ERMITTELN) // - .hasPassed(Gateways.GATEWAY_NEUSENDUNG) // - .hasPassed(ServiceTasks.FINANZDATEN_ERMITTELN) // - .hasPassed(ServiceTasks.ERSTATTUNG) // - .hasPassed(Gateways.GATEWAY_NEUSENDUNG_CLOSED) // - .hasPassed(Gateways.GATEWAY_PARALLEL_LAGER_NEUSENDUNG_CLOSED) // - .hasPassed(Events.RETOURE_ENDE) // - .hasNotPassed(UserTasks.MANUELLE_PRUEFUNG) // - .hasNotPassed(ServiceTasks.WARENNUMMER_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT_CLOSED) // - .hasNotPassed(UserTasks.PAKET_PACKEN) // - .hasNotPassed(UserTasks.PAKET_PRUEFEN) // - .hasNotPassed(Gateways.GATEWAY_EINPACKUNG_FEHLERHAFT) // - .hasNotPassed(UserTasks.PAKET_SENDEN) // - .hasNotPassed(Gateways.GATEWAY_AUSPACKEN) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_NORMAL) // - .hasNotPassed(Gateways.GATEWAY_14EVKAP) // - .hasNotPassed(ManualTasks.WARE_AUSPACKEN_LUXUS) // - .hasNotPassed(UserTasks.WARENDATEN_ERFASSEN) // - .hasNotPassed(BusinessRuleTasks.VERNICHTUNG_ERMITTELN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG) // - .hasNotPassed(UserTasks.WARE_VERNICHTEN) // - .hasNotPassed(Gateways.GATEWAY_VERNICHTUNG_CLOSE) // - .hasNotPassed(UserTasks.WARE_SPENDEN) // - .isEnded() // - .variables() // - .contains(entry(VAR_KUNDENNUMMER, "123123123312")); // - - } } diff --git a/OnlineSchuhDemo/src/test/java/de/sample/onlineschuhdemo/Testcollection.bpmn-testgen b/OnlineSchuhDemo/src/test/java/de/sample/onlineschuhdemo/Testcollection.bpmn-testgen index 799943e..73d0604 100644 --- a/OnlineSchuhDemo/src/test/java/de/sample/onlineschuhdemo/Testcollection.bpmn-testgen +++ b/OnlineSchuhDemo/src/test/java/de/sample/onlineschuhdemo/Testcollection.bpmn-testgen @@ -140,24 +140,10 @@ with rule : if [ serviceIdentifier == "getData" , kundennummer == "C-987A654" ] with rule : if [ serviceIdentifier == "refund" , iban == "DE12345678900000123456" ] set [ confirmationEmailSent = "Nein" ] , with rule : if [ serviceIdentifier == "refund" ] set [ confirmationEmailSent = "Ja" ] ; -Test normalverpackungAuspacken for Flow_2 -with variables for Retoure_Start : [ kundennummer = "C-123A456" , erstattung = false , beschaedigt = false ] , -with variables for Paket_packen : [ pakettyp = "Normalverpackung" ] , -with variables for Paket_pruefen : [ paket = false ] , -with variables for Paket_packen : [ pakettyp = "Luxusverpackung" ] , -with variables for Paket_pruefen : [ paket = true ] -with check : [ kundennummer == "C-123A456" , vorname == "Max" , nachname == "Mustermann" , erstattung == false , beschaedigt == false ] -with mocks : [ Warennummer_ermitteln , customerProvider ] ; - -Test vernichtenErstattung for Flow_4 -with variables for Retoure_Start : [ kundennummer = "C-123A456" , erstattung = true , beschaedigt = true ] , -with variables for Warendaten_erfassen : [ marke = "Luxury Foot" , preis = 350 ] -with check : [ kundennummer == "C-123A456" , marke == "Luxury Foot" , iban == "DE12345678900000123456" , vorname == "Max" , nachname == "Mustermann" , emailGesendet == "Nein" , erstattung == true , beschaedigt == true ] -with mocks : [ financialMock , customerProvider ] ; - -Test TestHenninh for Flow_1 -with mocks : [ Warennummer_ermitteln , customerProvider ] ; - Test TestHenning for Flow_0 -with priority 100 +with priority 104 with check : [ kundennummer == "123123123312" ] with mocks : [ financialMock , customerProvider ] ; + +Test Test2 for Flow_1 +with priority 2 +with variables for Retoure_Start : [ kundennummer = "123132" ] with mocks : [ Warennummer_ermitteln , customerProvider ] ; diff --git a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/converters/TestConverter.java b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/converters/TestConverter.java index eae6d7f..54436ae 100644 --- a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/converters/TestConverter.java +++ b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/converters/TestConverter.java @@ -66,7 +66,7 @@ public class TestConverter { EndChecks endCheckDeclaration = TestgeneratorDSLObjectCreator.createEndChecks(endChecks); // @Tim, @Henning Priorität hier hinzufügen - int prio = 100; + int prio = testcase.getPriority(); return TestgeneratorDSLObjectCreator.createTest(testcase.getName(), flow, variableDeclarationsList, endCheckDeclaration, mocks, prio); } diff --git a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/test/TestController.java b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/test/TestController.java index a40128a..744767d 100644 --- a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/test/TestController.java +++ b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/test/TestController.java @@ -101,11 +101,7 @@ public class TestController { public BPMNTestcaseDTO getTest(@PathVariable(required = true) Long projectId, @PathVariable(required = true) String testId) { Project projectForId = projectService.getProjectForId(projectId); - BPMNTestcase test = testService.getTest(projectForId.getProjectDirectories(), testId); - - // @Tim, @Henning Debug - System.out.println("Priority: " + test.getPriority()); return MAPPER.map(test, BPMNTestcaseDTO.class); } diff --git a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/test/TestService.java b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/test/TestService.java index c6d365b..f0c3b80 100644 --- a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/test/TestService.java +++ b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/test/TestService.java @@ -251,6 +251,7 @@ public class TestService { List<Mock> mocks = mockService.getMocks(testcase.getMocks(), projectDirectories); Test newTest = TestConverter.getTest(testcase, flow, flowElements, variables, mocks); + serializer.addTest(newTest); } -- GitLab