From 25816111cfc72f69808d31a0de40de6aab4c9e00 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 19 Feb 2018 23:49:47 +0100 Subject: [PATCH] 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 --- .../yangtools/yang/model/export/{test => }/Bug2444Test.java | 2 +- .../yangtools/yang/model/export/{test => }/Bug4504Test.java | 2 +- .../yangtools/yang/model/export/{test => }/Bug5531Test.java | 2 +- .../yangtools/yang/model/export/{test => }/Bug6856Test.java | 2 +- .../yang/model/export/EffectiveSchemaContextEmitterTest.java | 1 - .../yang/model/export/{test => }/SchemaContextEmitterTest.java | 2 +- .../yang/model/export/{test => }/SimpleModuleTest.java | 2 +- .../yang/model/export/{test => }/YinExportTestUtils.java | 2 +- 8 files changed, 7 insertions(+), 8 deletions(-) rename yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/{test => }/Bug2444Test.java (98%) rename yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/{test => }/Bug4504Test.java (96%) rename yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/{test => }/Bug5531Test.java (97%) rename yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/{test => }/Bug6856Test.java (97%) rename yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/{test => }/SchemaContextEmitterTest.java (97%) rename yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/{test => }/SimpleModuleTest.java (98%) rename yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/{test => }/YinExportTestUtils.java (98%) 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 cd8776f26a..872d76963b 100644 --- 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 c4d0a7b498..cbb01273b6 100644 --- 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 0f79efca0b..cb1161dfa4 100644 --- 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 3fb8490128..b7bb3e19dd 100644 --- 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 58d1838da3..17ce356279 100644 --- 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 ae0979cd29..791dd0c49c 100644 --- 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 0c17aaa248..4495648b35 100644 --- 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 a93706ce4c..9dafe2b915 100644 --- 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; -- 2.36.6