[isis] branch master updated: ISIS-3315: adds test-case for ManagedObjects.NATURAL_NULL_FIRST comparator

[ahuber]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 2763905841 ISIS-3315: adds test-case for 
ManagedObjects.NATURAL_NULL_FIRST comparator
2763905841 is described below

commit 2763905841c9584ca98fbe0b3d2bcbad70d518fa
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Wed Dec 21 09:06:42 2022 +0100

    ISIS-3315: adds test-case for ManagedObjects.NATURAL_NULL_FIRST
    comparator
---
 .../core/metamodel/object/ManagedObjects.java      |   2 +-
 .../core/metamodel/object/ManagedObjectTest.java   | 121 +++++++++++++++++++++
 2 files changed, 122 insertions(+), 1 deletion(-)

diff --git 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ManagedObjects.java
 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ManagedObjects.java
index 270a565654..830393ea05 100644
--- 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ManagedObjects.java
+++ 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ManagedObjects.java
@@ -281,7 +281,7 @@ public final class ManagedObjects {
 
     // -- PREDEFINED COMPARATOR
 
-    private static final Comparator<ManagedObject> NATURAL_NULL_FIRST = new 
Comparator<ManagedObject>(){
+    static final Comparator<ManagedObject> NATURAL_NULL_FIRST = new 
Comparator<ManagedObject>(){
         @SuppressWarnings({"rawtypes" })
         @Override
         public int compare(final @Nullable ManagedObject a, final @Nullable 
ManagedObject b) {
diff --git 
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/object/ManagedObjectTest.java
 
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/object/ManagedObjectTest.java
index 6e951495ae..1912f933be 100644
--- 
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/object/ManagedObjectTest.java
+++ 
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/object/ManagedObjectTest.java
@@ -18,7 +18,11 @@
  */
 package org.apache.causeway.core.metamodel.object;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
@@ -30,6 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.causeway.applib.domain.DomainObjectList;
 import org.apache.causeway.commons.internal._Constants;
+import org.apache.causeway.commons.internal.base._NullSafe;
 import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
 import org.apache.causeway.core.metamodel.object.ManagedObject.Specialization;
 import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
@@ -124,4 +129,120 @@ class ManagedObjectTest {
 //        });
     }
 
+    @Test
+    void comparatorShouldNotViolateItsGeneralContract() {
+
+        val stringSpec = specLoader.specForTypeElseFail(String.class);
+
+        final String[] DATA = new String[] { "fn1....@vendor3.example.com", 
"fn2....@vendor4.example.com",
+                "fn3....@vendor6.example.com", "fn4....@vendor10.example.com", 
"fn5....@vendor6.example.com",
+                "fn6....@vendor4.example.com", "fn7....@vendor3.example.com", 
"fn8....@vendor4.example.com",
+                "fn9....@vendor9.example.com", 
"fn10.l...@vendor9.example.com", "fn11.l...@vendor8.example.com", null,
+                "fn13.l...@vendor5.example.com", 
"fn14.l...@vendor8.example.com", "fn15.l...@vendor6.example.com",
+                "fn16.l...@vendor6.example.com", 
"fn17.l...@vendor4.example.com", "fn18.l...@vendor5.example.com",
+                "fn19.l...@vendor3.example.com", 
"fn20.l...@vendor3.example.com", "fn21.l...@vendor8.example.com",
+                "fn22.l...@vendor8.example.com", 
"fn23.l...@vendor4.example.com", null, "fn25.l...@vendor9.example.com",
+                "fn26.l...@vendor10.example.com", 
"fn27.l...@vendor4.example.com", "fn28.l...@vendor9.example.com",
+                "fn29.l...@vendor8.example.com", 
"fn30.l...@vendor3.example.com", "fn31.l...@vendor4.example.com",
+                "fn32.l...@vendor4.example.com", 
"fn33.l...@vendor7.example.com", "fn34.l...@vendor10.example.com",
+                "fn35.l...@vendor7.example.com", null, 
"fn37.l...@vendor7.example.com", "fn38.l...@vendor1.example.com",
+                "fn39.l...@vendor10.example.com", 
"fn40.l...@vendor5.example.com", "fn41.l...@vendor9.example.com",
+                "fn42.l...@vendor9.example.com", 
"fn43.l...@vendor5.example.com", "fn44.l...@vendor6.example.com",
+                "fn45.l...@vendor1.example.com", 
"fn46.l...@vendor6.example.com", "fn47.l...@vendor5.example.com", null,
+                "fn49.l...@vendor4.example.com", 
"fn50.l...@vendor1.example.com", "fn51.l...@vendor8.example.com",
+                "fn52.l...@vendor3.example.com", 
"fn53.l...@vendor10.example.com", "fn54.l...@vendor5.example.com",
+                "fn55.l...@vendor4.example.com", 
"fn56.l...@vendor7.example.com", "fn57.l...@vendor4.example.com",
+                "fn58.l...@vendor5.example.com", 
"fn59.l...@vendor5.example.com", null, "fn234.ln...@vendor2.example.com",
+                "fn61.l...@vendor6.example.com", 
"fn62.l...@vendor2.example.com", "fn63.l...@vendor3.example.com",
+                "fn64.l...@vendor5.example.com", 
"fn65.l...@vendor6.example.com", "fn66.l...@vendor6.example.com",
+                "fn67.l...@vendor2.example.com", 
"fn68.l...@vendor4.example.com", "fn69.l...@vendor7.example.com",
+                "fn70.l...@vendor5.example.com", 
"fn71.l...@vendor8.example.com", null, "fn73.l...@vendor3.example.com",
+                "fn74.l...@vendor4.example.com", 
"fn75.l...@vendor6.example.com", "fn76.l...@vendor4.example.com",
+                "fn77.l...@vendor2.example.com", 
"fn78.l...@vendor5.example.com", "fn79.l...@vendor5.example.com",
+                "fn80.l...@vendor9.example.com", 
"fn81.l...@vendor2.example.com", "fn82.l...@vendor10.example.com",
+                "fn83.l...@vendor3.example.com", null, 
"fn85.l...@vendor9.example.com", "fn86.l...@vendor8.example.com",
+                "fn87.l...@vendor10.example.com", 
"fn88.l...@vendor7.example.com", "fn89.l...@vendor2.example.com",
+                "fn90.l...@vendor6.example.com", 
"fn91.l...@vendor10.example.com", "fn92.l...@vendor2.example.com",
+                "fn93.l...@vendor4.example.com", 
"fn94.l...@vendor7.example.com", "fn95.l...@vendor4.example.com", null,
+                "fn97.l...@vendor7.example.com", 
"fn98.l...@vendor10.example.com", "fn99.l...@vendor2.example.com",
+                "fn100.ln...@vendor5.example.com", 
"fn101.ln...@vendor8.example.com", "fn102.ln...@vendor4.example.com",
+                "fn103.ln...@vendor8.example.com", 
"fn104.ln...@vendor2.example.com", "fn105.ln...@vendor3.example.com",
+                "fn106.ln...@vendor10.example.com", 
"fn107.ln...@vendor9.example.com", null,
+                "fn109.ln...@vendor7.example.com", 
"fn110.ln...@vendor10.example.com", null,
+                "fn111.ln...@vendor1.example.com", 
"fn112.ln...@vendor10.example.com", "fn113.ln...@vendor8.example.com",
+                "fn114.ln...@vendor9.example.com", 
"fn115.ln...@vendor3.example.com", "fn116.ln...@vendor6.example.com",
+                "fn117.ln...@vendor2.example.com", 
"fn118.ln...@vendor9.example.com", "fn119.ln...@vendor9.example.com",
+                null, "fn121.ln...@vendor8.example.com", 
"fn122.ln...@vendor3.example.com",
+                "fn123.ln...@vendor8.example.com", 
"fn124.ln...@vendor4.example.com", "fn125.ln...@vendor5.example.com",
+                "fn126.ln...@vendor2.example.com", 
"fn127.ln...@vendor4.example.com", "fn128.ln...@vendor1.example.com",
+                "fn129.ln...@vendor4.example.com", 
"fn130.ln...@vendor8.example.com", "fn131.ln...@vendor10.example.com",
+                null, "fn133.ln...@vendor3.example.com", 
"fn134.ln...@vendor8.example.com",
+                "fn135.ln...@vendor4.example.com", 
"fn136.ln...@vendor7.example.com", "fn137.ln...@vendor1.example.com",
+                "fn138.ln...@vendor3.example.com", 
"fn139.ln...@vendor2.example.com", "fn140.ln...@vendor5.example.com",
+                "fn141.ln...@vendor9.example.com", 
"fn142.ln...@vendor8.example.com", "fn143.ln...@vendor10.example.com",
+                null, "fn145.ln...@vendor8.example.com", 
"fn146.ln...@vendor10.example.com",
+                "fn147.ln...@vendor3.example.com", 
"fn148.ln...@vendor9.example.com", "fn149.ln...@vendor2.example.com",
+                "fn150.ln...@vendor3.example.com", 
"fn151.ln...@vendor5.example.com", "fn152.ln...@vendor5.example.com",
+                "fn153.ln...@vendor6.example.com", 
"fn154.ln...@vendor9.example.com", "fn155.ln...@vendor4.example.com",
+                null, "fn157.ln...@vendor3.example.com", 
"fn158.ln...@vendor9.example.com",
+                "fn159.ln...@vendor8.example.com", 
"fn160.ln...@vendor9.example.com", "fn161.ln...@vendor5.example.com",
+                "fn162.ln...@vendor10.example.com", 
"fn163.ln...@vendor8.example.com", "fn164.ln...@vendor6.example.com",
+                "fn165.ln...@vendor2.example.com", 
"fn166.ln...@vendor3.example.com", "fn167.ln...@vendor7.example.com",
+                "fn169.ln...@vendor8.example.com", 
"fn170.ln...@vendor5.example.com", "fn171.ln...@vendor4.example.com",
+                "fn172.ln...@vendor5.example.com", 
"fn173.ln...@vendor3.example.com", "fn174.ln...@vendor8.example.com",
+                "fn175.ln...@vendor2.example.com", 
"fn176.ln...@vendor8.example.com", "fn177.ln...@vendor7.example.com",
+                "fn178.ln...@vendor9.example.com", 
"fn179.ln...@vendor10.example.com", null,
+                "fn181.ln...@vendor6.example.com", 
"fn182.ln...@vendor4.example.com", "fn183.ln...@vendor2.example.com",
+                "fn184.ln...@vendor3.example.com", 
"fn185.ln...@vendor9.example.com", "fn186.ln...@vendor3.example.com",
+                "fn187.ln...@vendor9.example.com", 
"fn188.ln...@vendor8.example.com", "fn189.ln...@vendor2.example.com",
+                "fn190.ln...@vendor10.example.com", 
"fn191.ln...@vendor3.example.com", null,
+                "fn193.ln...@vendor9.example.com", 
"fn194.ln...@vendor1.example.com", "fn195.ln...@vendor7.example.com",
+                "fn196.ln...@vendor3.example.com", 
"fn197.ln...@vendor5.example.com", "fn198.ln...@vendor2.example.com",
+                "fn199.ln...@vendor4.example.com", 
"fn200.ln...@vendor6.example.com", "fn201.ln...@vendor4.example.com",
+                "fn202.ln...@vendor1.example.com", 
"fn203.ln...@vendor2.example.com", null,
+                "fn205.ln...@vendor10.example.com", 
"fn206.ln...@vendor3.example.com", "fn207.ln...@vendor5.example.com",
+                "fn208.ln...@vendor6.example.com", 
"fn209.ln...@vendor9.example.com", "fn210.ln...@vendor5.example.com",
+                "fn211.ln...@vendor9.example.com", 
"fn212.ln...@vendor1.example.com", "fn213.ln...@vendor1.example.com",
+                "fn214.ln...@vendor6.example.com", 
"fn215.ln...@vendor10.example.com", null,
+                "fn217.ln...@vendor6.example.com", 
"fn218.ln...@vendor5.example.com", "fn219.ln...@vendor8.example.com",
+                "fn220.ln...@vendor4.example.com", 
"fn221.ln...@vendor7.example.com", "fn222.ln...@vendor2.example.com",
+                "fn223.ln...@vendor8.example.com", 
"fn224.ln...@vendor10.example.com", "fn225.ln...@vendor10.example.com",
+                "fn226.ln...@vendor6.example.com", 
"fn227.ln...@vendor6.example.com", null,
+                "fn229.ln...@vendor1.example.com", 
"fn230.ln...@vendor6.example.com", "fn231.ln...@vendor5.example.com",
+                "fn232.ln...@vendor3.example.com", 
"fn233.ln...@vendor10.example.com", "fn235.ln...@vendor7.example.com",
+                "fn236.ln...@vendor4.example.com", 
"fn237.ln...@vendor5.example.com", "fn238.ln...@vendor7.example.com",
+                "fn239.ln...@vendor5.example.com", null, 
"fn241.ln...@vendor5.example.com",
+                "fn242.ln...@vendor1.example.com", 
"fn243.ln...@vendor4.example.com", "fn244.ln...@vendor10.example.com",
+                "fn245.ln...@vendor3.example.com", 
"fn246.ln...@vendor3.example.com", "fn247.ln...@vendor3.example.com",
+                "fn248.ln...@vendor3.example.com", 
"fn249.ln...@vendor4.example.com", "fn250.ln...@vendor8.example.com",
+                "fn251.ln...@vendor10.example.com", null, 
"fn253.ln...@vendor8.example.com",
+                "fn254.ln...@vendor6.example.com", 
"fn255.ln...@vendor5.example.com", "fn256.ln...@vendor2.example.com",
+                "fn257.ln...@vendor1.example.com", 
"fn258.ln...@vendor9.example.com", "fn259.ln...@vendor6.example.com",
+                "fn260.ln...@vendor3.example.com", 
"fn261.ln...@vendor7.example.com", "fn262.ln...@vendor10.example.com",
+                "fn263.ln...@vendor1.example.com", null, 
"fn265.ln...@vendor10.example.com",
+                "fn266.ln...@vendor3.example.com", 
"fn267.ln...@vendor8.example.com", "fn268.ln...@vendor9.example.com",
+                "fn269.ln...@vendor8.example.com", 
"fn270.ln...@vendor7.example.com", "fn271.ln...@vendor1.example.com",
+                "fn272.ln...@vendor3.example.com", 
"fn273.ln...@vendor10.example.com", "fn274.ln...@vendor7.example.com",
+                "fn275.ln...@vendor8.example.com", null, 
"fn277.ln...@vendor4.example.com",
+                "fn278.ln...@vendor5.example.com", 
"fn279.ln...@vendor10.example.com", "fn280.ln...@vendor2.example.com",
+                "fn281.ln...@vendor2.example.com", 
"fn282.ln...@vendor4.example.com", "fn283.ln...@vendor2.example.com",
+                "fn284.ln...@vendor3.example.com", 
"fn285.ln...@vendor3.example.com", "fn286.ln...@vendor5.example.com",
+                "fn287.ln...@vendor7.example.com", null, 
"fn289.ln...@vendor8.example.com",
+                "fn290.ln...@vendor1.example.com", 
"fn291.ln...@vendor8.example.com", "fn292.ln...@vendor1.example.com",
+                "fn293.ln...@vendor3.example.com", 
"fn294.ln...@vendor8.example.com", "fn295.ln...@vendor7.example.com",
+                "fn296.ln...@vendor4.example.com", 
"fn297.ln...@vendor1.example.com", "fn298.ln...@vendor7.example.com",
+                "fn299.ln...@vendor9.example.com", null };
+
+        // given
+        final List<ManagedObject> managedObjects = _NullSafe.stream(DATA)
+                .map(sampleString->
+                    sampleString!=null
+                        ? ManagedObject.value(stringSpec, sampleString)
+                        : ManagedObject.empty(stringSpec))
+                .collect(Collectors.toList());
+
+        // when, then ... if broken throws java.lang.IllegalArgumentException: 
Comparison method violates its general contract!
+        managedObjects.sort(ManagedObjects.NATURAL_NULL_FIRST);
+    }
+
 }