openhab#16308 openhab#16310 Removed unrequired dependencies and skip …

…some tests if docker is missing. Signed-off-by: René Ulbricht <rene_ulbricht@outlook.com>
ulbi · Jan 28, 2024 · e243747 · e243747
1 parent 63104d3
commit e243747
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 27 deletions.
diff --git a/bundles/org.openhab.persistence.mongodb/pom.xml b/bundles/org.openhab.persistence.mongodb/pom.xml
@@ -49,12 +49,6 @@
       <version>1.5.5-3</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.lastnpe.eea</groupId>
-      <artifactId>eea-all</artifactId>
-      <version>2.2.1</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.mongodb</groupId>
       <artifactId>bson-record-codec</artifactId>
@@ -69,18 +63,6 @@
       <version>1.44.0</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <version>1.2.9</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>4.2.0</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>mongodb</artifactId>

diff --git a/...ce.mongodb/src/test/java/org/openhab/persistence/mongodb/internal/DataCreationHelper.java b/...ce.mongodb/src/test/java/org/openhab/persistence/mongodb/internal/DataCreationHelper.java
@@ -34,6 +34,7 @@
 import org.openhab.core.types.State;
 import org.osgi.framework.BundleContext;
 import org.slf4j.LoggerFactory;
+import org.testcontainers.DockerClientFactory;
 
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
@@ -133,19 +134,25 @@ public static Stream<Arguments> provideOpenhabItemTypes() {
      *
      * Each argument is a DatabaseTestContainer instance. Some instances use a MemoryBackend,
      * while others use a MongoDBContainer with a specific MongoDB version.
+     * In case there is no Docker available, only the MemoryBackend is used.
      *
      * @return A stream of Arguments, each containing a DatabaseTestContainer instance.
      */
     public static Stream<Arguments> provideDatabaseBackends() {
-        // Create a stream of Arguments
-        return Stream.of(
-                // Create a DatabaseTestContainer with a MemoryBackend
-                Arguments.of(new DatabaseTestContainer(new MemoryBackend())),
-                // Create DatabaseTestContainers with MongoDBContainers of specific versions
-                Arguments.of(new DatabaseTestContainer("mongo:3.6")),
-                Arguments.of(new DatabaseTestContainer("mongo:4.4")),
-                Arguments.of(new DatabaseTestContainer("mongo:5.0")),
-                Arguments.of(new DatabaseTestContainer("mongo:6.0")));
+        if (DockerClientFactory.instance().isDockerAvailable()) {
+            // If Docker is available, create a stream of Arguments with all backends
+            return Stream.of(
+                    // Create a DatabaseTestContainer with a MemoryBackend
+                    Arguments.of(new DatabaseTestContainer(new MemoryBackend())),
+                    // Create DatabaseTestContainers with MongoDBContainers of specific versions
+                    Arguments.of(new DatabaseTestContainer("mongo:3.6")),
+                    Arguments.of(new DatabaseTestContainer("mongo:4.4")),
+                    Arguments.of(new DatabaseTestContainer("mongo:5.0")),
+                    Arguments.of(new DatabaseTestContainer("mongo:6.0")));
+        } else {
+            // If Docker is not available, create a stream of Arguments with only the MemoryBackend
+            return Stream.of(Arguments.of(new DatabaseTestContainer(new MemoryBackend())));
+        }
     }
 
     /**