From ae218029e0001b84d33a6e592acd68ae0698c065 Mon Sep 17 00:00:00 2001
From: Ben Manes <ben.manes@gmail.com>
Date: Sat, 4 Jan 2025 18:10:01 -0800
Subject: [PATCH] add missing asserts to openjdk tests that check only in their
 custom harness

---
 .../concurrentmap/ConcurrentModification.java       | 13 +++++++++----
 .../github/benmanes/caffeine/openjdk/map/Get.java   | 13 +++++++++----
 .../benmanes/caffeine/openjdk/map/LockStep.java     |  5 +++++
 .../benmanes/caffeine/openjdk/map/ToArray.java      | 13 +++++++++----
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/concurrent/concurrentmap/ConcurrentModification.java b/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/concurrent/concurrentmap/ConcurrentModification.java
index 82b52663b6..aedecad5d9 100644
--- a/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/concurrent/concurrentmap/ConcurrentModification.java
+++ b/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/concurrent/concurrentmap/ConcurrentModification.java
@@ -22,6 +22,7 @@
  */
 package com.github.benmanes.caffeine.openjdk.concurrent.concurrentmap;
 
+import static com.google.common.truth.Truth.assertThat;
 import static java.util.Locale.US;
 
 /*
@@ -114,16 +115,20 @@ public static void main(String[] args) {
 
     @Test
     public void bounded() {
-      Cache<Integer,Integer> cache = Caffeine.newBuilder()
+      testCaffeine(Caffeine.newBuilder()
           .expireAfterWrite(Duration.ofNanos(Long.MAX_VALUE))
           .maximumSize(Long.MAX_VALUE)
-          .build();
-      test(cache.asMap());
+          .build());
     }
 
     @Test
     public void unbounded() {
-      Cache<Integer,Integer> cache = Caffeine.newBuilder().build();
+      testCaffeine(Caffeine.newBuilder().build());
+    }
+
+    private static void testCaffeine(Cache<Integer,Integer> cache) {
       test(cache.asMap());
+      assertThat(failed).isEqualTo(0);
+      assertThat(passed).isGreaterThan(0);
     }
 }
diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/map/Get.java b/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/map/Get.java
index 6198c10b34..6e47952a9d 100644
--- a/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/map/Get.java
+++ b/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/map/Get.java
@@ -22,6 +22,7 @@
  */
 package com.github.benmanes.caffeine.openjdk.map;
 
+import static com.google.common.truth.Truth.assertThat;
 import static java.util.Locale.US;
 
 import java.time.Duration;
@@ -57,17 +58,21 @@ public class Get {
 
     @Test
     public void bounded() {
-      Cache<Character, Boolean> cache = Caffeine.newBuilder()
+      testCaffeine(Caffeine.newBuilder()
           .expireAfterWrite(Duration.ofNanos(Long.MAX_VALUE))
           .maximumSize(Long.MAX_VALUE)
-          .build();
-      testMap(cache.asMap());
+          .build());
     }
 
     @Test
     public void unbounded() {
-      Cache<Character, Boolean> cache = Caffeine.newBuilder().build();
+      testCaffeine(Caffeine.newBuilder().build());
+    }
+
+    private static void testCaffeine(Cache<Character, Boolean> cache) {
       testMap(cache.asMap());
+      assertThat(failed).isEqualTo(0);
+      assertThat(passed).isGreaterThan(0);
     }
 
     private static void realMain(String[] args) throws Throwable {
diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/map/LockStep.java b/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/map/LockStep.java
index fe835f8038..c825eb5f9d 100644
--- a/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/map/LockStep.java
+++ b/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/map/LockStep.java
@@ -22,6 +22,7 @@
  */
 package com.github.benmanes.caffeine.openjdk.map;
 
+import static com.google.common.truth.Truth.assertThat;
 import static java.util.Locale.US;
 
 import java.time.Duration;
@@ -141,11 +142,15 @@ public void bounded() {
           .expireAfterWrite(Duration.ofNanos(Long.MAX_VALUE))
           .maximumSize(Long.MAX_VALUE)
           .build().asMap());
+      assertThat(failed).isEqualTo(0);
+      assertThat(passed).isGreaterThan(0);
     }
 
     @Test
     public void unbounded() {
       test(() -> Caffeine.newBuilder().build().asMap());
+      assertThat(failed).isEqualTo(0);
+      assertThat(passed).isGreaterThan(0);
     }
 
     //--------------------- Infrastructure ---------------------------
diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/map/ToArray.java b/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/map/ToArray.java
index 641759a8d2..e510f78024 100644
--- a/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/map/ToArray.java
+++ b/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/map/ToArray.java
@@ -22,6 +22,7 @@
  */
 package com.github.benmanes.caffeine.openjdk.map;
 
+import static com.google.common.truth.Truth.assertThat;
 import static java.util.Locale.US;
 
 import java.time.Duration;
@@ -62,17 +63,21 @@ public class ToArray {
 
     @Test
     public void bounded() throws Exception {
-      Cache<Integer, Long> cache = Caffeine.newBuilder()
+      testCaffeine(Caffeine.newBuilder()
           .expireAfterWrite(Duration.ofNanos(Long.MAX_VALUE))
           .maximumSize(Long.MAX_VALUE)
-          .build();
-      testMap(cache.asMap());
+          .build());
     }
 
     @Test
     public void unbounded() throws Exception {
-      Cache<Integer, Long> cache = Caffeine.newBuilder().build();
+      testCaffeine(Caffeine.newBuilder().build());
+    }
+
+    private static void testCaffeine(Cache<Integer, Long> cache) {
       testMap(cache.asMap());
+      assertThat(failed).isEqualTo(0);
+      assertThat(passed).isGreaterThan(0);
     }
 
     private static void realMain(String[] args) throws Throwable {