From bba1e8b3220d8013734b453cf2fda6f0baccdb7d Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 21 Nov 2015 21:08:36 +0100 Subject: [PATCH] BUG-4658: fix default value in BooleanType The default value should be null. Also fix up an ancient test case. Also fix leafref and identityref. Change-Id: Ib82952493360bf24ac9db41814094e879ecda0b0 Signed-off-by: Robert Varga --- .../yangtools/yang/model/util/BooleanType.java | 2 +- .../yangtools/yang/model/util/IdentityrefType.java | 2 +- .../yangtools/yang/model/util/BooleanTypeTest.java | 13 ++++++------- .../LeafrefSpecificationEffectiveStatementImpl.java | 2 +- .../build/test/EffectiveStatementTypeTest.java | 4 ++-- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java index 3783da14f9..e205052fcb 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java @@ -73,7 +73,7 @@ public final class BooleanType implements BooleanTypeDefinition { */ @Override public Object getDefaultValue() { - return false; + return null; } /* diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java index 43def3464b..9f0ed19016 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java @@ -57,7 +57,7 @@ public final class IdentityrefType implements IdentityrefTypeDefinition { @Override public Object getDefaultValue() { - return identity; + return null; } @Override diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BooleanTypeTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BooleanTypeTest.java index 431e666cca..0af2f8b35e 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BooleanTypeTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BooleanTypeTest.java @@ -7,13 +7,12 @@ */ package org.opendaylight.yangtools.yang.model.util; -import org.junit.Test; -import org.opendaylight.yangtools.yang.model.api.Status; - -import java.util.Collections; - import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import java.util.Collections; +import org.junit.Test; +import org.opendaylight.yangtools.yang.model.api.Status; public class BooleanTypeTest { @@ -36,10 +35,10 @@ public class BooleanTypeTest { assertEquals("Base type is null", null, boolType.getBaseType()); - assertEquals("Default value is false", false, boolType.getDefaultValue()); + assertNull("Default value is null", boolType.getDefaultValue()); assertEquals("Status CURRENT", Status.CURRENT, boolType.getStatus()); assertEquals("Should contain empty list", Collections.EMPTY_LIST, boolType.getUnknownSchemaNodes()); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/LeafrefSpecificationEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/LeafrefSpecificationEffectiveStatementImpl.java index c2d5755db8..33447d8576 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/LeafrefSpecificationEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/LeafrefSpecificationEffectiveStatementImpl.java @@ -68,7 +68,7 @@ public class LeafrefSpecificationEffectiveStatementImpl extends DeclaredEffectiv @Override public Object getDefaultValue() { - return this; + return null; } @Override diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/effective/build/test/EffectiveStatementTypeTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/effective/build/test/EffectiveStatementTypeTest.java index 98f6490b05..070db9e93a 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/effective/build/test/EffectiveStatementTypeTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/effective/build/test/EffectiveStatementTypeTest.java @@ -310,7 +310,7 @@ public class EffectiveStatementTypeTest { assertEquals("/container-test/leaf-test", leafrefEff.getPathStatement().toString()); assertNull(leafrefEff.getBaseType()); assertEquals("", leafrefEff.getUnits()); - assertEquals("leafref", ((LeafrefSpecificationEffectiveStatementImpl) leafrefEff.getDefaultValue()).argument()); + assertNull("leafref", leafrefEff.getDefaultValue()); assertNotNull(leafrefEff.toString()); assertEquals("leafref", leafrefEff.getQName().getLocalName()); assertEquals("CURRENT", leafrefEff.getStatus().toString()); @@ -497,4 +497,4 @@ public class EffectiveStatementTypeTest { assertEquals(1, stringEff.getLengthConstraints().size()); assertNotNull(stringEff.getPatternConstraints()); } -} \ No newline at end of file +} -- 2.36.6