BUG-2399: fixup tests

The test model specifies the top-level container as structural, yet the
tests expect it to exist when empty. Mark the container as presence,
restoring behavior expected by tests.

Change-Id: Ided99720468a8bee14d5c66342e524450f5a9050
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/cars.yang b/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/cars.yang
index d83135e..401e468 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/cars.yang
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/cars.yang
@@ -8,6 +8,7 @@ module cars {
     }
 
     container cars {
+        presence "expected to exist when empty";
         list car {
             key name;
             leaf name {

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/odl-datastore-test.yang b/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/odl-datastore-test.yang
index 0834c73..ec1e5a1 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/odl-datastore-test.yang
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/odl-datastore-test.yang
@@ -8,6 +8,8 @@ module odl-datastore-test {
     }
 
     container test {
+        presence "needs to be present when empty";
+
         leaf name {
             type string;
         }
@@ -52,5 +54,6 @@ module odl-datastore-test {
     }
     
     container test2 {
+        presence "needs to be present when empty";
     }
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/people.yang b/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/people.yang
index 7ede0e6..93ace64 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/people.yang
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/people.yang
@@ -8,6 +8,7 @@ module people {
     }
 
     container people {
+        presence "expected to exist when empty";
         list person {
             key name;
             leaf name {

diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/resources/odl-datastore-test.yang b/opendaylight/md-sal/sal-dom-broker/src/test/resources/odl-datastore-test.yang
index 5fbf470..a0bf157 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/test/resources/odl-datastore-test.yang
+++ b/opendaylight/md-sal/sal-dom-broker/src/test/resources/odl-datastore-test.yang
@@ -8,6 +8,8 @@ module odl-datastore-test {
     }
 
     container test {
+        presence "needs to be present when empty";
+
         list outer-list {
             key id;
             leaf id {
@@ -42,4 +44,4 @@ module odl-datastore-test {
 
     container test2 {
     }
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/resources/odl-datastore-test.yang b/opendaylight/md-sal/sal-inmemory-datastore/src/test/resources/odl-datastore-test.yang
index 17541fe..2d7601e 100644 (file)
--- a/opendaylight/md-sal/sal-inmemory-datastore/src/test/resources/odl-datastore-test.yang
+++ b/opendaylight/md-sal/sal-inmemory-datastore/src/test/resources/odl-datastore-test.yang
@@ -8,6 +8,8 @@ module odl-datastore-test {
     }
 
     container test {
+        presence "needs to be present when empty";
+
         list outer-list {
             key id;
             leaf id {
@@ -39,4 +41,4 @@ module odl-datastore-test {
             }
         }
     }
-}
\ No newline at end of file
+}