From f4955d8a6bc501092dc430f998d9c58e0be5e604 Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Thu, 25 Jun 2026 14:38:51 +0200 Subject: [PATCH] Ignore expression when asserting that sorts are equal --- .../data/standalone/entity/EntityTests.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tck/src/main/java/ee/jakarta/tck/data/standalone/entity/EntityTests.java b/tck/src/main/java/ee/jakarta/tck/data/standalone/entity/EntityTests.java index 5ce8dc5ca..7d075219a 100644 --- a/tck/src/main/java/ee/jakarta/tck/data/standalone/entity/EntityTests.java +++ b/tck/src/main/java/ee/jakarta/tck/data/standalone/entity/EntityTests.java @@ -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()); @@ -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 page1; @@ -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 sort = _AsciiChar.numericValue.desc(); AsciiCharacter[] found;