Merge pull request #1625 from yonghanlin/fix/nondeterminism_tests

elucash · web-flow · commit bb2053149580 · 2025-12-08T13:02:14.000-05:00
Fix: fix four non-deterministic tests
diff --git a/criteria/geode/test/org/immutables/criteria/geode/BindVariableConverterTest.java b/criteria/geode/test/org/immutables/criteria/geode/BindVariableConverterTest.java
@@ -74,7 +74,7 @@ void set() {
     check(s1).isA(HashSet.class);
 
     Set<String> s2 = (Set<String>) converter.apply(ImmutableSet.of("a", "b"));
-    check(s2).isOf("a", "b");
+    check(s2).hasContentInAnyOrder("a", "b");
     check(s2).isA(HashSet.class);
   }
 
diff --git a/criteria/mongo/test/org/immutables/criteria/mongo/bson4jackson/JacksonCodecsTest.java b/criteria/mongo/test/org/immutables/criteria/mongo/bson4jackson/JacksonCodecsTest.java
@@ -170,17 +170,60 @@ private static <T> T writeThenRead(CodecRegistry registry, ObjectMapper mapper,
   @JsonSerialize(as = ImmutableBsonModel.class)
   @JsonDeserialize(as = ImmutableBsonModel.class)
   interface BsonModel {
-      java.util.Date utilDate();
-      LocalDate localDate();
-      Pattern pattern();
-      ObjectId objectId();
-      UUID uuid();
-      Set<String> stringSet();
-      Map<String, String> map();
-      int[] intArray();
-      List<Integer> intList();
-      Document document();
-      BsonDocument bsonDocument();
+      @Value.Default
+      default java.util.Date utilDate() {
+          return DEFAULT.utilDate();
+      }
+
+      @Value.Default
+      default LocalDate localDate() {
+          return DEFAULT.localDate();
+      }
+
+      @Value.Default
+      default Pattern pattern() {
+          return DEFAULT.pattern();
+      }
+
+      @Value.Default
+      default ObjectId objectId() {
+          return DEFAULT.objectId();
+      }
+
+      @Value.Default
+      default UUID uuid() {
+          return DEFAULT.uuid();
+      }
+
+      @Value.Default
+      default Set<String> stringSet() {
+          return DEFAULT.stringSet();
+      }
+
+      @Value.Default
+      default Map<String, String> map() {
+          return DEFAULT.map();
+      }
+
+      @Value.Default
+      default int[] intArray() {
+          return DEFAULT.intArray();
+      }
+
+      @Value.Default
+      default List<Integer> intList() {
+          return DEFAULT.intList();
+      }
+
+      @Value.Default
+      default Document document() {
+          return DEFAULT.document();
+      }
+
+      @Value.Default
+      default BsonDocument bsonDocument() {
+          return DEFAULT.bsonDocument();
+      }
   }
 
 }
diff --git a/value-fixture/test/org/immutables/fixture/jackson/ObjectMappedTest.java b/value-fixture/test/org/immutables/fixture/jackson/ObjectMappedTest.java
@@ -249,10 +249,18 @@ public void jsonValueSingletonRoundtrip() throws Exception {
   @Test
   public void jsonStagedEntityRoundtrip() throws Exception {
     String json = "{\"required\":\"id\",\"optional\":null,\"optionalPrimitive\":null}";
+    String jsonRegex = "\\{(?:"
+        + "\"required\":\"id\",\"optional\":\"default\",\"optionalPrimitive\":false"
+        + "|\"required\":\"id\",\"optionalPrimitive\":false,\"optional\":\"default\""
+        + "|\"optional\":\"default\",\"required\":\"id\",\"optionalPrimitive\":false"
+        + "|\"optional\":\"default\",\"optionalPrimitive\":false,\"required\":\"id\""
+        + "|\"optionalPrimitive\":false,\"required\":\"id\",\"optional\":\"default\""
+        + "|\"optionalPrimitive\":false,\"optional\":\"default\",\"required\":\"id\""
+        + ")\\}";
 
     StagedEntity nullable =
         OBJECT_MAPPER.readValue(json, StagedEntity.class);
 
-    check(OBJECT_MAPPER.writeValueAsString(nullable)).is("{\"required\":\"id\",\"optional\":\"default\",\"optionalPrimitive\":false}");
+    check(OBJECT_MAPPER.writeValueAsString(nullable)).matches(jsonRegex);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ void set() {`
`74`	`74`	`check(s1).isA(HashSet.class);`
`75`	`75`
`76`	`76`	`Set<String> s2 = (Set<String>) converter.apply(ImmutableSet.of("a", "b"));`
`77`		`- check(s2).isOf("a", "b");`
	`77`	`+ check(s2).hasContentInAnyOrder("a", "b");`
`78`	`78`	`check(s2).isA(HashSet.class);`
`79`	`79`	`}`
`80`	`80`