Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Integration Tests for Resolving App Branding after Deleting Org/ App Branding Preferences #20783

Merged
merged 2 commits into from
Jul 26, 2024
Merged

Add Integration Tests for Resolving App Branding after Deleting Org/ App Branding Preferences #20783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a395816
Add integration tests for resolving app branding after branding delet…
dhaura Jul 26, 2024
734268c
Bump branding mgt version.
dhaura Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
198 changes: 188 additions & 10 deletions .../server/branding/preference/management/v1/AppBrandingPreferenceManagementSuccessTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ public void testConclude() throws Exception {

super.conclude();
deleteTestApp(rootAppId);
deleteOrgBranding();
deleteOrganizations();
oAuth2RestClient.closeHttpClient();
orgMgtRestClient.closeHttpClient();
Expand Down Expand Up @@ -590,6 +589,39 @@ public void testDeleteL2AppBrandingPreference() throws Exception {
}

@Test(dependsOnMethods = {"testDeleteL2AppBrandingPreference"})
public void testResolveL2AppBrandingAfterL2AppBrandingDelete() throws Exception {

Response response = getResolvedAppBrandingInOrg(level2OrgId, level2AppId);
response.then()
.log().ifValidationFails()
.assertThat()
.statusCode(HttpStatus.SC_OK)
.body("type", equalTo(ORGANIZATION_TYPE))
.body("name", equalTo(level2OrgId))
.body("locale", equalTo(DEFAULT_LOCALE));

assertBrandingPreferences(ADD_L2_ORG_BRANDING_RESOURCE_FILE, response);
}

@Test(dependsOnMethods = {"testResolveL2AppBrandingAfterL2AppBrandingDelete"})
public void testResolveL2AppBrandingAfterL2OrgBrandingDelete() throws Exception {

// Delete level 2 organization's org-level branding preferences.
deleteOrgBrandingPreference(level2OrgId);

Response response = getResolvedAppBrandingInOrg(level2OrgId, level2AppId);
response.then()
.log().ifValidationFails()
.assertThat()
.statusCode(HttpStatus.SC_OK)
.body("type", equalTo(APPLICATION_TYPE))
.body("name", equalTo(level1AppId))
.body("locale", equalTo(DEFAULT_LOCALE));

assertBrandingPreferences(UPDATE_L1_APP_BRANDING_RESOURCE_FILE, response);
}

@Test(dependsOnMethods = {"testResolveL2AppBrandingAfterL2OrgBrandingDelete"})
public void testDeleteL1AppBrandingPreference() throws Exception {

RestAssured.basePath = buildTenantedBasePathForOrg(tenant);
Expand All @@ -603,6 +635,69 @@ public void testDeleteL1AppBrandingPreference() throws Exception {
}

@Test(dependsOnMethods = {"testDeleteL1AppBrandingPreference"})
public void testResolveL1AppBrandingAfterL1AppBrandingDelete() throws Exception {

Response response = getResolvedAppBrandingInOrg(level1OrgId, level1AppId);
response.then()
.log().ifValidationFails()
.assertThat()
.statusCode(HttpStatus.SC_OK)
.body("type", equalTo(ORGANIZATION_TYPE))
.body("name", equalTo(level1OrgId))
.body("locale", equalTo(DEFAULT_LOCALE));

assertBrandingPreferences(ADD_L1_ORG_BRANDING_RESOURCE_FILE, response);
}

@Test(dependsOnMethods = {"testResolveL1AppBrandingAfterL1AppBrandingDelete"})
public void testResolveL2AppBrandingAfterL1AppBrandingDelete() throws Exception {

Response response = getResolvedAppBrandingInOrg(level2OrgId, level2AppId);
response.then()
.log().ifValidationFails()
.assertThat()
.statusCode(HttpStatus.SC_OK)
.body("type", equalTo(ORGANIZATION_TYPE))
.body("name", equalTo(level1OrgId))
.body("locale", equalTo(DEFAULT_LOCALE));

assertBrandingPreferences(ADD_L1_ORG_BRANDING_RESOURCE_FILE, response);
}

@Test(dependsOnMethods = {"testResolveL2AppBrandingAfterL1AppBrandingDelete"})
public void testResolveL1AppBrandingAfterL1OrgBrandingDelete() throws Exception {

// Delete level 1 organization's org-level branding preferences.
deleteOrgBrandingPreference(level1OrgId);

Response response = getResolvedAppBrandingInOrg(level1OrgId, level1AppId);
response.then()
.log().ifValidationFails()
.assertThat()
.statusCode(HttpStatus.SC_OK)
.body("type", equalTo(APPLICATION_TYPE))
.body("name", equalTo(rootAppId))
.body("locale", equalTo(DEFAULT_LOCALE));

assertBrandingPreferences(UPDATE_ROOT_APP_BRANDING_RESOURCE_FILE, response);
}

@Test(dependsOnMethods = {"testResolveL1AppBrandingAfterL1OrgBrandingDelete"})
public void testResolveL2AppBrandingAfterL1OrgBrandingDelete() throws Exception {

Response response = getResolvedAppBrandingInOrg(level2OrgId, level2AppId);
response.then()
.log().ifValidationFails()
.assertThat()
.statusCode(HttpStatus.SC_OK)
.body("type", equalTo(APPLICATION_TYPE))
.body("name", equalTo(rootAppId))
.body("locale", equalTo(DEFAULT_LOCALE));

assertBrandingPreferences(UPDATE_ROOT_APP_BRANDING_RESOURCE_FILE, response);
}

@Test(dependsOnMethods = {"testResolveL2AppBrandingAfterL1OrgBrandingDelete"})
public void testDeleteRootAppBrandingPreference() throws IOException {

Response response = getResponseOfDelete(BRANDING_PREFERENCE_API_BASE_PATH + String.format
Expand All @@ -613,6 +708,98 @@ public void testDeleteRootAppBrandingPreference() throws IOException {
.statusCode(HttpStatus.SC_NO_CONTENT);
}

@Test(dependsOnMethods = {"testDeleteRootAppBrandingPreference"})
public void testGetRootAppBrandingAfterRootAppBrandingDelete() throws Exception {

Response response = getResponseOfGet(BRANDING_PREFERENCE_API_BASE_PATH + String.format
(PREFERENCE_COMPONENT_WITH_QUERY_PARAM, APPLICATION_TYPE, rootAppId, DEFAULT_LOCALE));
response.then()
.log().ifValidationFails()
.assertThat()
.statusCode(HttpStatus.SC_NOT_FOUND);
}

@Test(dependsOnMethods = {"testGetRootAppBrandingAfterRootAppBrandingDelete"})
public void testResolveRootAppBrandingAfterRootAppBrandingDelete() throws Exception {

Response response = getResponseOfGet(BRANDING_PREFERENCE_RESOLVE_PATH + String.format
(PREFERENCE_COMPONENT_WITH_QUERY_PARAM, APPLICATION_TYPE, rootAppId, DEFAULT_LOCALE));

response.then()
.log().ifValidationFails()
.assertThat()
.statusCode(HttpStatus.SC_OK)
.body("type", equalTo(ORGANIZATION_TYPE))
.body("name", equalTo(tenant))
.body("locale", equalTo(DEFAULT_LOCALE));

assertBrandingPreferences(ADD_ROOT_ORG_BRANDING_RESOURCE_FILE, response);
}

@Test(dependsOnMethods = {"testResolveRootAppBrandingAfterRootAppBrandingDelete"})
public void testResolveL1AppBrandingAfterRootAppBrandingDelete() throws Exception {

Response response = getResolvedAppBrandingInOrg(level1OrgId, level1AppId);
response.then()
.log().ifValidationFails()
.assertThat()
.statusCode(HttpStatus.SC_OK)
.body("type", equalTo(ORGANIZATION_TYPE))
.body("name", equalTo(tenant))
.body("locale", equalTo(DEFAULT_LOCALE));

assertBrandingPreferences(ADD_ROOT_ORG_BRANDING_RESOURCE_FILE, response);
}

@Test(dependsOnMethods = {"testResolveL1AppBrandingAfterRootAppBrandingDelete"})
public void testResolveL2AppBrandingAfterRootAppBrandingDelete() throws Exception {

Response response = getResolvedAppBrandingInOrg(level2OrgId, level2AppId);
response.then()
.log().ifValidationFails()
.assertThat()
.statusCode(HttpStatus.SC_OK)
.body("type", equalTo(ORGANIZATION_TYPE))
.body("name", equalTo(tenant))
.body("locale", equalTo(DEFAULT_LOCALE));

assertBrandingPreferences(ADD_ROOT_ORG_BRANDING_RESOURCE_FILE, response);
}

@Test(dependsOnMethods = {"testResolveL2AppBrandingAfterRootAppBrandingDelete"})
public void testResolveRootAppBrandingAfterRootOrgBrandingDelete() throws Exception {

// Delete root organization's org-level branding preferences.
deleteRootOrgBrandingPreference();

Response response = getResponseOfGet(BRANDING_PREFERENCE_RESOLVE_PATH + String.format
(PREFERENCE_COMPONENT_WITH_QUERY_PARAM, APPLICATION_TYPE, rootAppId, DEFAULT_LOCALE));
response.then()
.log().ifValidationFails()
.assertThat()
.statusCode(HttpStatus.SC_NOT_FOUND);
}

@Test(dependsOnMethods = {"testResolveRootAppBrandingAfterRootOrgBrandingDelete"})
public void testResolveL1AppBrandingAfterRootOrgBrandingDelete() throws Exception {

Response response = getResolvedAppBrandingInOrg(level1OrgId, level1AppId);
response.then()
.log().ifValidationFails()
.assertThat()
.statusCode(HttpStatus.SC_NOT_FOUND);
}

@Test(dependsOnMethods = {"testResolveL1AppBrandingAfterRootOrgBrandingDelete"})
public void testResolveL2AppBrandingAfterRootOrgBrandingDelete() throws Exception {

Response response = getResolvedAppBrandingInOrg(level2OrgId, level2AppId);
response.then()
.log().ifValidationFails()
.assertThat()
.statusCode(HttpStatus.SC_NOT_FOUND);
}

private void assertBrandingPreferences(String filename, Response response) throws Exception {

JSONObject expectedJSONResponse = new JSONObject(readResource(filename));
Expand All @@ -630,13 +817,6 @@ private void deleteOrganizations() throws Exception {
orgMgtRestClient.deleteOrganization(level1OrgId);
}

private void deleteOrgBranding() throws Exception {

deleteOrgBrandingPreference(level2OrgId);
deleteOrgBrandingPreference(level1OrgId);
deleteRootOrgBrandingPreference();
}

private void addRootOrgBrandingPreference() throws IOException, JSONException {

String body = readResource(ADD_ROOT_ORG_BRANDING_RESOURCE_FILE);
Expand Down Expand Up @@ -666,14 +846,12 @@ private void addOrgBrandingPreference(String orgId, String orgBrandingRequestBod

private void deleteRootOrgBrandingPreference() throws Exception {

RestAssured.basePath = basePath;
Response response = getResponseOfDelete(BRANDING_PREFERENCE_API_BASE_PATH + String.format
(PREFERENCE_COMPONENT_WITH_QUERY_PARAM, ORGANIZATION_TYPE, tenant, DEFAULT_LOCALE));
response.then()
.log().ifValidationFails()
.assertThat()
.statusCode(HttpStatus.SC_NO_CONTENT);
RestAssured.basePath = StringUtils.EMPTY;
}

private void deleteOrgBrandingPreference(String orgId) throws Exception {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2380,7 +2380,7 @@
<hashprovider.pbkdf2.version>0.1.7</hashprovider.pbkdf2.version>

<!-- Identity Branding Preference Management Versions -->
<identity.branding.preference.management.version>1.1.13</identity.branding.preference.management.version>
<identity.branding.preference.management.version>1.1.14</identity.branding.preference.management.version>

<!-- Identity REST API feature -->
<identity.api.dispatcher.version>2.0.17</identity.api.dispatcher.version>
Expand Down