From 885a99f4c77ed85e9744bc00802b5c8e7142ee6c Mon Sep 17 00:00:00 2001
From: Runkang He <hrunker@gmail.com>
Date: Sun, 13 Aug 2023 18:06:37 +0800
Subject: [PATCH] [CALCITE-5923] Some test cases in  violates the test
 fixture's design principle

---
 .../java/org/apache/calcite/test/SqlOperatorTest.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/testkit/src/main/java/org/apache/calcite/test/SqlOperatorTest.java b/testkit/src/main/java/org/apache/calcite/test/SqlOperatorTest.java
index 35f23a8d3ff..6897cb0ec61 100644
--- a/testkit/src/main/java/org/apache/calcite/test/SqlOperatorTest.java
+++ b/testkit/src/main/java/org/apache/calcite/test/SqlOperatorTest.java
@@ -83,6 +83,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -197,6 +198,7 @@
  * null arguments or null results.</li>
  * </ul>
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @SuppressWarnings("MethodCanBeStatic")
 public class SqlOperatorTest {
   //~ Static fields/initializers ---------------------------------------------
@@ -441,8 +443,8 @@ protected SqlOperatorFixture fixture() {
   }
 
   /** Generates parameters to test both regular and safe cast. */
-  static Stream<Arguments> safeParameters() {
-    SqlOperatorFixture f = SqlOperatorFixtureImpl.DEFAULT;
+  private Stream<Arguments> safeParameters() {
+    SqlOperatorFixture f = fixture();
     SqlOperatorFixture f2 =
         SqlOperatorFixtures.safeCastWrapper(f.withLibrary(SqlLibrary.BIG_QUERY), "SAFE_CAST");
     SqlOperatorFixture f3 =
@@ -11909,7 +11911,7 @@ private static void checkLogicalOrFunc(SqlOperatorFixture f) {
   }
 
   @Test void testArgMin() {
-    final SqlOperatorFixture f0 = fixture().withTester(t -> TESTER);
+    final SqlOperatorFixture f0 = fixture();
     final String[] xValues = {"2", "3", "4", "4", "5", "7"};
 
     final Consumer<SqlOperatorFixture> consumer = f -> {