Add non-null getters for leaf objects

[mdsal.git] / binding / mdsal-binding-generator-impl / src / test / java / org / opendaylight / mdsal / binding / generator / impl / UsesTest.java

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UsesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UsesTest.java
index 621a3b3f1c99bdb1201c82c41ba4147bc6a0dfec..30596c02eaabae1de0df0014367171b05d804f16 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UsesTest.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UsesTest.java
@@ -105,10 +105,11 @@ public class UsesTest {
         // FIXME: split this into getter/default/static asserts
         assertEquals(4, caseC.getMethodDefinitions().size());
 
-        assertEquals("Number of method in GroupingCaseTest is incorrect", 2, groupingCaseTest.getMethodDefinitions()
+        assertEquals("Number of method in GroupingCaseTest is incorrect", 3, groupingCaseTest.getMethodDefinitions()
                 .size());
-        containsMethods(groupingCaseTest.getMethodDefinitions(), new NameTypePattern("getLeafGroupingCaseTest1",
-                "String"));
+        containsMethods(groupingCaseTest.getMethodDefinitions(),
+            new NameTypePattern("getLeafGroupingCaseTest1", "String"),
+            new NameTypePattern("requireLeafGroupingCaseTest1", "String"));
     }
 
     @Test
@@ -147,16 +148,20 @@ public class UsesTest {
 
         containsInterface("GroupingContainerTest", containerTest);
 
-        assertEquals("Number of method in GroupingContainerTestis incorrect", 3, groupingContainerTest
+        assertEquals("Number of method in GroupingContainerTestis incorrect", 5, groupingContainerTest
                 .getMethodDefinitions().size());
         // FIXME: split this into getter/default/static asserts
-        assertEquals(5, containerTest.getMethodDefinitions().size());
+        assertEquals(6, containerTest.getMethodDefinitions().size());
 
-        containsMethods(groupingContainerTest.getMethodDefinitions(), new NameTypePattern(
-                "getLeafGroupingContainerTest1", "String"), new NameTypePattern("getLeafGroupingContainerTest2",
-                "Uint8"));
+        containsMethods(groupingContainerTest.getMethodDefinitions(),
+            new NameTypePattern("getLeafGroupingContainerTest1", "String"),
+            new NameTypePattern("requireLeafGroupingContainerTest1", "String"),
+            new NameTypePattern("getLeafGroupingContainerTest2", "Uint8"),
+            new NameTypePattern("requireLeafGroupingContainerTest2", "Uint8"));
 
-        containsMethods(containerTest.getMethodDefinitions(), new NameTypePattern("getContainerLeafTest", "String"));
+        containsMethods(containerTest.getMethodDefinitions(),
+            new NameTypePattern("getContainerLeafTest", "String"),
+            new NameTypePattern("requireContainerLeafTest", "String"));
     }
 
     @Test
@@ -194,14 +199,17 @@ public class UsesTest {
 
         containsInterface("GroupingGroupingTest", groupingTest);
 
-        assertEquals("Number of method in GroupingGroupingTest is incorrect", 2, groupingGroupingTest
+        assertEquals("Number of method in GroupingGroupingTest is incorrect", 3, groupingGroupingTest
                 .getMethodDefinitions().size());
-        assertEquals("Number of method in GroupingTest is incorrect", 2, groupingTest.getMethodDefinitions().size());
+        assertEquals("Number of method in GroupingTest is incorrect", 3, groupingTest.getMethodDefinitions().size());
 
-        containsMethods(groupingGroupingTest.getMethodDefinitions(), new NameTypePattern("getLeafGroupingGrouping",
-                "String"));
+        containsMethods(groupingGroupingTest.getMethodDefinitions(),
+            new NameTypePattern("getLeafGroupingGrouping", "String"),
+            new NameTypePattern("requireLeafGroupingGrouping", "String"));
 
-        containsMethods(groupingTest.getMethodDefinitions(), new NameTypePattern("getLeafGroupingTest", "Byte"));
+        containsMethods(groupingTest.getMethodDefinitions(),
+            new NameTypePattern("getLeafGroupingTest", "Byte"),
+            new NameTypePattern("requireLeafGroupingTest", "Byte"));
     }
 
     @Test
@@ -261,19 +269,22 @@ public class UsesTest {
 
         containsInterface("GroupingListTest", listTest);
 
-        assertEquals("Number of method in GroupingListTest is incorrect", 6, groupingListTest.getMethodDefinitions()
+        assertEquals("Number of method in GroupingListTest is incorrect", 8, groupingListTest.getMethodDefinitions()
                 .size());
         // FIXME: split this into getter/default/static asserts
-        assertEquals(5, listTest.getMethodDefinitions().size());
+        assertEquals(6, listTest.getMethodDefinitions().size());
         // FIXME: split this into getter/default/static asserts
-        assertEquals(5, containerGroupingListTest.getMethodDefinitions().size());
+        assertEquals(6, containerGroupingListTest.getMethodDefinitions().size());
         // FIXME: split this into getter/default/static asserts
-        assertEquals(5, listGroupingListTest.getMethodDefinitions().size());
-
-        containsMethods(groupingListTest.getMethodDefinitions(), new NameTypePattern("getContainerGroupingListTest",
-                "ContainerGroupingListTest"), new NameTypePattern("getLeafGroupingListTest", "String"),
-                new NameTypePattern("getLeaffllistGroupingListTest", "List<String>"), new NameTypePattern(
-                        "getListGroupingListTest", "List<ListGroupingListTest>"));
+        assertEquals(6, listGroupingListTest.getMethodDefinitions().size());
+
+        containsMethods(groupingListTest.getMethodDefinitions(),
+            new NameTypePattern("getContainerGroupingListTest", "ContainerGroupingListTest"),
+            new NameTypePattern("getLeafGroupingListTest", "String"),
+            new NameTypePattern("requireLeafGroupingListTest", "String"),
+            new NameTypePattern("getLeaffllistGroupingListTest", "List<String>"),
+            new NameTypePattern("requireLeaffllistGroupingListTest", "List<String>"),
+            new NameTypePattern("getListGroupingListTest", "List<ListGroupingListTest>"));
         containsMethods(listTest.getMethodDefinitions(), new NameTypePattern("getListLeafTest", "String"));
         containsMethods(containerGroupingListTest.getMethodDefinitions(), new NameTypePattern(
                 "getLeafContainerGroupingListTest", "Uint8"));
@@ -319,11 +330,14 @@ public class UsesTest {
 
         assertEquals("Number of method in GroupingUsesModulData is incorrect", 0, groupingUsesModulData
                 .getMethodDefinitions().size());
-        assertEquals("Number of method in GroupingModulTest is incorrect", 3, groupingModulTest.getMethodDefinitions()
+        assertEquals("Number of method in GroupingModulTest is incorrect", 5, groupingModulTest.getMethodDefinitions()
                 .size());
 
-        containsMethods(groupingModulTest.getMethodDefinitions(), new NameTypePattern("getLeafGroupingModulTest",
-                "String"), new NameTypePattern("getLeafGroupingModulTest2", "Uint8"));
+        containsMethods(groupingModulTest.getMethodDefinitions(),
+            new NameTypePattern("getLeafGroupingModulTest", "String"),
+            new NameTypePattern("requireLeafGroupingModulTest", "String"),
+            new NameTypePattern("getLeafGroupingModulTest2", "Uint8"),
+            new NameTypePattern("requireLeafGroupingModulTest2", "Uint8"));
     }
 
     @Test
@@ -399,20 +413,21 @@ public class UsesTest {
         assertEquals(4, rpcTestInput.getMethodDefinitions().size());
         // FIXME: split this into getter/default/static asserts
         assertEquals(4, rpcTestOutput.getMethodDefinitions().size());
-        assertEquals("Number of method in GroupingRpcInputTest is incorrect", 3, groupingRpcInputTest
+        assertEquals("Number of method in GroupingRpcInputTest is incorrect", 4, groupingRpcInputTest
                 .getMethodDefinitions().size());
-        assertEquals("Number of method in GroupingRpcOutputTest is incorrect", 2, groupingRpcOutputTest
+        assertEquals("Number of method in GroupingRpcOutputTest is incorrect", 3, groupingRpcOutputTest
                 .getMethodDefinitions().size());
         // FIXME: split this into getter/default/static asserts
-        assertEquals(5, containerGroupingRpcInputTest.getMethodDefinitions().size());
-
-        containsMethods(groupingRpcInputTest.getMethodDefinitions(), new NameTypePattern(
-                "getContainerGroupingRpcInputTest", "ContainerGroupingRpcInputTest"), new NameTypePattern(
-                "getLeaflistGroupingRpcInputTest", "List<Uint8>"));
-        containsMethods(groupingRpcOutputTest.getMethodDefinitions(), new NameTypePattern(
-                "getLeafGroupingRpcOutputTest", "Byte"));
-        containsMethods(containerGroupingRpcInputTest.getMethodDefinitions(), new NameTypePattern(
-                "getLeafContainerGroupingRpcInputTest", "String"));
+        assertEquals(6, containerGroupingRpcInputTest.getMethodDefinitions().size());
+
+        containsMethods(groupingRpcInputTest.getMethodDefinitions(),
+            new NameTypePattern("getContainerGroupingRpcInputTest", "ContainerGroupingRpcInputTest"),
+            new NameTypePattern("getLeaflistGroupingRpcInputTest", "List<Uint8>"),
+            new NameTypePattern("requireLeaflistGroupingRpcInputTest", "List<Uint8>"));
+        containsMethods(groupingRpcOutputTest.getMethodDefinitions(),
+            new NameTypePattern("getLeafGroupingRpcOutputTest", "Byte"));
+        containsMethods(containerGroupingRpcInputTest.getMethodDefinitions(),
+            new NameTypePattern("getLeafContainerGroupingRpcInputTest", "String"));
     }
 
     @Test
@@ -454,11 +469,12 @@ public class UsesTest {
         assertEquals(4, containerAugment1.getMethodDefinitions().size());
         // FIXME: split this into getter/default/static asserts
         assertEquals(4, containerAugment1.getMethodDefinitions().size());
-        assertEquals("Number of method in GroupingCaseTest is incorrect", 2, groupingAugmentTest.getMethodDefinitions()
+        assertEquals("Number of method in GroupingCaseTest is incorrect", 3, groupingAugmentTest.getMethodDefinitions()
                 .size());
 
-        containsMethods(groupingAugmentTest.getMethodDefinitions(), new NameTypePattern("getLeafGroupingAugmentTest",
-                "String"));
+        containsMethods(groupingAugmentTest.getMethodDefinitions(),
+            new NameTypePattern("getLeafGroupingAugmentTest", "String"),
+            new NameTypePattern("requireLeafGroupingAugmentTest", "String"));
     }
 
     @Test
@@ -513,19 +529,21 @@ public class UsesTest {
         containsInterface("GroupingNotificationTest", notificationTest);
 
         // FIXME: split this into getter/default/static asserts
-        assertEquals(5, notificationTest.getMethodDefinitions().size());
-        assertEquals("Number of method in GroupingNotificationTest is incorrect", 3, groupingNotificationTest
+        assertEquals(6, notificationTest.getMethodDefinitions().size());
+        assertEquals("Number of method in GroupingNotificationTest is incorrect", 4, groupingNotificationTest
                 .getMethodDefinitions().size());
         // FIXME: split this into getter/default/static asserts
-        assertEquals(5, containerGroupingNotificationTest.getMethodDefinitions().size());
-
-        containsMethods(notificationTest.getMethodDefinitions(), new NameTypePattern("getLeafNotificationTest",
-                "String"));
-        containsMethods(groupingNotificationTest.getMethodDefinitions(), new NameTypePattern(
-                "getContainerGroupingNotificationTest", "ContainerGroupingNotificationTest"), new NameTypePattern(
-                "getLeaffllistGroupingNotificationTest", "List<String>"));
-        containsMethods(containerGroupingNotificationTest.getMethodDefinitions(), new NameTypePattern(
-                "getLeafContainerGroupingNotificationTest", "Uint32"));
+        assertEquals(6, containerGroupingNotificationTest.getMethodDefinitions().size());
+
+        containsMethods(notificationTest.getMethodDefinitions(),
+            new NameTypePattern("getLeafNotificationTest",  "String"));
+        containsMethods(groupingNotificationTest.getMethodDefinitions(),
+            new NameTypePattern("getContainerGroupingNotificationTest", "ContainerGroupingNotificationTest"),
+            new NameTypePattern("getLeaffllistGroupingNotificationTest", "List<String>"),
+            new NameTypePattern("requireLeaffllistGroupingNotificationTest", "List<String>"));
+        containsMethods(containerGroupingNotificationTest.getMethodDefinitions(),
+            new NameTypePattern("getLeafContainerGroupingNotificationTest", "Uint32"),
+            new NameTypePattern("requireLeafContainerGroupingNotificationTest", "Uint32"));
     }
 
 }