Skip to content

Commit dc0dce7

Browse files
committed
fix: move test to tests module to avoid cyclic dependency issue
1 parent c585b19 commit dc0dce7

File tree

3 files changed

+31
-39
lines changed

3 files changed

+31
-39
lines changed

operator-framework-quarkus-extension/deployment/pom.xml

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -43,26 +43,6 @@
4343
<groupId>io.quarkus</groupId>
4444
<artifactId>quarkus-smallrye-health-deployment</artifactId>
4545
</dependency>
46-
<dependency>
47-
<groupId>io.quarkus</groupId>
48-
<artifactId>quarkus-junit5-internal</artifactId>
49-
<scope>test</scope>
50-
</dependency>
51-
<dependency>
52-
<groupId>io.rest-assured</groupId>
53-
<artifactId>rest-assured</artifactId>
54-
<scope>test</scope>
55-
</dependency>
56-
<dependency>
57-
<groupId>org.assertj</groupId>
58-
<artifactId>assertj-core</artifactId>
59-
<scope>test</scope>
60-
</dependency>
61-
<dependency>
62-
<groupId>io.javaoperatorsdk</groupId>
63-
<artifactId>operator-framework-quarkus-tests-support</artifactId>
64-
<version>${project.version}</version>
65-
</dependency>
6646
</dependencies>
6747

6848
<build>
@@ -80,17 +60,6 @@
8060
</annotationProcessorPaths>
8161
</configuration>
8262
</plugin>
83-
<plugin>
84-
<groupId>org.apache.maven.plugins</groupId>
85-
<artifactId>maven-surefire-plugin</artifactId>
86-
<configuration>
87-
<systemPropertyVariables>
88-
<java.util.logging.manager>org.jboss.logmanager.LogManager
89-
</java.util.logging.manager>
90-
<maven.home>${maven.home}</maven.home>
91-
</systemPropertyVariables>
92-
</configuration>
93-
</plugin>
9463
</plugins>
9564
</build>
9665

operator-framework-quarkus-extension/tests/pom.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,21 @@
2828
<groupId>io.quarkus</groupId>
2929
<artifactId>quarkus-resteasy-jackson</artifactId>
3030
</dependency>
31+
<dependency>
32+
<groupId>io.quarkus</groupId>
33+
<artifactId>quarkus-junit5-internal</artifactId>
34+
<scope>test</scope>
35+
</dependency>
36+
<dependency>
37+
<groupId>io.rest-assured</groupId>
38+
<artifactId>rest-assured</artifactId>
39+
<scope>test</scope>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.assertj</groupId>
43+
<artifactId>assertj-core</artifactId>
44+
<scope>test</scope>
45+
</dependency>
3146
</dependencies>
3247

3348
<build>
@@ -51,6 +66,18 @@
5166
</execution>
5267
</executions>
5368
</plugin>
69+
<plugin>
70+
<groupId>org.apache.maven.plugins</groupId>
71+
<artifactId>maven-surefire-plugin</artifactId>
72+
<configuration>
73+
<systemPropertyVariables>
74+
<java.util.logging.manager>
75+
org.jboss.logmanager.LogManager
76+
</java.util.logging.manager>
77+
<maven.home>${maven.home}</maven.home>
78+
</systemPropertyVariables>
79+
</configuration>
80+
</plugin>
5481
</plugins>
5582
</build>
5683
</project>
Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
1-
package io.javaoperatorsdk.quarkus.extension.deployment;
1+
package io.javaoperatorsdk.quarkus.it;
22

33
import static io.restassured.RestAssured.given;
44
import static org.hamcrest.Matchers.equalTo;
55
import static org.hamcrest.Matchers.is;
66

7-
import io.javaoperatorsdk.quarkus.it.TestController;
8-
import io.javaoperatorsdk.quarkus.it.TestOperatorApp;
9-
import io.javaoperatorsdk.quarkus.it.TestResource;
107
import io.quarkus.test.QuarkusProdModeTest;
118
import org.jboss.shrinkwrap.api.ShrinkWrap;
129
import org.jboss.shrinkwrap.api.spec.JavaArchive;
1310
import org.junit.jupiter.api.Test;
1411
import org.junit.jupiter.api.extension.RegisterExtension;
1512

1613
/**
17-
* This tests creates an application based on the application code found in the {@code
18-
* operator-framework-quarkus-tests-support} module. The app is started and accessed over REST to
19-
* assess that injected values are present and what we expect.
14+
* This tests creates and starts an application accessed over REST to assess that injected values
15+
* are present and what we expect.
2016
*/
2117
public class QuarkusExtensionProcessorTest {
2218

@@ -26,7 +22,7 @@ public class QuarkusExtensionProcessorTest {
2622
.setArchiveProducer(
2723
() ->
2824
ShrinkWrap.create(JavaArchive.class)
29-
.addClasses(TestOperatorApp.class, TestController.class))
25+
.addClasses(TestOperatorApp.class, TestController.class, TestResource.class))
3026
.setApplicationName("basic-app")
3127
.setApplicationVersion("0.1-SNAPSHOT")
3228
.setRun(true);

0 commit comments

Comments
 (0)