Merge "Bug 1125: Added regression test"

[controller.git] / opendaylight / md-sal / sal-rest-connector / src / test / java / org / opendaylight / controller / sal / restconf / impl / test / RestGetAugmentedElementWhenEqualNamesTest.java

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetAugmentedElementWhenEqualNamesTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetAugmentedElementWhenEqualNamesTest.java
index 5650be57ce49dbb45719652fb31cd8ba8658d7ab..bab06e92451985b5a0d95032e99174adb91ba4b0 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetAugmentedElementWhenEqualNamesTest.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetAugmentedElementWhenEqualNamesTest.java
@@ -1,45 +1,54 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.controller.sal.restconf.impl.test;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.FileNotFoundException;
-import java.io.UnsupportedEncodingException;
-import java.net.URISyntaxException;
-
-import org.junit.Ignore;
+import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.opendaylight.controller.sal.restconf.impl.ControllerContext;
 import org.opendaylight.controller.sal.restconf.impl.InstanceIdWithSchemaNode;
-import org.opendaylight.controller.sal.restconf.impl.ResponseException;
+import org.opendaylight.controller.sal.restconf.impl.RestconfDocumentedException;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 public class RestGetAugmentedElementWhenEqualNamesTest {
 
-    @Ignore
-    @Test
-    public void getDataWithUrlMountPoint() throws UnsupportedEncodingException, URISyntaxException,
-            FileNotFoundException {
-        boolean exceptionCaught = false;
+    private static ControllerContext controllerContext = ControllerContext.getInstance();
+
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
 
+    @BeforeClass
+    public static void init() throws FileNotFoundException {
         SchemaContext schemaContextTestModule = TestUtils.loadSchemaContext("/common/augment/yang");
-        ControllerContext controllerContext = ControllerContext.getInstance();
         controllerContext.setSchemas(schemaContextTestModule);
+    }
 
+    @Test
+    public void augmentedNodesInUri() {
+        InstanceIdWithSchemaNode iiWithData = controllerContext.toInstanceIdentifier("main:cont/augment-main-a:cont1");
+        assertEquals("ns:augment:main:a", iiWithData.getSchemaNode().getQName().getNamespace().toString());
+        iiWithData = controllerContext.toInstanceIdentifier("main:cont/augment-main-b:cont1");
+        assertEquals("ns:augment:main:b", iiWithData.getSchemaNode().getQName().getNamespace().toString());
+    }
+
+    @Test
+    public void nodeWithoutNamespaceHasMoreAugments() {
         try {
-            InstanceIdWithSchemaNode instanceIdentifierA = controllerContext
-                    .toInstanceIdentifier("main:cont/augment-main-a:cont1");
-            InstanceIdWithSchemaNode instanceIdentifierB = controllerContext
-                    .toInstanceIdentifier("main:cont/augment-main-b:cont1");
-
-            assertEquals("ns:augment:main:a", instanceIdentifierA.getSchemaNode().getQName().getNamespace().toString());
-            assertEquals("ns:augment:main:b", instanceIdentifierB.getSchemaNode().getQName().getNamespace());
-        } catch (ResponseException e) {
-            exceptionCaught = true;
+            controllerContext.toInstanceIdentifier("main:cont/cont1");
+            fail("Expected exception");
+        } catch (RestconfDocumentedException e) {
+            assertTrue(e.getErrors().get(0).getErrorMessage().contains("is added as augment from more than one module"));
         }
-
-        assertFalse(exceptionCaught);
-
     }
-
 }