Merge pull request #26590 from evanchooly/mongoNoWindows

Fix flaky mongo devservices on windows
quarkusio · Jul 19, 2022 · d7ec3d6 · d7ec3d6
2 parents d5b6090 + 2ab678f
commit d7ec3d6
Show file tree

Hide file tree

Showing 23 changed files with 722 additions and 57 deletions.
diff --git a/.github/native-tests.json b/.github/native-tests.json
@@ -27,7 +27,7 @@
         {
             "category": "Data4",
             "timeout": 55,
-            "test-modules": "mongodb-client, mongodb-panache, mongodb-rest-data-panache, mongodb-panache-kotlin, redis-client, hibernate-orm-rest-data-panache",
+            "test-modules": "mongodb-client, mongodb-devservices, mongodb-panache, mongodb-rest-data-panache, mongodb-panache-kotlin, redis-client, hibernate-orm-rest-data-panache",
             "os-name": "ubuntu-latest"
         },
         {

diff --git a/extensions/mongodb-client/deployment/pom.xml b/extensions/mongodb-client/deployment/pom.xml
@@ -136,5 +136,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/...ongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedMongoClientConfigTest.java b/...ongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedMongoClientConfigTest.java
@@ -24,7 +24,6 @@
 import io.quarkus.test.QuarkusUnitTest;
 
 public class NamedMongoClientConfigTest extends MongoWithReplicasTestBase {
-
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .withApplicationRoot((jar) -> jar.addClasses(MongoTestBase.class))

diff --git a/extensions/mongodb-client/runtime/pom.xml b/extensions/mongodb-client/runtime/pom.xml
@@ -160,6 +160,4 @@
             </plugin>
         </plugins>
     </build>
-
-
 </project>
diff --git a/integration-tests/liquibase-mongodb/pom.xml b/integration-tests/liquibase-mongodb/pom.xml
@@ -101,6 +101,4 @@
             </plugin>
         </plugins>
     </build>
-
-
 </project>
diff --git a/integration-tests/mongodb-client/pom.xml b/integration-tests/mongodb-client/pom.xml
@@ -113,32 +113,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>no-windows</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>
diff --git a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookResource.java b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookResource.java
@@ -25,25 +25,10 @@ public class BookResource {
     @MongoClientName("parameter-injection")
     MongoClient client;
 
-    @Inject
-    @MongoClientName("dev-services")
-    MongoClient devServiced;
-    @Inject
-    @MongoClientName("dev-services2")
-    MongoClient devServiced2;
-
     private MongoCollection<Book> getCollection() {
         return client.getDatabase("books").getCollection("my-collection", Book.class);
     }
 
-    private MongoCollection<Book> getServicedCollection() {
-        return devServiced.getDatabase("books").getCollection("my-collection", Book.class);
-    }
-
-    private MongoCollection<Book> getServiced2Collection() {
-        return devServiced.getDatabase("books").getCollection("my-collection", Book.class);
-    }
-
     @GET
     public List<Book> getBooks() {
         FindIterable<Book> iterable = getCollection().find();
@@ -61,16 +46,12 @@ public List<Book> getBooks() {
     @POST
     public Response addBook(Book book) {
         getCollection().insertOne(book);
-        getServicedCollection().insertOne(book);
-        getServiced2Collection().insertOne(book);
         return Response.accepted().build();
     }
 
     @GET
     @Path("/{author}")
     public List<Book> getBooksByAuthor(@PathParam("author") String author) {
-        getServicedCollection().find(eq("author", author));
-        getServiced2Collection().find(eq("author", author));
         FindIterable<Book> iterable = getCollection().find(eq("author", author));
         List<Book> books = new ArrayList<>();
         for (Book doc : iterable) {

diff --git a/integration-tests/mongodb-client/src/main/resources/application.properties b/integration-tests/mongodb-client/src/main/resources/application.properties
@@ -2,6 +2,3 @@ quarkus.mongodb.connection-string=mongodb://localhost:27017
 quarkus.mongodb.write-concern.journal=false
 quarkus.mongodb.parameter-injection.connection-string=mongodb://localhost:27017
 quarkus.mongodb.parameter-injection.write-concern.journal=true
-
-quarkus.mongodb.dev-services.write-concern.journal=false
-quarkus.mongodb.dev-services2.write-concern.journal=false
diff --git a/integration-tests/mongodb-devservices/pom.xml b/integration-tests/mongodb-devservices/pom.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>io.quarkus</groupId>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-integration-test-mongodb-devservices</artifactId>
+
+    <name>Quarkus - Integration Tests - MongoDB DevServices</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jsonb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-mongodb</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>no-windows</id>
+            <activation>
+                <os>
+                    <family>windows</family>
+                </os>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/integration-tests/mongodb-devservices/src/main/java/io/quarkus/it/mongodb/Book.java b/integration-tests/mongodb-devservices/src/main/java/io/quarkus/it/mongodb/Book.java
@@ -0,0 +1,64 @@
+package io.quarkus.it.mongodb;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
+@RegisterForReflection
+public class Book {
+
+    private String id;
+
+    private String title;
+    private String author;
+
+    private List<String> categories = new ArrayList<>();
+
+    private BookDetail details;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public Book setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public Book setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public Book setAuthor(String author) {
+        this.author = author;
+        return this;
+    }
+
+    public List<String> getCategories() {
+        return categories;
+    }
+
+    public Book setCategories(List<String> categories) {
+        this.categories = categories;
+        return this;
+    }
+
+    public BookDetail getDetails() {
+        return details;
+    }
+
+    public Book setDetails(BookDetail details) {
+        this.details = details;
+        return this;
+    }
+}