Remove mdsal-binding-util-tests

mdsal-binding-dom-adapter no longer needs mdsal-binding-util, which
means we can fold unit tests, eliminating an intermediate step.

Change-Id: I5f6aa1d3536eac3ae744ef403b6b8c9b41917091
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-dom-adapter/pom.xml b/binding/mdsal-binding-dom-adapter/pom.xml
index 21159c6b90b86a8ee3c9f29623020309b7be9674..a3964a817c19e90ba154a32e69f8d956a2275486 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/pom.xml
+++ b/binding/mdsal-binding-dom-adapter/pom.xml
@@ -28,10 +28,6 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-dom-api</artifactId>

diff --git a/binding/mdsal-binding-util-tests/pom.xml b/binding/mdsal-binding-util-tests/pom.xml
deleted file mode 100644 (file)
index b19830f..0000000
--- a/binding/mdsal-binding-util-tests/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 Red Hat, Inc. and others.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
-    </parent>
-
-    <artifactId>mdsal-binding-util-tests</artifactId>
-    <version>6.0.1-SNAPSHOT</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.google.truth</groupId>
-            <artifactId>truth</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.truth.extensions</groupId>
-            <artifactId>truth-java8-extension</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-test-model</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-test-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-dom-adapter</artifactId>
-            <type>test-jar</type>
-        </dependency>
-    </dependencies>
-</project>

diff --git a/binding/mdsal-binding-util/pom.xml b/binding/mdsal-binding-util/pom.xml
index 675a0972961b38dd7363bb92e72f50792e9959ce..2ab1f9a6b9fae48eb0ca1f59441bc31b4d13e4c8 100644 (file)
--- a/binding/mdsal-binding-util/pom.xml
+++ b/binding/mdsal-binding-util/pom.xml
@@ -33,6 +33,23 @@
             <artifactId>javax.inject</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <dependency>
+            <groupId>com.google.truth</groupId>
+            <artifactId>truth</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.truth.extensions</groupId>
+            <artifactId>truth-java8-extension</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-test-model</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-test-utils</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/binding/mdsal-binding-util-tests/src/test/java/org/opendaylight/mdsal/binding/util/ManagedNewTransactionRunnerImplTest.java b/binding/mdsal-binding-util/src/test/java/org/opendaylight/mdsal/binding/util/ManagedNewTransactionRunnerImplTest.java
similarity index 100%
rename from binding/mdsal-binding-util-tests/src/test/java/org/opendaylight/mdsal/binding/util/ManagedNewTransactionRunnerImplTest.java
rename to binding/mdsal-binding-util/src/test/java/org/opendaylight/mdsal/binding/util/ManagedNewTransactionRunnerImplTest.java

diff --git a/binding/mdsal-binding-util-tests/src/test/java/org/opendaylight/mdsal/binding/util/RetryingManagedNewTransactionRunnerTest.java b/binding/mdsal-binding-util/src/test/java/org/opendaylight/mdsal/binding/util/RetryingManagedNewTransactionRunnerTest.java
similarity index 100%
rename from binding/mdsal-binding-util-tests/src/test/java/org/opendaylight/mdsal/binding/util/RetryingManagedNewTransactionRunnerTest.java
rename to binding/mdsal-binding-util/src/test/java/org/opendaylight/mdsal/binding/util/RetryingManagedNewTransactionRunnerTest.java

diff --git a/binding/mdsal-binding-util-tests/src/test/java/org/opendaylight/mdsal/binding/util/TransactionAdapterTest.java b/binding/mdsal-binding-util/src/test/java/org/opendaylight/mdsal/binding/util/TransactionAdapterTest.java
similarity index 100%
rename from binding/mdsal-binding-util-tests/src/test/java/org/opendaylight/mdsal/binding/util/TransactionAdapterTest.java
rename to binding/mdsal-binding-util/src/test/java/org/opendaylight/mdsal/binding/util/TransactionAdapterTest.java

diff --git a/binding/pom.xml b/binding/pom.xml
index 49a93dfc8f842c7b1713181ed049606518b943d5..dd1c79ecd2511de6e1fefb27874e9ceb075a8921 100644 (file)
--- a/binding/pom.xml
+++ b/binding/pom.xml
@@ -52,7 +52,6 @@
         <module>mdsal-binding-util</module>
         <module>mdsal-binding-test-utils</module>
         <module>mdsal-binding-dom-adapter</module>
-        <module>mdsal-binding-util-tests</module>
     </modules>
 
     <properties>