Skip to content

Ignore expression when asserting that sorts are equal #1498

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

Closed
marko-bekhta wants to merge 1 commit into from
Closed

Ignore expression when asserting that sorts are equal #1498

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
19 changes: 13 additions & 6 deletions tck/src/main/java/ee/jakarta/tck/data/standalone/entity/EntityTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,13 @@ public void setup() {

private final DatabaseType type = TestProperty.databaseType.getDatabaseType();

private static void assertSortEqualsIgnoreExpression(Sort<?> expected, Sort<?> actual) {
assertEquals(expected.property(), actual.property(), "Sort property");
assertEquals(expected.isAscending(), actual.isAscending(), "Sort isAscending");
assertEquals(expected.ignoreCase(), actual.ignoreCase(), "Sort ignoreCase");
assertEquals(expected.nullOrdering(), actual.nullOrdering(), "Sort nullOrdering");
}

@Assertion(id = "136", strategy = "Ensures that the prepopulation step for readonly entities was successful")
public void ensureNaturalNumberPrepopulation() {
assertEquals(100L, numbers.countAll());
Expand Down Expand Up @@ -3134,9 +3141,9 @@ public void testSliceOfNothing() {

@Assertion(id = "133", strategy = "Use the StaticMetamodel to obtain ascending Sorts for an entity attribute in a type-safe manner.")
public void testStaticMetamodelAscendingSorts() {
assertEquals(Sort.asc("id"), _AsciiChar.id.asc());
assertEquals(Sort.ascIgnoreCase(_AsciiChar.HEXADECIMAL), _AsciiChar.hexadecimal.ascIgnoreCase());
assertEquals(Sort.ascIgnoreCase("thisCharacter"), _AsciiChar.thisCharacter.ascIgnoreCase());
assertSortEqualsIgnoreExpression(Sort.asc("id"), _AsciiChar.id.asc());
assertSortEqualsIgnoreExpression(Sort.ascIgnoreCase(_AsciiChar.HEXADECIMAL), _AsciiChar.hexadecimal.ascIgnoreCase());
assertSortEqualsIgnoreExpression(Sort.ascIgnoreCase("thisCharacter"), _AsciiChar.thisCharacter.ascIgnoreCase());

PageRequest pageRequest = PageRequest.ofSize(6);
Page<AsciiCharacter> page1;
Expand Down Expand Up @@ -3209,9 +3216,9 @@ public void testStaticMetamodelAttributeNamesPreGenerated() {

@Assertion(id = "133", strategy = "Use the StaticMetamodel to obtain descending Sorts for an entity attribute a type-safe manner.")
public void testStaticMetamodelDescendingSorts() {
assertEquals(Sort.desc(_AsciiChar.ID), _AsciiChar.id.desc());
assertEquals(Sort.descIgnoreCase("hexadecimal"), _AsciiChar.hexadecimal.descIgnoreCase());
assertEquals(Sort.descIgnoreCase("thisCharacter"), _AsciiChar.thisCharacter.descIgnoreCase());
assertSortEqualsIgnoreExpression(Sort.desc(_AsciiChar.ID), _AsciiChar.id.desc());
assertSortEqualsIgnoreExpression(Sort.descIgnoreCase("hexadecimal"), _AsciiChar.hexadecimal.descIgnoreCase());
assertSortEqualsIgnoreExpression(Sort.descIgnoreCase("thisCharacter"), _AsciiChar.thisCharacter.descIgnoreCase());

Sort<AsciiCharacter> sort = _AsciiChar.numericValue.desc();
AsciiCharacter[] found;
Expand Down