From: Robert Varga <rovarga@cisco.com>
Date: Thu, 22 Oct 2015 05:56:05 +0000 (+0200)
Subject: BUG-2399: fixup tests
X-Git-Tag: release/beryllium~211
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=269b334829b4793d9dfd4244294a35dc87bf5312

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 d83135ee64..401e468573 100644
--- 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 0834c73f64..ec1e5a1411 100644
--- 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 7ede0e65cb..93ace64fcc 100644
--- 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 5fbf470f09..a0bf157e35 100644
--- 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 17541fecab..2d7601e0b8 100644
--- 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
+}