Skip to content

Commit dad6602

Browse files
Stian Sigvartsennikki-pru
authored andcommitted
LPD-40838 Simplify test through combining all methods
1 parent 9f6aeb3 commit dad6602

File tree

1 file changed

+8
-28
lines changed
  • modules/dxp/apps/saml/saml-test/src/testIntegration/java/com/liferay/saml/opensaml/integration/processor/factory/test

1 file changed

+8
-28
lines changed

modules/dxp/apps/saml/saml-test/src/testIntegration/java/com/liferay/saml/opensaml/integration/processor/factory/test/UserProcessorFactoryTest.java

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.util.Map;
2626

2727
import org.junit.Assert;
28-
import org.junit.Before;
2928
import org.junit.ClassRule;
3029
import org.junit.Rule;
3130
import org.junit.Test;
@@ -42,53 +41,34 @@ public class UserProcessorFactoryTest {
4241
public static final LiferayIntegrationTestRule liferayIntegrationTestRule =
4342
new LiferayIntegrationTestRule();
4443

45-
@Before
46-
public void setUp() throws Exception {
44+
@Test
45+
public void testUserGroups() throws Exception {
4746
_user = UserTestUtil.addUser();
48-
4947
_userGroup = UserGroupTestUtil.addUserGroup();
5048

51-
_userGroupLocalService.addUserUserGroup(_user.getUserId(), _userGroup);
52-
}
53-
54-
@Test
55-
public void testUserAddsUserGroupsWhenMappedUserGroupComesInTheAssertion()
56-
throws Exception {
57-
58-
User processedUser = _processUser(
49+
_user = _processUser(
5950
HashMapBuilder.put(
6051
"membership:userGroups", new String[] {_userGroup.getName()}
6152
).build());
6253

6354
Assert.assertEquals(
6455
1,
65-
_userGroupLocalService.getUserUserGroupsCount(
66-
processedUser.getUserId()));
67-
}
56+
_userGroupLocalService.getUserUserGroupsCount(_user.getUserId()));
6857

69-
@Test
70-
public void testUserKeepsUserGroupsWhenMappingIsNotSet() throws Exception {
71-
User processedUser = _processUser(Collections.emptyMap());
58+
_user = _processUser(Collections.emptyMap());
7259

7360
Assert.assertEquals(
7461
1,
75-
_userGroupLocalService.getUserUserGroupsCount(
76-
processedUser.getUserId()));
77-
}
78-
79-
@Test
80-
public void testUserNotKeepsUserGroupsWhenMappedUserGroupNotComesInTheAssertion()
81-
throws Exception {
62+
_userGroupLocalService.getUserUserGroupsCount(_user.getUserId()));
8263

83-
User processedUser = _processUser(
64+
_user = _processUser(
8465
HashMapBuilder.put(
8566
"membership:userGroups", new String[0]
8667
).build());
8768

8869
Assert.assertEquals(
8970
0,
90-
_userGroupLocalService.getUserUserGroupsCount(
91-
processedUser.getUserId()));
71+
_userGroupLocalService.getUserUserGroupsCount(_user.getUserId()));
9272
}
9373

9474
private User _processUser(Map<String, String[]> attributesMap)

0 commit comments

Comments
 (0)