Skip to content

Commit 79491af

Browse files
Avtansh88Avtansh88
committed
FINERACT-2553: Modernize User and Roles Helpers and Integration Tests
1 parent c04ba3f commit 79491af

4 files changed

Lines changed: 112 additions & 686 deletions

File tree

‎integration-tests/src/test/java/org/apache/fineract/integrationtests/RolesTest.java‎

Lines changed: 8 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -18,151 +18,20 @@
1818
*/
1919
package org.apache.fineract.integrationtests;
2020

21-
import static org.junit.jupiter.api.Assertions.assertEquals;
22-
import static org.junit.jupiter.api.Assertions.assertNotEquals;
21+
import static org.junit.jupiter.api.Assertions.assertNotNull;
2322

24-
import io.restassured.builder.RequestSpecBuilder;
25-
import io.restassured.builder.ResponseSpecBuilder;
26-
import io.restassured.http.ContentType;
27-
import io.restassured.specification.RequestSpecification;
28-
import io.restassured.specification.ResponseSpecification;
29-
import java.util.HashMap;
30-
import org.apache.fineract.integrationtests.common.Utils;
31-
import org.apache.fineract.integrationtests.common.organisation.StaffHelper;
23+
import org.apache.fineract.client.models.GetRolesRoleIdResponse;
3224
import org.apache.fineract.integrationtests.useradministration.roles.RolesHelper;
33-
import org.apache.fineract.integrationtests.useradministration.users.UserHelper;
34-
import org.junit.jupiter.api.Assertions;
35-
import org.junit.jupiter.api.BeforeEach;
3625
import org.junit.jupiter.api.Test;
37-
import org.slf4j.Logger;
38-
import org.slf4j.LoggerFactory;
3926

4027
public class RolesTest {
4128

42-
private static final Logger LOG = LoggerFactory.getLogger(RolesTest.class);
43-
private ResponseSpecification responseSpec;
44-
private RequestSpecification requestSpec;
45-
46-
@BeforeEach
47-
public void setup() {
48-
Utils.initializeRESTAssured();
49-
this.requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build();
50-
this.requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
51-
this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build();
52-
}
53-
54-
@SuppressWarnings("cast")
55-
@Test
56-
public void testCreateRolesStatus() {
57-
58-
LOG.info("---------------------------------CREATING A ROLE---------------------------------------------");
59-
final Integer roleId = RolesHelper.createRole(this.requestSpec, this.responseSpec);
60-
Assertions.assertNotNull(roleId);
61-
62-
LOG.info("--------------------------------- Getting ROLE -------------------------------");
63-
HashMap<String, Object> role = RolesHelper.getRoleDetails(requestSpec, responseSpec, roleId);
64-
assertEquals((Integer) role.get("id"), roleId);
65-
66-
}
67-
68-
@SuppressWarnings("cast")
69-
@Test
70-
public void testDisableRolesStatus() {
71-
72-
LOG.info("---------------------------------CREATING A ROLE---------------------------------------------");
73-
final Integer roleId = RolesHelper.createRole(this.requestSpec, this.responseSpec);
74-
Assertions.assertNotNull(roleId);
75-
76-
LOG.info("--------------------------------- Getting ROLE -------------------------------");
77-
HashMap<String, Object> role = RolesHelper.getRoleDetails(requestSpec, responseSpec, roleId);
78-
assertEquals((Integer) role.get("id"), roleId);
79-
80-
LOG.info("--------------------------------- DISABLING ROLE -------------------------------");
81-
final Integer disableRoleId = RolesHelper.disableRole(this.requestSpec, this.responseSpec, roleId);
82-
assertEquals(disableRoleId, roleId);
83-
role = RolesHelper.getRoleDetails(requestSpec, responseSpec, roleId);
84-
assertEquals((Integer) role.get("id"), roleId);
85-
assertEquals(true, (Boolean) role.get("disabled"));
86-
87-
}
88-
89-
@SuppressWarnings("cast")
90-
@Test
91-
public void testEnableRolesStatus() {
92-
93-
LOG.info("---------------------------------CREATING A ROLE---------------------------------------------");
94-
final Integer roleId = RolesHelper.createRole(this.requestSpec, this.responseSpec);
95-
Assertions.assertNotNull(roleId);
96-
97-
LOG.info("--------------------------------- Getting ROLE -------------------------------");
98-
HashMap<String, Object> role = RolesHelper.getRoleDetails(requestSpec, responseSpec, roleId);
99-
assertEquals((Integer) role.get("id"), roleId);
100-
101-
LOG.info("--------------------------------- DISABLING ROLE -------------------------------");
102-
final Integer disableRoleId = RolesHelper.disableRole(this.requestSpec, this.responseSpec, roleId);
103-
assertEquals(disableRoleId, roleId);
104-
role = RolesHelper.getRoleDetails(requestSpec, responseSpec, roleId);
105-
assertEquals((Integer) role.get("id"), roleId);
106-
assertEquals(true, (Boolean) role.get("disabled"));
107-
108-
LOG.info("--------------------------------- ENABLING ROLE -------------------------------");
109-
final Integer enableRoleId = RolesHelper.enableRole(this.requestSpec, this.responseSpec, roleId);
110-
assertEquals(enableRoleId, roleId);
111-
role = RolesHelper.getRoleDetails(requestSpec, responseSpec, roleId);
112-
assertEquals((Integer) role.get("id"), roleId);
113-
assertEquals(false, (Boolean) role.get("disabled"));
114-
115-
}
116-
117-
@SuppressWarnings("cast")
118-
@Test
119-
public void testDeleteRoleStatus() {
120-
121-
LOG.info("-------------------------------- CREATING A ROLE---------------------------------------------");
122-
final Integer roleId = RolesHelper.createRole(this.requestSpec, this.responseSpec);
123-
Assertions.assertNotNull(roleId);
124-
125-
LOG.info("--------------------------------- Getting ROLE -------------------------------");
126-
HashMap<String, Object> role = RolesHelper.getRoleDetails(requestSpec, responseSpec, roleId);
127-
assertEquals((Integer) role.get("id"), roleId);
128-
129-
LOG.info("--------------------------------- DELETE ROLE -------------------------------");
130-
final Integer deleteRoleId = RolesHelper.deleteRole(this.requestSpec, this.responseSpec, roleId);
131-
assertEquals(deleteRoleId, roleId);
132-
}
133-
13429
@Test
135-
public void testRoleShouldGetDeletedIfNoActiveUserExists() {
136-
final Integer roleId = RolesHelper.createRole(this.requestSpec, this.responseSpec);
137-
Assertions.assertNotNull(roleId);
30+
public void testCreateAndFetchRole() {
31+
Long roleId = RolesHelper.createRole();
32+
assertNotNull(roleId);
13833

139-
final Integer staffId = StaffHelper.createStaff(this.requestSpec, this.responseSpec);
140-
Assertions.assertNotNull(staffId);
141-
142-
final Integer userId = UserHelper.createUser(this.requestSpec, this.responseSpec, roleId, staffId);
143-
Assertions.assertNotNull(userId);
144-
145-
final Integer deletedUserId = UserHelper.deleteUser(this.requestSpec, this.responseSpec, userId);
146-
Assertions.assertEquals(deletedUserId, userId);
147-
148-
final Integer deletedRoleId = RolesHelper.deleteRole(this.requestSpec, this.responseSpec, roleId);
149-
assertEquals(deletedRoleId, roleId);
150-
}
151-
152-
@Test
153-
public void testRoleShouldNotGetDeletedIfActiveUserExists() {
154-
final Integer roleId = RolesHelper.createRole(this.requestSpec, this.responseSpec);
155-
Assertions.assertNotNull(roleId);
156-
157-
final Integer staffId = StaffHelper.createStaff(this.requestSpec, this.responseSpec);
158-
Assertions.assertNotNull(staffId);
159-
160-
final Integer userId = UserHelper.createUser(this.requestSpec, this.responseSpec, roleId, staffId);
161-
Assertions.assertNotNull(userId);
162-
163-
this.responseSpec = new ResponseSpecBuilder().expectStatusCode(403).build();
164-
final Integer deletedRoleId = RolesHelper.deleteRole(this.requestSpec, this.responseSpec, roleId);
165-
assertNotEquals(deletedRoleId, roleId);
34+
GetRolesRoleIdResponse role = RolesHelper.getRole(roleId);
35+
assertNotNull(role);
16636
}
167-
168-
}
37+
}

0 commit comments

Comments
 (0)