Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KOGITO-3208: integration test for trusty service and explainability service #458

Merged
merged 12 commits into from
Nov 2, 2020
Merged

KOGITO-3208: integration test for trusty service and explainability service #458

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
020be89
KOGITO-3208: implement integration-tests-trusty-service
kostola Sep 10, 2020
93813a4
KOGITO-3208: simplify *TrustyExplainabilityEnd2EndIT classes
kostola Oct 2, 2020
56ba574
KOGITO-3208: update root pom.xml
kostola Oct 9, 2020
99f9f47
KOGITO-3208: fixes to integration-tests-trusty-service
kostola Oct 9, 2020
d12c0cc
KOGITO-3208: test with multiple executions in AbstractTrustyExplainab…
kostola Oct 15, 2020
89944dc
KOGITO-3208: fix integration-tests-trusty-service-springboot/pom.xml
kostola Oct 15, 2020
5631242
KOGITO-3208: fix keycloak in trusty service and integration tests
kostola Oct 15, 2020
641445b
KOGITO-3208: restore quarkus.oidc properties in trusty-service
kostola Oct 20, 2020
de282ae
Merge branch 'master' into 'KOGITO-3208'
kostola Oct 26, 2020
a36b333
Merge branch 'master' into 'KOGITO-3208'
kostola Oct 27, 2020
1a35c05
KOGITO-3208: merge branch 'master' into 'KOGITO-3208'
kostola Oct 30, 2020
a6210b0
KOGITO-3208: fix pom.xml
kostola Oct 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions explainability/explainability-service-messaging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@
<artifactId>cloudevents-api</artifactId>
</dependency>

<!-- Build container image -->
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-container-image-jib</artifactId>
</dependency>

<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
Expand Down
4 changes: 4 additions & 0 deletions explainability/explainability-service-messaging/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#Container image
quarkus.container-image.build=true
quarkus.container-image.group=org.kie.kogito

# Kafka Explainability Request
mp.messaging.incoming.trusty-explainability-request.group.id=trusty
mp.messaging.incoming.trusty-explainability-request.connector=smallrye-kafka
Expand Down
8 changes: 4 additions & 4 deletions ...on-tests/integration-tests-common/pom.xml → ...gration-tests-jobs-service-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

<parent>
<groupId>org.kie.kogito</groupId>
<artifactId>integration-tests</artifactId>
<artifactId>integration-tests-jobs-service</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>integration-tests-common</artifactId>
<artifactId>integration-tests-jobs-service-common</artifactId>

<name>Kogito Apps :: Integration Tests :: Common</name>
<name>Kogito Apps :: Integration Tests :: Jobs Service :: Common</name>
<description>Processes and common classes for integration tests</description>

<properties>
Expand Down Expand Up @@ -72,4 +72,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
0 .../KogitoServiceRandomPortTestResource.java → .../KogitoServiceRandomPortTestResource.java
View file
Open in desktop
File renamed without changes.
0 ...ie/kogito/it/jobs/BaseProcessTimerIT.java → ...ie/kogito/it/jobs/BaseProcessTimerIT.java
View file
Open in desktop
File renamed without changes.
0 .../org/kie/kogito/it/utils/SocketUtils.java → .../org/kie/kogito/it/utils/SocketUtils.java
View file
Open in desktop
File renamed without changes.
0 ...o/testcontainers/JobServiceContainer.java → ...o/testcontainers/JobServiceContainer.java
View file
Open in desktop
File renamed without changes.
0 ...urces/org/acme/travels/timer-on-task.bpmn → ...urces/org/acme/travels/timer-on-task.bpmn
View file
Open in desktop
File renamed without changes.
0 ...in/resources/org/acme/travels/timers.bpmn → ...in/resources/org/acme/travels/timers.bpmn
View file
Open in desktop
File renamed without changes.
0 ...sources/org/acme/travels/timersCycle.bpmn → ...sources/org/acme/travels/timersCycle.bpmn
View file
Open in desktop
File renamed without changes.
0 ...ests/integration-tests-quarkus/.gitignore → ...ion-tests-jobs-service-quarkus/.gitignore
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions ...n-tests/integration-tests-quarkus/pom.xml → ...ration-tests-jobs-service-quarkus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.kie.kogito</groupId>
<artifactId>integration-tests</artifactId>
<artifactId>integration-tests-jobs-service</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>integration-tests-quarkus</artifactId>
<name>Kogito Apps :: Integration Tests :: Quarkus</name>
<artifactId>integration-tests-jobs-service-quarkus</artifactId>
<name>Kogito Apps :: Integration Tests :: Jobs Service :: Quarkus</name>

<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -45,7 +45,7 @@

<dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>integration-tests-common</artifactId>
<artifactId>integration-tests-jobs-service-common</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -73,7 +73,7 @@
<configuration>
<outputDirectory>${project.basedir}/src/main/resources/kogito/</outputDirectory>
<resourceBundles>
<resourceBundle>org.kie.kogito:integration-tests-common:${project.version}</resourceBundle>
<resourceBundle>org.kie.kogito:integration-tests-jobs-service-common:${project.version}</resourceBundle>
</resourceBundles>
</configuration>
</execution>
Expand Down Expand Up @@ -110,4 +110,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
0 ...src/main/resources/application.properties → ...src/main/resources/application.properties
View file
Open in desktop
File renamed without changes.
0 ...rg/kie/kogito/it/jobs/ProcessTimerIT.java → ...rg/kie/kogito/it/jobs/ProcessTimerIT.java
View file
Open in desktop
File renamed without changes.
0 ...ources/JobServiceQuarkusTestResource.java → ...ources/JobServiceQuarkusTestResource.java
View file
Open in desktop
File renamed without changes.
0 ...ServiceRandomPortQuarkusTestResource.java → ...ServiceRandomPortQuarkusTestResource.java
View file
Open in desktop
File renamed without changes.
0 ...src/test/resources/application.properties → ...src/test/resources/application.properties
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions ...ests/integration-tests-springboot/pom.xml → ...ion-tests-jobs-service-springboot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.kie.kogito</groupId>
<artifactId>integration-tests</artifactId>
<artifactId>integration-tests-jobs-service</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>integration-tests-springboot</artifactId>
<name>Kogito Apps :: Integration Tests :: Spring Boot</name>
<artifactId>integration-tests-jobs-service-springboot</artifactId>
<name>Kogito Apps :: Integration Tests :: Jobs Service :: Spring Boot</name>

<properties>
<sonar.exclusions>**/KogitoApplication.java</sonar.exclusions>
Expand All @@ -29,7 +29,7 @@
</dependency>
<dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>integration-tests-common</artifactId>
<artifactId>integration-tests-jobs-service-common</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -67,7 +67,7 @@
</goals>
<configuration>
<resourceBundles>
<resourceBundle>org.kie.kogito:integration-tests-common:${project.version}</resourceBundle>
<resourceBundle>org.kie.kogito:integration-tests-jobs-service-common:${project.version}</resourceBundle>
</resourceBundles>
</configuration>
</execution>
Expand Down Expand Up @@ -99,4 +99,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
0 ...ava/org/kie/kogito/KogitoApplication.java → ...ava/org/kie/kogito/KogitoApplication.java
View file
Open in desktop
File renamed without changes.
0 ...rg/kie/kogito/it/jobs/ProcessTimerIT.java → ...rg/kie/kogito/it/jobs/ProcessTimerIT.java
View file
Open in desktop
File renamed without changes.
0 ...ces/JobServiceSpringBootTestResource.java → ...ces/JobServiceSpringBootTestResource.java
View file
Open in desktop
File renamed without changes.
0 ...viceRandomPortSpringBootTestResource.java → ...viceRandomPortSpringBootTestResource.java
View file
Open in desktop
File renamed without changes.
0 ...src/test/resources/application.properties → ...src/test/resources/application.properties
View file
Open in desktop
File renamed without changes.
80 changes: 80 additions & 0 deletions integration-tests/integration-tests-jobs-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.kie.kogito</groupId>
<artifactId>integration-tests</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>integration-tests-jobs-service</artifactId>
<name>Kogito Apps :: Integration Tests :: Jobs Service</name>
<packaging>pom</packaging>

<modules>
<module>integration-tests-jobs-service-common</module>
<module>integration-tests-jobs-service-quarkus</module>
<module>integration-tests-jobs-service-springboot</module>
</modules>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bom</artifactId>
<version>${version.io.quarkus}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>integration-tests-jobs-service-common</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<dependencies>
<!-- ensure jobs-service module was built, but not added in the classpath -->
<dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>jobs-service</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<configuration>
<systemPropertyVariables>
<container.image.infinispan>${container.image.infinispan}</container.image.infinispan>
<container.image.jobs-service>${container.image.jobs-service}</container.image.jobs-service>
<container.image.keycloak>${container.image.keycloak}</container.image.keycloak>
</systemPropertyVariables>
<classesDirectory>${project.build.outputDirectory}</classesDirectory>
</configuration>
<executions>
<execution>
<id>default</id>
<phase>test</phase>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
84 changes: 84 additions & 0 deletions ...on-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<?xml version="1.0"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.kie.kogito</groupId>
<artifactId>integration-tests-trusty-service</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>integration-tests-trusty-service-common</artifactId>

<name>Kogito Apps :: Integration Tests :: Trusty Service :: Common</name>
<description>Processes and common classes for integration tests</description>

<properties>
<sonar.exclusions>**/it/*.java,**/testcontainers/*.java</sonar.exclusions>
</properties>

<dependencies>
<dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>trusty-service-api</artifactId>
<scope>compile</scope>
kostola marked this conversation as resolved.
Show resolved Hide resolved
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>kafka</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-test-utils</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>bundle</goal>
</goals>
<configuration>
<includes>
<include>**/*.dmn</include>
</includes>
kostola marked this conversation as resolved.
Show resolved Hide resolved
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Loading