Skip to content
Snippets Groups Projects
Commit 6e33e266 authored by Florian Lambers's avatar Florian Lambers
Browse files

added flow flag

parent 1bd73542
No related branches found
No related tags found
No related merge requests found
Showing
with 1190 additions and 2 deletions
...@@ -2,5 +2,6 @@ package de.sample.onlineschuhdemo; ...@@ -2,5 +2,6 @@ package de.sample.onlineschuhdemo;
public class BusinessRuleTasks { public class BusinessRuleTasks {
public static final String VERNICHTUNG_ERMITTELN = "Vernichtung_ermitteln";
} }
...@@ -2,5 +2,7 @@ package de.sample.onlineschuhdemo; ...@@ -2,5 +2,7 @@ package de.sample.onlineschuhdemo;
public class Events { public class Events {
public static final String RETOURE_START = "Retoure_Start";
public static final String RETOURE_ENDE = "Retoure_Ende";
} }
...@@ -5,5 +5,47 @@ import java.util.Map; ...@@ -5,5 +5,47 @@ import java.util.Map;
public class ExternalServiceMockProvider { 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;
}
} }
...@@ -2,5 +2,17 @@ package de.sample.onlineschuhdemo; ...@@ -2,5 +2,17 @@ package de.sample.onlineschuhdemo;
public class Gateways { 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";
} }
...@@ -2,5 +2,8 @@ package de.sample.onlineschuhdemo; ...@@ -2,5 +2,8 @@ package de.sample.onlineschuhdemo;
public class ManualTasks { 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";
} }
...@@ -2,5 +2,9 @@ package de.sample.onlineschuhdemo; ...@@ -2,5 +2,9 @@ package de.sample.onlineschuhdemo;
public class ServiceTasks { 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";
} }
...@@ -2,5 +2,12 @@ package de.sample.onlineschuhdemo; ...@@ -2,5 +2,12 @@ package de.sample.onlineschuhdemo;
public class UserTasks { 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";
} }
package de.fhmuenster.masterthesis.Testgenerator.migration; package de.fhmuenster.masterthesis.Testgenerator.migration;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
...@@ -27,6 +28,7 @@ import de.fhmuenster.masterthesis.testgeneratorDSL.UserTaskFlowElement; ...@@ -27,6 +28,7 @@ import de.fhmuenster.masterthesis.testgeneratorDSL.UserTaskFlowElement;
import de.fhmuenster.masterthesis.testgeneratorDSL.SequenceFlowElement; import de.fhmuenster.masterthesis.testgeneratorDSL.SequenceFlowElement;
import de.fhmuenster.masterthesis.testgeneratorDSL.ServiceTaskFlowElement; import de.fhmuenster.masterthesis.testgeneratorDSL.ServiceTaskFlowElement;
import de.fhmuenster.masterthesis.testgeneratorDSL.BusinessRuleTaskFlowElement; import de.fhmuenster.masterthesis.testgeneratorDSL.BusinessRuleTaskFlowElement;
import de.fhmuenster.masterthesis.testgeneratorDSL.Flag;
import de.fhmuenster.masterthesis.utils.TestgeneratorDSLUtils; import de.fhmuenster.masterthesis.utils.TestgeneratorDSLUtils;
import org.camunda.bpm.model.bpmn.instance.SequenceFlow; import org.camunda.bpm.model.bpmn.instance.SequenceFlow;
import org.camunda.bpm.model.bpmn.instance.ServiceTask; import org.camunda.bpm.model.bpmn.instance.ServiceTask;
...@@ -62,6 +64,26 @@ public class MigrationService { ...@@ -62,6 +64,26 @@ public class MigrationService {
for(FlowChangeWrapper fcw : activityAddActionResults) { for(FlowChangeWrapper fcw : activityAddActionResults) {
System.out.println("+++ Neu: " + fcw.getFlowElement().getName() + " [" + fcw.getActionType() + "] in Flow " + fcw.getFlow().getName() System.out.println("+++ Neu: " + fcw.getFlowElement().getName() + " [" + fcw.getActionType() + "] in Flow " + fcw.getFlow().getName()
+ " mit Status: " + fcw.getMigrationResult().getPriority()); + " mit Status: " + fcw.getMigrationResult().getPriority());
try {
newDSL.getFlow(fcw.getFlow().getName()).setFlag(Flag.YELLOW);
/*
List<FlowElementReference> fers = newDSL.getFlow(fcw.getFlow().getName()).getInclElements();
for(FlowElementReference fer : fers) {
fer.setFlag(Flag.GREEN);
System.out.println(fer.getRef().getName());
}
//newDSL.getFlow(fcw.getFlow().getName()).getInclElements().clear();
//newDSL.getFlow(fcw.getFlow().getName()).getInclElements().replaceAll(fers);
*/
newDSL.serialize();
} catch (IOException e) {
//
}
} }
return migrationResultWrapper; return migrationResultWrapper;
......
...@@ -16,8 +16,8 @@ import { DeleteProjectComponent } from './components/delete-project/delete-proje ...@@ -16,8 +16,8 @@ import { DeleteProjectComponent } from './components/delete-project/delete-proje
import { LoopsComponent } from './components/loops/loops.component'; import { LoopsComponent } from './components/loops/loops.component';
import { LoopComponent } from './components/loop/loop.component'; import { LoopComponent } from './components/loop/loop.component';
import { UpdateProjectComponent } from './components/update-project/update-project.component'; import { UpdateProjectComponent } from './components/update-project/update-project.component';
import { MigrationOverviewComponent } from './migration-overview/migration-overview.component';
import { PrioritizationOverviewComponent } from './prioritization-overview/prioritization-overview.component'; import { PrioritizationOverviewComponent } from './prioritization-overview/prioritization-overview.component';
import { MigrationOverviewComponent } from './components/migration-overview/migration-overview.component';
const routes: Routes = [ const routes: Routes = [
......
...@@ -30,8 +30,8 @@ import { DeleteProjectComponent } from './components/delete-project/delete-proje ...@@ -30,8 +30,8 @@ import { DeleteProjectComponent } from './components/delete-project/delete-proje
import { LoopsComponent } from './components/loops/loops.component'; import { LoopsComponent } from './components/loops/loops.component';
import { LoopComponent } from './components/loop/loop.component'; import { LoopComponent } from './components/loop/loop.component';
import { UpdateProjectComponent } from './components/update-project/update-project.component'; import { UpdateProjectComponent } from './components/update-project/update-project.component';
import { MigrationOverviewComponent } from './migration-overview/migration-overview.component';
import { PrioritizationOverviewComponent } from './prioritization-overview/prioritization-overview.component'; import { PrioritizationOverviewComponent } from './prioritization-overview/prioritization-overview.component';
import { MigrationOverviewComponent } from './components/migration-overview/migration-overview.component';
@NgModule({ @NgModule({
declarations: [ declarations: [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment