From de729828fea23328647b2cc169fad665e9934bee Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 18 Nov 2020 13:33:10 +0100 Subject: [PATCH] Fix get{Min,Max}Elements() usage These return a nullable, UTs should be using assertEquals(Object, Object) to compare them. Change-Id: I6d6aefc94695c5118b4ec4552f64bb45b45dcdc8 Signed-off-by: Robert Varga --- .../org/opendaylight/yangtools/yang/stmt/Bug9244Test.java | 5 ++--- .../yangtools/yang/stmt/DeviationResolutionTest.java | 8 ++++---- .../yang/stmt/EffectiveUsesRefineAndConstraintsTest.java | 8 ++++---- .../opendaylight/yangtools/yang/stmt/GroupingTest.java | 2 +- .../org/opendaylight/yangtools/yang/stmt/ListTest.java | 5 ++--- .../opendaylight/yangtools/yang/stmt/YangParserTest.java | 4 ++-- .../yangtools/yang/stmt/YangParserWithContextTest.java | 4 ++-- 7 files changed, 17 insertions(+), 19 deletions(-) diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9244Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9244Test.java index 768183cd21..2f959bb5b6 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9244Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9244Test.java @@ -5,7 +5,6 @@ * 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.stmt; import static org.junit.Assert.assertEquals; @@ -40,8 +39,8 @@ public class Bug9244Test { QName.create(barModule.getQNameModule(), "bar-leaf-list")); assertNotNull(barLeafList); final ElementCountConstraint constraint = barLeafList.getElementCountConstraint().get(); - assertEquals(5, constraint.getMinElements().intValue()); - assertEquals(10, constraint.getMaxElements().intValue()); + assertEquals((Object) 5, constraint.getMinElements()); + assertEquals((Object) 10, constraint.getMaxElements()); final LeafSchemaNode barLeaf = (LeafSchemaNode) barModule.getDataChildByName( QName.create(barModule.getQNameModule(), "bar-leaf")); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java index c3292d8f0f..77170fe94b 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java @@ -90,8 +90,8 @@ public class DeviationResolutionTest { assertEquals(3, myLeafList.getDefaults().size()); final ElementCountConstraint constraint = myLeafList.getElementCountConstraint().get(); - assertEquals(10, constraint.getMaxElements().intValue()); - assertEquals(5, constraint.getMinElements().intValue()); + assertEquals((Object) 10, constraint.getMaxElements()); + assertEquals((Object) 5, constraint.getMinElements()); assertNotNull(myLeafList.getType().getUnits()); final ListSchemaNode myList = (ListSchemaNode) barModule.getDataChildByName( @@ -149,8 +149,8 @@ public class DeviationResolutionTest { assertNotNull(myLeafList); final ElementCountConstraint constraint = myLeafList.getElementCountConstraint().get(); - assertEquals(6, constraint.getMaxElements().intValue()); - assertEquals(3, constraint.getMinElements().intValue()); + assertEquals((Object) 6, constraint.getMaxElements()); + assertEquals((Object) 3, constraint.getMinElements()); assertTrue(myLeafList.isConfiguration()); final ChoiceSchemaNode myChoice = (ChoiceSchemaNode) barModule.getDataChildByName( diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java index 01d5d77122..ef6dcd8758 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java @@ -106,8 +106,8 @@ public class EffectiveUsesRefineAndConstraintsTest { assertFalse(listSchemaNode.isConfiguration()); ElementCountConstraint listConstraints = listSchemaNode.getElementCountConstraint().get(); - assertEquals(10, listConstraints.getMinElements().intValue()); - assertEquals(20, listConstraints.getMaxElements().intValue()); + assertEquals((Object) 10, listConstraints.getMinElements()); + assertEquals((Object) 20, listConstraints.getMaxElements()); assertEquals(1, listSchemaNode.getMustConstraints().size()); } @@ -141,8 +141,8 @@ public class EffectiveUsesRefineAndConstraintsTest { assertTrue(listSchemaNode.isConfiguration()); ElementCountConstraint listConstraints = listSchemaNode.getElementCountConstraint().get(); - assertEquals(5, listConstraints.getMinElements().intValue()); - assertEquals(7, listConstraints.getMaxElements().intValue()); + assertEquals((Object) 5, listConstraints.getMinElements()); + assertEquals((Object) 7, listConstraints.getMaxElements()); assertEquals(2, listSchemaNode.getMustConstraints().size()); } } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java index dec90ae129..75e53e5a5e 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java @@ -124,7 +124,7 @@ public class GroupingTest { assertFalse(refineList.isConfiguration()); final ElementCountConstraint constraint = refineList.getElementCountConstraint().get(); - assertEquals(2, constraint.getMinElements().intValue()); + assertEquals((Object) 2, constraint.getMinElements()); assertNull(constraint.getMaxElements()); // leaf id diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ListTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ListTest.java index c8479e0b77..2a4c44ca76 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ListTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ListTest.java @@ -5,7 +5,6 @@ * 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.stmt; import static org.junit.Assert.assertEquals; @@ -52,8 +51,8 @@ public class ListTest { assertEquals("key2", keys.get(1).getLocalName()); ElementCountConstraint constraint = list.getElementCountConstraint().get(); - assertEquals(1, constraint.getMinElements().intValue()); - assertEquals(10, constraint.getMaxElements().intValue()); + assertEquals((Object) 1, constraint.getMinElements()); + assertEquals((Object) 10, constraint.getMaxElements()); assertEquals(5, list.getChildNodes().size()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java index cb5ad927d0..517e58fb73 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java @@ -139,8 +139,8 @@ public class YangParserTest { // assertNull(constraints.getWhenCondition()); assertEquals(0, ifEntry.getMustConstraints().size()); ElementCountConstraint constraints = ifEntry.getElementCountConstraint().get(); - assertEquals(1, constraints.getMinElements().intValue()); - assertEquals(11, constraints.getMaxElements().intValue()); + assertEquals((Object) 1, constraints.getMinElements()); + assertEquals((Object) 11, constraints.getMaxElements()); // test AugmentationTarget args final Collection availableAugmentations = ifEntry.getAvailableAugmentations(); assertEquals(2, availableAugmentations.size()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java index 48dbcb6505..d10119b1e9 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java @@ -268,8 +268,8 @@ public class YangParserWithContextTest { assertEquals(Optional.of("addresses reference added by refine"), refineList.getReference()); assertFalse(refineList.isConfiguration()); final ElementCountConstraint constraint = refineList.getElementCountConstraint().get(); - assertEquals(2, constraint.getMinElements().intValue()); - assertEquals(12, constraint.getMaxElements().intValue()); + assertEquals((Object) 2, constraint.getMinElements()); + assertEquals((Object) 12, constraint.getMaxElements()); } @Test -- 2.36.6