Cleanup DocumentedNode

[yangtools.git] / yang / yang-parser-impl / src / test / java / org / opendaylight / yangtools / yang / stmt / YangParserSimpleTest.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java
index 6a072559b1e2f0702991ccb85cac92dc742ed542..4ea6c6d2bd8e57e1510eac7f7b0826302c5d5b09 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java
@@ -16,6 +16,7 @@ import static org.junit.Assert.assertTrue;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
@@ -63,35 +64,33 @@ public class YangParserSimpleTest {
 
         // test SchemaNode args
         assertEquals(QName.create(SN, "data"), data.getQName());
-        assertEquals("anyxml desc", data.getDescription());
-        assertEquals("data ref", data.getReference());
+        assertEquals(Optional.of("anyxml desc"), data.getDescription());
+        assertEquals(Optional.of("data ref"), data.getReference());
         assertEquals(Status.OBSOLETE, data.getStatus());
         assertEquals(0, data.getUnknownSchemaNodes().size());
         // test DataSchemaNode args
         assertFalse(data.isAugmenting());
         assertFalse(data.isConfiguration());
         final ConstraintDefinition constraints = data.getConstraints();
-        assertEquals("class != 'wheel'", constraints.getWhenCondition().toString());
+        assertEquals("class != 'wheel'", constraints.getWhenCondition().get().toString());
         final Set<MustDefinition> mustConstraints = constraints.getMustConstraints();
         assertEquals(2, constraints.getMustConstraints().size());
 
         final String must1 = "ifType != 'ethernet' or (ifType = 'ethernet' and ifMTU = 1500)";
-        final String errMsg1 = "An ethernet MTU must be 1500";
         final String must2 = "ifType != 'atm' or (ifType = 'atm' and ifMTU <= 17966 and ifMTU >= 64)";
-        final String errMsg2 = "An atm MTU must be  64 .. 17966";
 
         boolean found1 = false;
         boolean found2 = false;
         for (final MustDefinition must : mustConstraints) {
             if (must1.equals(must.toString())) {
                 found1 = true;
-                assertEquals(errMsg1, must.getErrorMessage());
+                assertEquals(Optional.of("An ethernet MTU must be 1500"), must.getErrorMessage());
             } else if (must2.equals(must.toString())) {
                 found2 = true;
-                assertEquals(errMsg2, must.getErrorMessage());
-                assertEquals("anyxml data error-app-tag", must.getErrorAppTag());
-                assertEquals("an error occured in data", must.getDescription());
-                assertEquals("data must ref", must.getReference());
+                assertEquals(Optional.of("An atm MTU must be  64 .. 17966"), must.getErrorMessage());
+                assertEquals(Optional.of("anyxml data error-app-tag"), must.getErrorAppTag());
+                assertEquals(Optional.of("an error occured in data"), must.getDescription());
+                assertEquals(Optional.of("data must ref"), must.getReference());
             }
         }
         assertTrue(found1);
@@ -109,8 +108,8 @@ public class YangParserSimpleTest {
         // test SchemaNode args
         assertEquals(SN_NODES, nodes.getQName());
         assertEquals(SN_NODES_PATH, nodes.getPath());
-        assertEquals("nodes collection", nodes.getDescription());
-        assertEquals("nodes ref", nodes.getReference());
+        assertEquals(Optional.of("nodes collection"), nodes.getDescription());
+        assertEquals(Optional.of("nodes ref"), nodes.getReference());
         assertEquals(Status.CURRENT, nodes.getStatus());
         assertEquals(0, nodes.getUnknownSchemaNodes().size());
         // test DataSchemaNode args
@@ -119,7 +118,7 @@ public class YangParserSimpleTest {
 
         // constraints
         final ConstraintDefinition constraints = nodes.getConstraints();
-        assertEquals("class != 'wheel'", constraints.getWhenCondition().toString());
+        assertEquals("class != 'wheel'", constraints.getWhenCondition().get().toString());
         final Set<MustDefinition> mustConstraints = constraints.getMustConstraints();
         assertEquals(2, constraints.getMustConstraints().size());
 
@@ -132,13 +131,13 @@ public class YangParserSimpleTest {
         for (final MustDefinition must : mustConstraints) {
             if (must1.equals(must.toString())) {
                 found1 = true;
-                assertEquals(errMsg1, must.getErrorMessage());
+                assertEquals(Optional.of(errMsg1), must.getErrorMessage());
             } else if (must2.equals(must.toString())) {
                 found2 = true;
-                assertNull(must.getErrorMessage());
-                assertNull(must.getErrorAppTag());
-                assertNull(must.getDescription());
-                assertNull(must.getReference());
+                assertFalse(must.getErrorMessage().isPresent());
+                assertFalse(must.getErrorAppTag().isPresent());
+                assertFalse(must.getDescription().isPresent());
+                assertFalse(must.getReference().isPresent());
             }
         }
         assertTrue(found1);
@@ -156,8 +155,8 @@ public class YangParserSimpleTest {
         final QName typedefQName = QName.create(SN, "nodes-type");
         assertEquals(typedefQName, nodesType.getQName());
         assertEquals(SN_NODES_PATH.createChild(QName.create(SN, "nodes-type")), nodesType.getPath());
-        assertNull(nodesType.getDescription());
-        assertNull(nodesType.getReference());
+        assertFalse(nodesType.getDescription().isPresent());
+        assertFalse(nodesType.getReference().isPresent());
         assertEquals(Status.CURRENT, nodesType.getStatus());
         assertEquals(0, nodesType.getUnknownSchemaNodes().size());