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

Fix sporadic error in view log REST integration test #24360

Merged
merged 2 commits into from
Mar 28, 2023
Merged

Fix sporadic error in view log REST integration test #24360

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bcb808
Fix view log REST integration test
avpinchuk Mar 27, 2023
ada2bae
Change test assert conditions
avpinchuk Mar 27, 2023
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
46 changes: 40 additions & 6 deletions .../tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/LoggingRestITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package org.glassfish.main.admin.test.rest;

import java.util.Arrays;
import java.util.Map;

import jakarta.ws.rs.core.Response;
Expand All @@ -31,7 +32,9 @@
import static org.glassfish.main.itest.tools.GlassFishTestEnvironment.getAsadmin;
import static org.glassfish.main.itest.tools.asadmin.AsadminResultMatcher.asadminOK;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.emptyOrNullString;
import static org.hamcrest.Matchers.emptyString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
Expand Down Expand Up @@ -62,17 +65,29 @@ public void viewLog() {
// Read entire log
Response response = client.get(URL_VIEW_LOG);
assertThat(response.getStatus(), equalTo(200));

String content = response.readEntity(String.class).trim();
// Should not be empty
assertThat(response.readEntity(String.class), not(emptyOrNullString()));
assertThat(content, not(emptyString()));

// Get the entire URL to return the changes since the last call
String nextUrl = response.getHeaderString("X-Text-Append-Next");
assertThat(nextUrl, not(emptyOrNullString()));
String nextAppend = response.getHeaderString("X-Text-Append-Next");
assertThat(nextAppend, not(emptyOrNullString()));

// Because log unchanged, response should be empty
response = client.get(nextUrl);
// Because log unchanged, response should be empty.
// In rare cases it may contain a few records.
response = client.get(nextAppend);
assertThat(response.getStatus(), equalTo(200));
assertThat(response.readEntity(String.class), emptyOrNullString());

String newNextAppend = response.getHeaderString("X-Text-Append-Next");
assertThat(newNextAppend, not(emptyOrNullString()));

String newContent = response.readEntity(String.class).trim();
if (sameURIs(nextAppend, newNextAppend)) {
assertThat(newContent, emptyString());
} else {
assertThat(content, not(containsString(newContent.lines().findFirst().orElseThrow())));
}
}
}

Expand Down Expand Up @@ -106,6 +121,25 @@ static JSONArray getJsonArrayFrom(Response response, String name) throws Excepti
return readJsonObjectFrom(response).getJSONArray(name);
}

private static boolean sameURIs(String uri1, String uri2) {
// Fast path
if (uri1.equals(uri2)) {
return true;
}

// Compare only query params, because they may have
// a different order for each call (theoretically) and
// different value of the 'start' param.
// The rest parts of the URI is unchanged.
String[] queryParams1 = uri1.substring(uri1.indexOf('?') + 1).split("&");
String[] queryParams2 = uri2.substring(uri2.indexOf('?') + 1).split("&");

Arrays.sort(queryParams1);
Arrays.sort(queryParams2);

return Arrays.equals(queryParams1, queryParams2);
}

private static final class ViewLogClient extends DomainAdminRestClient {

public ViewLogClient() {
Expand Down