X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2Ftest%2FRestGetAugmentedElementWhenEqualNamesTest.java;h=856d8c006b6c40349d2a1fd646cc70db6bd5fd62;hb=783679071e01620bfc468cb9f9472f2a1030ae00;hp=53183c611cf54329d5555b2de8b56b01cedfdf0d;hpb=0552aa7d15d9482a9c24062786a743adca4ab74a;p=controller.git 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 53183c611c..856d8c006b 100644 --- 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 @@ -12,13 +12,12 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.FileNotFoundException; - 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.InstanceIdentifierContext; import org.opendaylight.controller.sal.restconf.impl.RestconfDocumentedException; import org.opendaylight.yangtools.yang.model.api.SchemaContext; @@ -37,7 +36,7 @@ public class RestGetAugmentedElementWhenEqualNamesTest { @Test public void augmentedNodesInUri() { - InstanceIdWithSchemaNode iiWithData = controllerContext.toInstanceIdentifier("main:cont/augment-main-a:cont1"); + InstanceIdentifierContext 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()); @@ -47,10 +46,9 @@ public class RestGetAugmentedElementWhenEqualNamesTest { public void nodeWithoutNamespaceHasMoreAugments() { try { controllerContext.toInstanceIdentifier("main:cont/cont1"); - fail( "Expected exception" ); + fail("Expected exception"); } catch (RestconfDocumentedException e) { - assertTrue(e.getErrors().get( 0 ).getErrorMessage().contains( - "is added as augment from more than one module")); + assertTrue(e.getErrors().get(0).getErrorMessage().contains("is added as augment from more than one module")); } } }