Skip to content

Fix test assertions that depend on undefined row ordering #3007

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

Open
clayly wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix test assertions that depend on undefined row ordering #3007

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
6458a24
Fix test assertions that depend on undefined row ordering
clayly Apr 9, 2026
6aefd9e
Trigger ECA re-check
clayly Apr 9, 2026
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
2 changes: 1 addition & 1 deletion ...t-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/AutoAssignTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@ private void verifyOnlyUpdatableTargetsArePartOfAutoAssignment(final Runnable as
.as("Only updatable targets should be part of the rollout")
// all targets are distribution set type 2 compatible, but since user has UPDATE_TARGET only for targets of type 2
// only target2 and target3 shall be assigned
.containsExactly(target2Type2.getId(), target3Type2.getId());
.containsExactlyInAnyOrder(target2Type2.getId(), target3Type2.getId());
}
}
7 changes: 3 additions & 4 deletions ...src/test/java/org/eclipse/hawkbit/repository/jpa/management/ControllerManagementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,10 +1439,9 @@ void updatedExternalRefOnActionIsReallyUpdated() {
root.get(JpaAction_.externalRef).in(allExternalRef),
cb.equal(root.get(JpaAction_.active), true)
)).stream().map(Action.class::cast).toList();
assertThat(foundAction).isNotNull();
for (int i = 0; i < numberOfActions; i++) {
assertThat(foundAction.get(i).getId()).isEqualTo(allActionId.get(i));
}
assertThat(foundAction).isNotNull().hasSize(numberOfActions);
assertThat(foundAction).extracting(Action::getId)
.containsExactlyInAnyOrderElementsOf(allActionId);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions ...t/java/org/eclipse/hawkbit/repository/jpa/management/TargetFilterQueryManagementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ private void verifyFindByDistributionSetAndRsql(

private void verifyExpectedFilterQueriesInList(final Slice<TargetFilterQuery> tfqList,
final TargetFilterQuery... expectedFilterQueries) {
assertThat(tfqList.map(TargetFilterQuery::getId)).containsExactly(
assertThat(tfqList.map(TargetFilterQuery::getId)).containsExactlyInAnyOrder(
Arrays.stream(expectedFilterQueries).map(TargetFilterQuery::getId).toArray(Long[]::new));
}

Expand All @@ -536,7 +536,7 @@ private void verifyExpectedFilterQueriesInList(final Page<TargetFilterQuery> tfq
final TargetFilterQuery... expectedFilterQueries) {
assertThat(expectedFilterQueries).as("Target filter query count").hasSize((int) tfqList.getTotalElements());

assertThat(tfqList.map(TargetFilterQuery::getId)).containsExactly(
assertThat(tfqList.map(TargetFilterQuery::getId)).containsExactlyInAnyOrder(
Arrays.stream(expectedFilterQueries).map(TargetFilterQuery::getId).toArray(Long[]::new));
}

Expand Down