From a9f28207d5b3e04aa15c14c78f2b2f41216864b3 Mon Sep 17 00:00:00 2001 From: maxiaonan Date: Fri, 26 Jul 2019 14:00:01 +0800 Subject: [PATCH] =?UTF-8?q?Mod=20aaa-12=20fix=20domain=20handler=20test=20?= =?UTF-8?q?RCA=EF=BC=9A=20SOL=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E4=BA=BA?= =?UTF-8?q?=EF=BC=9Amaxiaonan=20=E6=A3=80=E8=A7=86=E4=BA=BA=EF=BC=9Amaxiao?= =?UTF-8?q?nan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shiro/idm/rest/test/DomainHandlerTest.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ControlPlatform/aaa/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/idm/rest/test/DomainHandlerTest.java b/ControlPlatform/aaa/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/idm/rest/test/DomainHandlerTest.java index 793ca1c31..a4c7c98d5 100644 --- a/ControlPlatform/aaa/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/idm/rest/test/DomainHandlerTest.java +++ b/ControlPlatform/aaa/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/idm/rest/test/DomainHandlerTest.java @@ -28,6 +28,7 @@ import org.opendaylight.aaa.api.model.Domain; import org.opendaylight.aaa.api.model.Domains; import org.opendaylight.aaa.api.model.IDMError; import org.opendaylight.aaa.api.model.Roles; +import org.opendaylight.aaa.shiro.idm.DomainHandler; public class DomainHandlerTest extends HandlerTest { @@ -63,12 +64,13 @@ public class DomainHandlerTest extends HandlerTest { clientResponse = target("/v1/domains").request().post(entity(domainData)); assertEquals(201, clientResponse.getStatus()); - // check update domain data domainData.put("name", "dom1Update"); clientResponse = target("/v1/domains/1").request().put(entity(domainData)); assertEquals(200, clientResponse.getStatus()); + + clientResponse = target("/v1/domains/101").request().put(entity(domainData)); assertEquals(404, clientResponse.getStatus()); @@ -170,6 +172,16 @@ public class DomainHandlerTest extends HandlerTest { clientResponse = target("/v1/domains/3/users/0/roles/0").request().delete(); assertEquals(404, clientResponse.getStatus()); + + // check delete grant for invalid user + clientResponse = target("/v1/domains/0/users/15/roles/0").request().delete(); + assertEquals(404, clientResponse.getStatus()); + + // check delete grant for invalid role + clientResponse = target("/v1/domains/0/users/0/roles/134").request().delete(); + assertEquals(404, clientResponse.getStatus()); + + // check delete domain clientResponse = target("/v1/domains/1").request().delete(); assertEquals(204, clientResponse.getStatus()); @@ -198,6 +210,7 @@ public class DomainHandlerTest extends HandlerTest { clientResponse = target("/v1/domains/1/users/0/roles").request().post(entity(grantData)); assertEquals(400, clientResponse.getStatus()); } + } /** * Revision history