From cbbd01005bf0cbeb133884b1785d763ba9e45ba3 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Mon, 25 Dec 2023 00:07:28 +0800 Subject: [PATCH] LPS-202515 SF/Rename --- .../resource/v1_0/test/GroupResourceTest.java | 2 +- .../rest/resource/v1_0/test/UserResourceTest.java | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/dxp/apps/scim/scim-rest-test/src/testIntegration/java/com/liferay/scim/rest/resource/v1_0/test/GroupResourceTest.java b/modules/dxp/apps/scim/scim-rest-test/src/testIntegration/java/com/liferay/scim/rest/resource/v1_0/test/GroupResourceTest.java index 191deb4826cc7b..d5cbfe75b5fa0d 100644 --- a/modules/dxp/apps/scim/scim-rest-test/src/testIntegration/java/com/liferay/scim/rest/resource/v1_0/test/GroupResourceTest.java +++ b/modules/dxp/apps/scim/scim-rest-test/src/testIntegration/java/com/liferay/scim/rest/resource/v1_0/test/GroupResourceTest.java @@ -102,7 +102,7 @@ public void testDeleteV2Group() throws Exception { _userGroupLocalService.fetchUserGroupByExternalReferenceCode( group.getExternalId(), TestPropsValues.getCompanyId())); - // Delete an existing group with no SCIM client ID set + // Delete an existing group with no SCIM client ID UserGroup userGroup = _userGroupLocalService.addUserGroup( TestPropsValues.getUserId(), TestPropsValues.getCompanyId(), diff --git a/modules/dxp/apps/scim/scim-rest-test/src/testIntegration/java/com/liferay/scim/rest/resource/v1_0/test/UserResourceTest.java b/modules/dxp/apps/scim/scim-rest-test/src/testIntegration/java/com/liferay/scim/rest/resource/v1_0/test/UserResourceTest.java index 8d110e7e31fd25..ce5999264cca4d 100644 --- a/modules/dxp/apps/scim/scim-rest-test/src/testIntegration/java/com/liferay/scim/rest/resource/v1_0/test/UserResourceTest.java +++ b/modules/dxp/apps/scim/scim-rest-test/src/testIntegration/java/com/liferay/scim/rest/resource/v1_0/test/UserResourceTest.java @@ -90,32 +90,31 @@ public void testDeleteV2User() throws Exception { assertHttpResponseStatusCode( 404, userResource.getV2UserByIdHttpResponse(user.getId())); - com.liferay.portal.kernel.model.User portalUser1 = + com.liferay.portal.kernel.model.User portalUser = _userLocalService.getUserByExternalReferenceCode( user.getExternalId(), TestPropsValues.getCompanyId()); - Assert.assertFalse(portalUser1.isActive()); + Assert.assertFalse(portalUser.isActive()); - // Delete an existing user with no SCIM client ID set + // Delete an existing user with no SCIM client ID - com.liferay.portal.kernel.model.User portalUser2 = - UserTestUtil.addUser(); + portalUser = UserTestUtil.addUser(); assertHttpResponseStatusCode( 404, userResource.deleteV2UserHttpResponse( - String.valueOf(portalUser2.getUserId()))); + String.valueOf(portalUser.getUserId()))); // Delete an existing user provided by another SCIM client ScimTestUtil.saveSCIMClientId( com.liferay.portal.kernel.model.User.class.getName(), - portalUser2.getUserId(), portalUser2.getCompanyId()); + portalUser.getUserId(), portalUser.getCompanyId()); assertHttpResponseStatusCode( 409, userResource.deleteV2UserHttpResponse( - String.valueOf(portalUser2.getUserId()))); + String.valueOf(portalUser.getUserId()))); } @Override