From: Jakub Toth Date: Thu, 14 Sep 2017 09:02:03 +0000 (+0200) Subject: Fix revisions format in tests X-Git-Tag: release/oxygen~88 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=3e48f8e6836ae68438ba1e174999a25093f856ad;p=mdsal.git Fix revisions format in tests Change-Id: I18fec54ad112d34b315a9fed6c5f48a8ee02e5dd Signed-off-by: Jakub Toth --- diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/leafref_typedef_union/bug8449.yang b/binding/mdsal-binding-generator-impl/src/test/resources/leafref_typedef_union/bug8449.yang index 62d8146ce8..4cf0519f6a 100644 --- a/binding/mdsal-binding-generator-impl/src/test/resources/leafref_typedef_union/bug8449.yang +++ b/binding/mdsal-binding-generator-impl/src/test/resources/leafref_typedef_union/bug8449.yang @@ -3,7 +3,7 @@ module bug8449 { namespace "bug8449"; prefix "tst"; - revision "2017-16-05" { + revision "2017-05-16" { } typedef name1-ref { diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/EnumerationBuilderImplTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/EnumerationBuilderImplTest.java index 89564b507c..89f1514795 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/EnumerationBuilderImplTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/EnumerationBuilderImplTest.java @@ -12,6 +12,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; + import java.util.Collections; import org.junit.Before; import org.junit.Test; @@ -24,7 +25,7 @@ import org.opendaylight.yangtools.yang.model.util.type.EnumPairBuilder; public class EnumerationBuilderImplTest { - private final QName qName = QName.create("TestQName", "10-10-2014", "TestLocalQName"); + private final QName qName = QName.create("TestQName", "2014-10-10", "TestLocalQName"); private final String DESCRIPTION = "Test description of Enum"; private final String packageName = "org.opendaylight.test"; private final String name = "TestName"; @@ -100,18 +101,18 @@ public class EnumerationBuilderImplTest { assertEquals(enumeration, enumeration); assertNotEquals(enumeration, "string"); - Enumeration enumerationOtherPackage = enumerationBuilderOtherPackage.toInstance(enumerationBuilderOtherPackage); + final Enumeration enumerationOtherPackage = enumerationBuilderOtherPackage.toInstance(enumerationBuilderOtherPackage); assertNotEquals(enumeration, enumerationOtherPackage); - Enumeration enumerationOtherName = enumerationBuilderOtherName.toInstance(enumerationBuilderOtherName); + final Enumeration enumerationOtherName = enumerationBuilderOtherName.toInstance(enumerationBuilderOtherName); assertNotEquals(enumeration, enumerationOtherName); enumerationBuilderSame.addValue(valueName, value, valueDescription); - Enumeration enumerationSame = enumerationBuilderSame.toInstance(enumerationBuilderSame); + final Enumeration enumerationSame = enumerationBuilderSame.toInstance(enumerationBuilderSame); assertEquals(enumeration, enumerationSame); - EnumerationBuilderImpl enumerationBuilderSame1 = new EnumerationBuilderImpl(packageName, name); - Enumeration enumerationSame1 = enumerationBuilderSame1.toInstance(enumerationBuilderSame1); + final EnumerationBuilderImpl enumerationBuilderSame1 = new EnumerationBuilderImpl(packageName, name); + final Enumeration enumerationSame1 = enumerationBuilderSame1.toInstance(enumerationBuilderSame1); enumerationBuilderSame1.addValue(valueName, 14, valueDescription); // Enums are equal thanks to same package name and local name assertEquals(enumeration, enumerationSame1); @@ -119,11 +120,11 @@ public class EnumerationBuilderImplTest { @Test public void testEnumerationToString() { - String formattedString = + final String formattedString = "public enum " + name + " {\n" + "\t TestValue " + "(12 );\n" + "}"; - String s = "Enumeration [packageName="+packageName+", definingType="+packageName+"."+name+", name="+name+ + final String s = "Enumeration [packageName="+packageName+", definingType="+packageName+"."+name+", name="+name+ ", values=[EnumPair [name=TestValue, mappedName=TestValue, value=12]]]"; assertEquals(s, enumeration.toString()); @@ -137,7 +138,7 @@ public class EnumerationBuilderImplTest { @Test public void testUpdateEnumPairsFromEnumTypeDef() { - EnumTypeDefinition enumTypeDefinition = BaseTypes.enumerationTypeBuilder(SchemaPath.SAME) + final EnumTypeDefinition enumTypeDefinition = BaseTypes.enumerationTypeBuilder(SchemaPath.SAME) .addEnum(EnumPairBuilder.create("SomeName", 42).setDescription("Some Other Description") .setReference("Some other reference").build()).build(); enumerationBuilder.updateEnumPairsFromEnumTypeDef(enumTypeDefinition); diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/MountPointServiceTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/MountPointServiceTest.java index 9efa922e9a..8c60649b37 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/MountPointServiceTest.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/MountPointServiceTest.java @@ -29,7 +29,8 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; public class MountPointServiceTest { - private static final YangInstanceIdentifier PATH = YangInstanceIdentifier.of(QName.create("namespace", "12-12-2012", + private static final YangInstanceIdentifier PATH = + YangInstanceIdentifier.of(QName.create("namespace", "2012-12-12", "top")); private DOMMountPointService mountService;