Inline util class next to only usage

trinodb · Jan 31, 2024 · 4baa745 · 4baa745
1 parent 7d7eb03
commit 4baa745
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 42 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/testing/assertions/TestUtil.java b/core/trino-main/src/main/java/io/trino/testing/assertions/TestUtil.java
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java b/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java
@@ -151,7 +151,6 @@
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_UPDATE;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.assertions.Assert.assertEventually;
-import static io.trino.testing.assertions.TestUtil.verifyResultOrFailure;
 import static io.trino.tpch.TpchTable.CUSTOMER;
 import static java.lang.String.format;
 import static java.lang.String.join;
@@ -652,6 +651,23 @@ public void testVarcharCastToDateInPredicate()
         }
     }
 
+    private static <T> void verifyResultOrFailure(Supplier<T> callback, Consumer<T> verifyResults, Consumer<Throwable> verifyFailure)
+    {
+        requireNonNull(callback, "callback is null");
+        requireNonNull(verifyResults, "verifyResults is null");
+        requireNonNull(verifyFailure, "verifyFailure is null");
+
+        T result;
+        try {
+            result = callback.get();
+        }
+        catch (Throwable t) {
+            verifyFailure.accept(t);
+            return;
+        }
+        verifyResults.accept(result);
+    }
+
     @Test
     public void testConcurrentScans()
     {