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

chore: Update flaky datastore test #17731

Merged
merged 1 commit into from
Jun 7, 2024
Merged

chore: Update flaky datastore test #17731

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 10 additions & 14 deletions dhis-2/dhis-test-e2e/src/test/java/org/hisp/dhis/datastore/DatastoreKeysTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
*/
package org.hisp.dhis.datastore;

import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasItem;

import com.google.gson.JsonObject;
import org.hisp.dhis.ApiTest;
Expand Down Expand Up @@ -93,8 +95,7 @@ void testDatastoreSharing_DefaultPublicAccess_BasicUser() {
.get("/" + NAMESPACE, params)
.validate()
.statusCode(200)
.body("entries[0].key", equalTo("arsenal"))
.body("entries[1].key", equalTo("spurs"));
.body("entries.key", allOf(hasItem("arsenal"), hasItem("spurs")));
}

@Test
Expand Down Expand Up @@ -122,8 +123,7 @@ void testDatastoreSharing_NoPublicAccess_SuperUser() {
.get("/" + NAMESPACE, params)
.validate()
.statusCode(200)
.body("entries[0].key", equalTo("arsenal"))
.body("entries[1].key", equalTo("spurs"));
.body("entries.key", allOf(hasItem("arsenal"), hasItem("spurs")));
}

@Test
Expand Down Expand Up @@ -188,8 +188,7 @@ void testDatastoreUserSharing_NoPublicAccess_UserHasAccess() {
.get("/" + NAMESPACE, fieldsParam)
.validate()
.statusCode(200)
.body("entries[0].key", equalTo("arsenal"))
.body("entries[1].key", equalTo("spurs"));
.body("entries.key", allOf(hasItem("arsenal"), hasItem("spurs")));
}

@Test
Expand Down Expand Up @@ -226,7 +225,7 @@ void testDatastoreUserSharing_NoPublicAccess_UserHasSomeAccess() {
.get("/" + NAMESPACE, fieldsParam)
.validate()
.statusCode(200)
.body("entries[0].key", equalTo("spurs"))
.body("entries.key", allOf(hasItem("spurs")))
.body("entries.size()", equalTo(1));
}

Expand Down Expand Up @@ -262,8 +261,7 @@ void testDatastoreUserGroupSharing_NoPublicAccess_UserHasAccess() {
.get("/" + NAMESPACE, fieldsParam)
.validate()
.statusCode(200)
.body("entries[0].key", equalTo("arsenal"))
.body("entries[1].key", equalTo("spurs"));
.body("entries.key", allOf(hasItem("arsenal"), hasItem("spurs")));
}

@Test
Expand Down Expand Up @@ -301,7 +299,7 @@ void testDatastoreUserGroupSharing_NoPublicAccess_UserHasSomeAccess() {
.get("/" + NAMESPACE, fieldsParam)
.validate()
.statusCode(200)
.body("entries[0].key", equalTo("arsenal"))
.body("entries.key", allOf(hasItem("arsenal")))
.body("entries.size()", equalTo(1));
}

Expand Down Expand Up @@ -352,8 +350,7 @@ void testDatastoreOwnerSharing_NoPublicAccess_UserHasAccess_KeysEndpoint() {
.get("/" + NAMESPACE + "/keys")
.validate()
.statusCode(200)
.body("[0]", equalTo("arsenal"))
.body("[1]", equalTo("spurs"));
.body("$", allOf(hasItem("arsenal"), hasItem("spurs")));
}

@Test
Expand All @@ -370,8 +367,7 @@ void testDatastoreUserSharing_DefaultPublicAccess_KeysEndpoint() {
.get("/" + NAMESPACE + "/keys")
.validate()
.statusCode(200)
.body("[0]", equalTo("arsenal"))
.body("[1]", equalTo("spurs"));
.body("$", allOf(hasItem("arsenal"), hasItem("spurs")));
}

protected static JsonObject getEntry(String team) {
Expand Down
Loading