Skip to content

Commit

Permalink
fix travels
Browse files Browse the repository at this point in the history
  • Loading branch information
@elguardian
elguardian committed Oct 1, 2024
1 parent 1657662 commit e3913df
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 34 deletions.
61 changes: 33 additions & 28 deletions ...xamples/kogito-travel-agency/extended/travels/src/test/java/org/acme/travel/TravelIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.acme.travels.VisaApplication;
import org.acme.travels.VisaResolution;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.kie.kogito.Model;
import org.kie.kogito.auth.IdentityProviders;
Expand All @@ -48,16 +49,16 @@
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;

import jakarta.inject.Inject;
import jakarta.inject.Named;

import static io.restassured.RestAssured.given;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.core.StringContains.containsString;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.kie.kogito.test.utils.ProcessInstancesTestUtils.abort;

import jakarta.inject.Inject;
import jakarta.inject.Named;

@QuarkusTest
@QuarkusTestResource(value = InfinispanQuarkusTestResource.class)
@QuarkusTestResource(value = KafkaQuarkusTestResource.class)
Expand All @@ -78,34 +79,32 @@ public class TravelIT {
@Named("travels")
Process<? extends Model> travelsProcess;

private ProcessInstance<?> processInstance;

@Inject
UserTasks userTasks;

@BeforeEach
public void cleanUp() {
abort(travelsProcess.instances());
processInstance = null;
}

@Test
public void testTravelNoVisaRequired() {
whenNewTravel(TRAVELLER_FROM_POLAND, TRIP_TO_POLAND);
thenProcessIsActive();
thenHotelAndFlightAreChosen();
String processInstance = whenNewTravel(TRAVELLER_FROM_POLAND, TRIP_TO_POLAND);
thenProcessIsActive(processInstance);
thenHotelAndFlightAreChosen(processInstance);

whenConfirmTravel();
thenProcessIsCompleted();
whenConfirmTravel(processInstance);
thenProcessIsCompleted(processInstance);
}

@Test
@Disabled
public void testTravelVisaRequired() {
whenNewTravel(TRAVELLER_FROM_POLAND, TRIP_TO_US);
thenProcessIsActive();
String processInstance = whenNewTravel(TRAVELLER_FROM_POLAND, TRIP_TO_US);
thenProcessIsActive(processInstance);

whenAddVisaApplication();
thenProcessIsActive();
whenAddVisaApplication(processInstance);
thenProcessIsActive(processInstance);
}

@Test
Expand All @@ -121,20 +120,21 @@ public void testProcessMetrics() {
PROJECT_ARTIFACT_ID, PROJECT_VERSION)));
}

private void whenNewTravel(Traveller traveller, Trip trip) {
private String whenNewTravel(Traveller traveller, Trip trip) {
Model m = travelsProcess.createModel();
Map<String, Object> parameters = new HashMap<>();
parameters.put("traveller", traveller);
parameters.put("trip", trip);

m.fromMap(parameters);

this.processInstance = travelsProcess.createInstance(m);
this.processInstance.start();
ProcessInstance<?> processInstance = travelsProcess.createInstance(m);
processInstance.start();
return processInstance.id();
}

private void whenConfirmTravel() {
WorkItem workItem = thenNextStepIs(STEP_CONFIRM_TRAVEL, SECURITY_POLICY_JDOE);
private void whenConfirmTravel(String processInstance) {
WorkItem workItem = thenNextStepIs(processInstance, STEP_CONFIRM_TRAVEL, SECURITY_POLICY_JDOE);
assertThat(workItem).isNotNull();

List<UserTaskInstance> userTaskInstances = userTasks.instances().findByIdentity(IdentityProviders.of("jdoe"));
Expand All @@ -145,8 +145,9 @@ private void whenConfirmTravel() {

}

private void whenAddVisaApplication() {
WorkItem workItem = thenNextStepIs(STEP_VISA_APPLICATION, SECURITY_POLICY_JDOE);
private void whenAddVisaApplication(String id) {
ProcessInstance<? extends Model> processInstance = travelsProcess.instances().findById(id).get();
WorkItem workItem = thenNextStepIs(processInstance.id(), STEP_VISA_APPLICATION, SECURITY_POLICY_JDOE);
assertThat(workItem).isNotNull();
List<UserTaskInstance> userTaskInstances = userTasks.instances().findByIdentity(IdentityProviders.of("jdoe"));
userTaskInstances.forEach(ut -> {
Expand All @@ -157,23 +158,27 @@ private void whenAddVisaApplication() {

}

private WorkItem thenNextStepIs(String expected, SecurityPolicy policy) {
private WorkItem thenNextStepIs(String id, String expected, SecurityPolicy policy) {
ProcessInstance<? extends Model> processInstance = travelsProcess.instances().findById(id).get();
List<WorkItem> workItems = processInstance.workItems(policy);
assertEquals(1, workItems.size());
WorkItem next = workItems.get(0);
assertEquals(expected, next.getName());
return next;
}

private void thenProcessIsActive() {
assertEquals(org.kie.api.runtime.process.ProcessInstance.STATE_ACTIVE, this.processInstance.status());
private void thenProcessIsActive(String id) {
ProcessInstance<? extends Model> processInstance = travelsProcess.instances().findById(id).get();
assertEquals(org.kie.api.runtime.process.ProcessInstance.STATE_ACTIVE, processInstance.status());
}

private void thenProcessIsCompleted() {
assertEquals(org.kie.api.runtime.process.ProcessInstance.STATE_COMPLETED, this.processInstance.status());
private void thenProcessIsCompleted(String id) {
ProcessInstance<? extends Model> processInstance = travelsProcess.instances().findById(id).get();
assertEquals(org.kie.api.runtime.process.ProcessInstance.STATE_COMPLETED, processInstance.status());
}

private void thenHotelAndFlightAreChosen() {
private void thenHotelAndFlightAreChosen(String id) {
ProcessInstance<? extends Model> processInstance = travelsProcess.instances().findById(id).get();
Model result = (Model) processInstance.variables();
assertEquals(6, result.toMap().size());
Hotel hotel = (Hotel) result.toMap().get("hotel");
Expand Down
27 changes: 21 additions & 6 deletions ...usertasks-timer-quarkus-with-console/src/test/java/org/kie/kogito/hr/HiringProcessIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,24 @@
package org.kie.kogito.hr;

import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.junit.jupiter.api.Test;
import org.kie.kogito.Model;
import org.kie.kogito.auth.IdentityProvider;
import org.kie.kogito.auth.IdentityProviders;
import org.kie.kogito.auth.SecurityPolicy;
import org.kie.kogito.process.Process;
import org.kie.kogito.process.ProcessInstance;
import org.kie.kogito.process.WorkItem;
import org.kie.kogito.testcontainers.quarkus.InfinispanQuarkusTestResource;
import org.kie.kogito.testcontainers.quarkus.KafkaQuarkusTestResource;
import org.kie.kogito.usertask.UserTaskInstance;
import org.kie.kogito.usertask.UserTasks;
import org.kie.kogito.usertask.impl.lifecycle.DefaultUserTaskLifeCycle;

import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
Expand All @@ -51,6 +56,9 @@ public class HiringProcessIT {
@Inject
Process<? extends Model> hiringProcess;

@Inject
UserTasks userTasks;

@Test
public void testApprovalProcess() {

Expand All @@ -65,23 +73,30 @@ public void testApprovalProcess() {
processInstance.start();
assertEquals(org.kie.api.runtime.process.ProcessInstance.STATE_ACTIVE, processInstance.status());

SecurityPolicy policy = SecurityPolicy.of(IdentityProviders.of("jdoe", Arrays.asList("HR", "IT")));
IdentityProvider jdoeUser = IdentityProviders.of("jdoe", Arrays.asList("HR", "IT"));
SecurityPolicy policy = SecurityPolicy.of(jdoeUser);

processInstance.workItems(policy);

List<WorkItem> workItems = processInstance.workItems(policy);
assertEquals(1, workItems.size());
Map<String, Object> results = new HashMap<>();
results.put("approve", true);
processInstance.completeWorkItem(workItems.get(0).getId(), results, policy);

List<UserTaskInstance> userTaskInstances = userTasks.instances().findByIdentity(IdentityProviders.of("jdoe"));
userTaskInstances.forEach(ut -> {
ut.setOutput("approve", true);
ut.transition(DefaultUserTaskLifeCycle.COMPLETE, Collections.emptyMap(), IdentityProviders.of("jdoe"));
});

processInstance.workItems(policy);

workItems = processInstance.workItems(policy);
assertEquals(1, workItems.size());

results.put("approve", false);
processInstance.completeWorkItem(workItems.get(0).getId(), results, policy);
userTaskInstances = userTasks.instances().findByIdentity(IdentityProviders.of("jdoe"));
userTaskInstances.forEach(ut -> {
ut.setOutput("approve", false);
ut.transition(DefaultUserTaskLifeCycle.COMPLETE, Collections.emptyMap(), IdentityProviders.of("jdoe"));
});
assertEquals(org.kie.api.runtime.process.ProcessInstance.STATE_COMPLETED, processInstance.status());

Model result = (Model) processInstance.variables();
Expand Down

0 comments on commit e3913df

Please sign in to comment.