Move yang-model-export unit tests

This will allow us to co-locate within the same package, leading
to better interaction, as we can use package-private methods to look
at state.

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

diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/Bug2444Test.java b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug2444Test.java
similarity index 98%
rename from yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/Bug2444Test.java
rename to yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug2444Test.java
index cd8776f26a142df7116e7a5fa971b7359a8394db..872d76963b6ec024f613d4c129c6c45bd39e72d5 100644 (file)
--- a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/Bug2444Test.java
+++ b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug2444Test.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.export.test;
+package org.opendaylight.yangtools.yang.model.export;
 
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;

diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/Bug4504Test.java b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug4504Test.java
similarity index 96%
rename from yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/Bug4504Test.java
rename to yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug4504Test.java
index c4d0a7b498333ab9f1ac90e40d229bd6575d1362..cbb01273b69ffb009dee30a4829dd48b65cb0965 100644 (file)
--- a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/Bug4504Test.java
+++ b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug4504Test.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.export.test;
+package org.opendaylight.yangtools.yang.model.export;
 
 import static org.junit.Assert.assertNotNull;
 

diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/Bug5531Test.java b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug5531Test.java
similarity index 97%
rename from yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/Bug5531Test.java
rename to yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug5531Test.java
index 0f79efca0bb7c28f876491c2c34e5123abda5af7..cb1161dfa4aa32263a7bcc2dbff7e2ec9bbc699c 100644 (file)
--- a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/Bug5531Test.java
+++ b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug5531Test.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.export.test;
+package org.opendaylight.yangtools.yang.model.export;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;

diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/Bug6856Test.java b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug6856Test.java
similarity index 97%
rename from yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/Bug6856Test.java
rename to yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug6856Test.java
index 3fb84901283c2ab8b8939ec3e5d9307cf94520fb..b7bb3e19dd3e4a38652961281918569f8e4a17cf 100644 (file)
--- a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/Bug6856Test.java
+++ b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug6856Test.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.yangtools.yang.model.export.test;
+package org.opendaylight.yangtools.yang.model.export;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;

diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/EffectiveSchemaContextEmitterTest.java b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/EffectiveSchemaContextEmitterTest.java
index 58d1838da3b034fbc3be89984014782aead305b4..17ce3562797fa1a6fd2a4eafdf386208aff88015 100644 (file)
--- a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/EffectiveSchemaContextEmitterTest.java
+++ b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/EffectiveSchemaContextEmitterTest.java
@@ -34,7 +34,6 @@ import org.opendaylight.yangtools.yang.model.api.ModuleImport;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 import org.opendaylight.yangtools.yang.model.export.SchemaContextEmitter.EffectiveSchemaContextEmitter;
-import org.opendaylight.yangtools.yang.model.export.test.YinExportTestUtils;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;

diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/SchemaContextEmitterTest.java b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitterTest.java
similarity index 97%
rename from yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/SchemaContextEmitterTest.java
rename to yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitterTest.java
index ae0979cd29df83121c97ceec1b1c1ec32a282f20..791dd0c49cddb2839a11129ae5d8859243b0cc8d 100644 (file)
--- a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/SchemaContextEmitterTest.java
+++ b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitterTest.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.yangtools.yang.model.export.test;
+package org.opendaylight.yangtools.yang.model.export;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;

diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/SimpleModuleTest.java b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SimpleModuleTest.java
similarity index 98%
rename from yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/SimpleModuleTest.java
rename to yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SimpleModuleTest.java
index 0c17aaa2489bd4639b4e90cf67f8c0cfc7831607..4495648b35e89364239cbb84912452fb91b826c5 100644 (file)
--- a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/SimpleModuleTest.java
+++ b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SimpleModuleTest.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.export.test;
+package org.opendaylight.yangtools.yang.model.export;
 
 import java.io.File;
 import java.io.FileOutputStream;

diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/YinExportTestUtils.java b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YinExportTestUtils.java
similarity index 98%
rename from yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/YinExportTestUtils.java
rename to yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YinExportTestUtils.java
index a93706ce4ca1cfcebe7349306f6ce73fbfed41be..9dafe2b915e21110b5836014945d55781132aaa5 100644 (file)
--- a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/YinExportTestUtils.java
+++ b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YinExportTestUtils.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.export.test;
+package org.opendaylight.yangtools.yang.model.export;
 
 import com.google.common.base.Preconditions;
 import java.io.IOException;