Fold yang-model-util-ut

Now that yang-model-util can depend on yang-parser-rfc7950 for
testing, there is no point in keeping a separate test artifact.
Move all files from yang-model-util-ut into yang-model-util.

JIRA: YANGTOOLS-1052
Change-Id: Iac40aee178af24abbb2115ccf302e3550fbfee8c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/pom.xml b/yang/pom.xml
index 742e488e2651e7882d32b3af3c526bccd09c31d8..e7c0fadf0c507e9c24ec9717753ce9c7b337a7c8 100644 (file)
--- a/yang/pom.xml
+++ b/yang/pom.xml
@@ -36,7 +36,6 @@
         <module>yang-model-spi</module>
         <module>yang-model-export</module>
         <module>yang-model-util</module>
-        <module>yang-model-util-ut</module>
 
         <!-- YANG XPath API and implementation -->
         <module>yang-xpath-api</module>

diff --git a/yang/yang-model-util-ut/pom.xml b/yang/yang-model-util-ut/pom.xml
deleted file mode 100644 (file)
index 427ffd8..0000000
--- a/yang/yang-model-util-ut/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2019 PANTHEON.tech, s.r.o. and others.  All rights reserved.
-
- 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.yangtools</groupId>
-        <artifactId>bundle-parent</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
-        <relativePath>../../bundle-parent</relativePath>
-    </parent>
-
-    <!-- FIXME: YANGTOOLS-1052: merge this into yang-model-util -->
-    <artifactId>yang-model-util-ut</artifactId>
-    <packaging>jar</packaging>
-    <name>${project.artifactId}</name>
-    <description>${project.artifactId}</description>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.install.skip>true</maven.install.skip>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-model-util</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-test-util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>

diff --git a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/package-info.java b/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/package-info.java
deleted file mode 100644 (file)
index 0a67279..0000000
--- a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/package-info.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2019 PANTHEON.tech, s.r.o. and others.  All rights reserved.
- *
- * 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
- */
-/**
- * Additional unit test suite for {@code yang-model-util}, which are using YANG parser to construct the testing data
- * and thus cannot live directly in that artifact.
- */
-// FIXME: YANTTOOLS-1052: this should be eliminated
-package org.opendaylight.yangtools.yang.model.util.ut;
\ No newline at end of file

diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml
index b3372a11d1ffb03f3775e8e03022cb0613a73fec..4d8f65c61d77ebd1c798684297ed1bd275823d36 100644 (file)
--- a/yang/yang-model-util/pom.xml
+++ b/yang/yang-model-util/pom.xml
@@ -36,6 +36,10 @@
             <artifactId>mockito-configuration</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-test-util</artifactId>
+        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>

diff --git a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/LeafrefStaticAnalysisTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/LeafrefStaticAnalysisTest.java
similarity index 99%
rename from yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/LeafrefStaticAnalysisTest.java
rename to yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/LeafrefStaticAnalysisTest.java
index ee9da81e17a010453cc5d3480f835b14c5310e31..b651a5237abaf68a5f905dab7f0036e1ace8bfd0 100644 (file)
--- a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/LeafrefStaticAnalysisTest.java
+++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/LeafrefStaticAnalysisTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yangtools.yang.model.util.ut;
+package org.opendaylight.yangtools.yang.model.util;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isA;

diff --git a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/SchemaContextUtilTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilIntegrationTest.java
similarity index 99%
rename from yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/SchemaContextUtilTest.java
rename to yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilIntegrationTest.java
index a46c1e75c3072ec936e81ab0b988f6785511f175..7676fad6f3dc7b58bd2c969b820b9df4fab97434 100644 (file)
--- a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/SchemaContextUtilTest.java
+++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilIntegrationTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yangtools.yang.model.util.ut;
+package org.opendaylight.yangtools.yang.model.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -29,11 +29,9 @@ import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
-import org.opendaylight.yangtools.yang.model.util.PathExpressionImpl;
-import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
-public class SchemaContextUtilTest {
+public class SchemaContextUtilIntegrationTest {
     private static SchemaContext context;
     private static Module myModule;
 

diff --git a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/YT1050Test.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1050Test.java
similarity index 97%
rename from yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/YT1050Test.java
rename to yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1050Test.java
index e3c5e304de144da6e5c2540669f752d0000e9010..cb124aa3e5d499b775279b0b0680ac3b986d2122 100644 (file)
--- a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/YT1050Test.java
+++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1050Test.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yangtools.yang.model.util.ut;
+package org.opendaylight.yangtools.yang.model.util;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isA;

diff --git a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/YT1060Test.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1060Test.java
similarity index 98%
rename from yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/YT1060Test.java
rename to yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1060Test.java
index 8a5755f0ea839d553ffbbd54668fa6b8d277f1cc..693884dc252e01dee35de41ede86b2580c7b67ae 100644 (file)
--- a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/YT1060Test.java
+++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1060Test.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yangtools.yang.model.util.ut;
+package org.opendaylight.yangtools.yang.model.util;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isA;

diff --git a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/YT1100Test.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1100Test.java
similarity index 97%
rename from yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/YT1100Test.java
rename to yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1100Test.java
index fe12686e58a115d1fe1aac2dbc5b324692f60c1f..9de18c85942241010951f2383d6ab637e76710b4 100644 (file)
--- a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/YT1100Test.java
+++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1100Test.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yangtools.yang.model.util.ut;
+package org.opendaylight.yangtools.yang.model.util;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;

diff --git a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/YT1231Test.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1231Test.java
similarity index 98%
rename from yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/YT1231Test.java
rename to yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1231Test.java
index 49fbd4beddc38452ba8782ab5e9d8e3f29615f80..f08a5e760265befb2ce3baa26cf4f4fa6d80fb9f 100644 (file)
--- a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/YT1231Test.java
+++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1231Test.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yangtools.yang.model.util.ut;
+package org.opendaylight.yangtools.yang.model.util;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;

diff --git a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/YT588Test.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT588Test.java
similarity index 97%
rename from yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/YT588Test.java
rename to yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT588Test.java
index 65c7b27badd3a5278f8928cb13bb1b82990ce404..c75b93ad59bb950ef98a3a77242c8b3ad1ddf588 100644 (file)
--- a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/YT588Test.java
+++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT588Test.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yangtools.yang.model.util.ut;
+package org.opendaylight.yangtools.yang.model.util;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isA;

diff --git a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/YT691Test.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT691Test.java
similarity index 97%
rename from yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/YT691Test.java
rename to yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT691Test.java
index 211f10970e335bb0bdb5a7cb8fe6814b7c06dbb1..b7afea71d51119900c50119e537a68cf598448b3 100644 (file)
--- a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/YT691Test.java
+++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT691Test.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yangtools.yang.model.util.ut;
+package org.opendaylight.yangtools.yang.model.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

diff --git a/yang/yang-model-util-ut/src/test/resources/leafrefs.yang b/yang/yang-model-util/src/test/resources/leafrefs.yang
similarity index 100%
rename from yang/yang-model-util-ut/src/test/resources/leafrefs.yang
rename to yang/yang-model-util/src/test/resources/leafrefs.yang

diff --git a/yang/yang-model-util-ut/src/test/resources/schema-context-util/imported-module.yang b/yang/yang-model-util/src/test/resources/schema-context-util/imported-module.yang
similarity index 100%
rename from yang/yang-model-util-ut/src/test/resources/schema-context-util/imported-module.yang
rename to yang/yang-model-util/src/test/resources/schema-context-util/imported-module.yang

diff --git a/yang/yang-model-util-ut/src/test/resources/schema-context-util/my-module.yang b/yang/yang-model-util/src/test/resources/schema-context-util/my-module.yang
similarity index 100%
rename from yang/yang-model-util-ut/src/test/resources/schema-context-util/my-module.yang
rename to yang/yang-model-util/src/test/resources/schema-context-util/my-module.yang

diff --git a/yang/yang-model-util-ut/src/test/resources/yt1050.yang b/yang/yang-model-util/src/test/resources/yt1050.yang
similarity index 100%
rename from yang/yang-model-util-ut/src/test/resources/yt1050.yang
rename to yang/yang-model-util/src/test/resources/yt1050.yang

diff --git a/yang/yang-model-util-ut/src/test/resources/yt1060/child.yang b/yang/yang-model-util/src/test/resources/yt1060/child.yang
similarity index 100%
rename from yang/yang-model-util-ut/src/test/resources/yt1060/child.yang
rename to yang/yang-model-util/src/test/resources/yt1060/child.yang

diff --git a/yang/yang-model-util-ut/src/test/resources/yt1060/imported.yang b/yang/yang-model-util/src/test/resources/yt1060/imported.yang
similarity index 100%
rename from yang/yang-model-util-ut/src/test/resources/yt1060/imported.yang
rename to yang/yang-model-util/src/test/resources/yt1060/imported.yang

diff --git a/yang/yang-model-util-ut/src/test/resources/yt1060/parent.yang b/yang/yang-model-util/src/test/resources/yt1060/parent.yang
similarity index 100%
rename from yang/yang-model-util-ut/src/test/resources/yt1060/parent.yang
rename to yang/yang-model-util/src/test/resources/yt1060/parent.yang

diff --git a/yang/yang-model-util-ut/src/test/resources/yt1100.yang b/yang/yang-model-util/src/test/resources/yt1100.yang
similarity index 100%
rename from yang/yang-model-util-ut/src/test/resources/yt1100.yang
rename to yang/yang-model-util/src/test/resources/yt1100.yang

diff --git a/yang/yang-model-util-ut/src/test/resources/yt1231.yang b/yang/yang-model-util/src/test/resources/yt1231.yang
similarity index 100%
rename from yang/yang-model-util-ut/src/test/resources/yt1231.yang
rename to yang/yang-model-util/src/test/resources/yt1231.yang

diff --git a/yang/yang-model-util-ut/src/test/resources/yt588.yang b/yang/yang-model-util/src/test/resources/yt588.yang
similarity index 100%
rename from yang/yang-model-util-ut/src/test/resources/yt588.yang
rename to yang/yang-model-util/src/test/resources/yt588.yang

diff --git a/yang/yang-model-util-ut/src/test/resources/yt691/bar-sub1.yang b/yang/yang-model-util/src/test/resources/yt691/bar-sub1.yang
similarity index 100%
rename from yang/yang-model-util-ut/src/test/resources/yt691/bar-sub1.yang
rename to yang/yang-model-util/src/test/resources/yt691/bar-sub1.yang

diff --git a/yang/yang-model-util-ut/src/test/resources/yt691/bar.yang b/yang/yang-model-util/src/test/resources/yt691/bar.yang
similarity index 100%
rename from yang/yang-model-util-ut/src/test/resources/yt691/bar.yang
rename to yang/yang-model-util/src/test/resources/yt691/bar.yang

diff --git a/yang/yang-model-util-ut/src/test/resources/yt691/baz.yang b/yang/yang-model-util/src/test/resources/yt691/baz.yang
similarity index 100%
rename from yang/yang-model-util-ut/src/test/resources/yt691/baz.yang
rename to yang/yang-model-util/src/test/resources/yt691/baz.yang

diff --git a/yang/yang-model-util-ut/src/test/resources/yt691/foo-sub1.yang b/yang/yang-model-util/src/test/resources/yt691/foo-sub1.yang
similarity index 100%
rename from yang/yang-model-util-ut/src/test/resources/yt691/foo-sub1.yang
rename to yang/yang-model-util/src/test/resources/yt691/foo-sub1.yang

diff --git a/yang/yang-model-util-ut/src/test/resources/yt691/foo-sub2.yang b/yang/yang-model-util/src/test/resources/yt691/foo-sub2.yang
similarity index 100%
rename from yang/yang-model-util-ut/src/test/resources/yt691/foo-sub2.yang
rename to yang/yang-model-util/src/test/resources/yt691/foo-sub2.yang

diff --git a/yang/yang-model-util-ut/src/test/resources/yt691/foo.yang b/yang/yang-model-util/src/test/resources/yt691/foo.yang
similarity index 100%
rename from yang/yang-model-util-ut/src/test/resources/yt691/foo.yang
rename to yang/yang-model-util/src/test/resources/yt691/foo.yang

diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml
index 70139bd359933a873d04156b1c2d242dca5d3cc6..57f4d5d51380f34c0da37ee1a1b889d8f119409a 100644 (file)
--- a/yang/yang-parser-impl/pom.xml
+++ b/yang/yang-parser-impl/pom.xml
@@ -36,11 +36,11 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-parser-api</artifactId>
+            <artifactId>yang-model-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-parser-reactor</artifactId>
+            <artifactId>yang-parser-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -48,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-model-util</artifactId>
+            <artifactId>yang-parser-reactor</artifactId>
         </dependency>
 
         <!-- Base RFC6020/RFC7950 reactor support -->