Fix yang-library.json

The JSON file should match the XML file, but the assertions are being
made on the XML content twice. Fix that typo and make sure JSON has the
correct content.

Change-Id: I74f260d062a8129c6446d3a509f093909da87075
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemasTest.java b/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemasTest.java
index 018b341e825e433506ede1acb8b95a88cc0d770e..ce0d1c4e74c443201fcbe6f6e65dc7a9cd5b2746 100644 (file)
--- a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemasTest.java
+++ b/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemasTest.java
@@ -29,7 +29,7 @@ public class LibraryModulesSchemasTest {
         LibraryModulesSchemas libraryModuleSchemas =
                 LibraryModulesSchemas.create(getClass().getResource("/yang-library.json").toString());
 
-        verifySchemas(libraryModulesSchemas);
+        verifySchemas(libraryModuleSchemas);
     }
 
     private static void verifySchemas(final LibraryModulesSchemas libraryModulesSchemas) throws MalformedURLException {

diff --git a/plugins/sal-netconf-connector/src/test/resources/yang-library.json b/plugins/sal-netconf-connector/src/test/resources/yang-library.json
index 0b08c0d705ea5bbd84f1b95089b6b579facbaaf7..c5ed58300325a84c962f00870c4d980e9a5f3136 100644 (file)
--- a/plugins/sal-netconf-connector/src/test/resources/yang-library.json
+++ b/plugins/sal-netconf-connector/src/test/resources/yang-library.json
@@ -5,20 +5,20 @@
         "name": "module-with-revision",
         "revision": "2014-04-08",
         "schema": "http://localhost:8181/yanglib/schemas/module-with-revision/2014-04-08",
-        "namespace": "bla"
+        "namespace": "namespace"
       },
       {
         "name": "another-module-with-revision",
-        "revision": "2014-06-08",
-        "namespace": "test",
+        "revision": "2013-10-21",
+        "namespace": "another-module-with-revision:namespace",
         "schema": "http://localhost:8181/yanglib/schemas/another-module-with-revision/2013-10-21"
       },
       {
         "name": "module-without-revision",
         "revision": "",
         "namespace": "namespace:module-without-revision",
-        "schema": "http://localhost:8181/yanglib/schemas/module-without-revision/2013-10-21"
+        "schema": "http://localhost:8181/yanglib/schemas/module-without-revision/"
       }
     ]
   }
-}
\ No newline at end of file
+}