From: Robert Varga Date: Mon, 20 Apr 2020 13:02:49 +0000 (+0200) Subject: Clean up test naming confusion X-Git-Tag: v6.0.0~33 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=3ddde5b67d42917a063418252dba769615941bc9;p=mdsal.git Clean up test naming confusion BaseTypeProvider is really a BaseTypesTest, and that test is really BaseYangTypesProviderTest. Clean them up, relocating them as to their home packages. Change-Id: I37f9a78fe48b1954882bfa344f1d866c9591e14b Signed-off-by: Robert Varga --- diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/BaseYangTypesTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/BaseYangTypesProviderTest.java similarity index 99% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/BaseYangTypesTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/BaseYangTypesProviderTest.java index 661480bcd2..cdf1c3de7b 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/BaseYangTypesTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/BaseYangTypesProviderTest.java @@ -42,10 +42,7 @@ import org.opendaylight.yangtools.yang.model.api.type.Uint8TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; -/** - * Test class for testing BaseYangTypes class. - */ -public class BaseYangTypesTest { +public class BaseYangTypesProviderTest { private static SchemaContext schemaContext; diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BaseTypeProvider.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/BaseYangTypesTest.java similarity index 86% rename from binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BaseTypeProvider.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/BaseYangTypesTest.java index 355700762c..6d1fe87090 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BaseTypeProvider.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/BaseYangTypesTest.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.mdsal.binding.generator.impl; +package org.opendaylight.mdsal.binding.model.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -14,11 +14,8 @@ import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.ConcreteType; import org.opendaylight.mdsal.binding.model.api.ParameterizedType; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.util.BaseYangTypes; -import org.opendaylight.mdsal.binding.model.util.Types; - -public class BaseTypeProvider { +public class BaseYangTypesTest { @Test public void test() { Type stringType = BaseYangTypes.javaTypeForYangType("string");