From 757e7966666d39748db2912b32ccf8b1df18bd62 Mon Sep 17 00:00:00 2001
From: Justin Lu <justin.lu@oracle.com>
Date: Fri, 16 Jan 2026 15:18:06 -0800
Subject: [PATCH] Simplify boolean value sources for base tests

---
 .../sql/junit/test/sql/CallableStatementTests.java    |  3 ++-
 test/jdk/java/sql/junit/test/sql/ConnectionTests.java |  3 ++-
 .../sql/junit/test/sql/PreparedStatementTests.java    |  3 ++-
 test/jdk/java/sql/junit/test/sql/StatementTests.java  |  3 ++-
 test/jdk/java/sql/junit/util/BaseTest.java            | 11 -----------
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/test/jdk/java/sql/junit/test/sql/CallableStatementTests.java b/test/jdk/java/sql/junit/test/sql/CallableStatementTests.java
index ba14ccef96c..82ff02292a5 100644
--- a/test/jdk/java/sql/junit/test/sql/CallableStatementTests.java
+++ b/test/jdk/java/sql/junit/test/sql/CallableStatementTests.java
@@ -22,6 +22,7 @@
  */
 package test.sql;
 
+import org.junit.jupiter.params.provider.ValueSource;
 import util.BaseTest;
 import util.StubConnection;
 
@@ -98,7 +99,7 @@ public class CallableStatementTests extends BaseTest {
      * enquoteIdentiifer is null
      */
     @ParameterizedTest
-    @MethodSource("trueFalse")
+    @ValueSource(booleans = {true, false})
     public void test04(boolean alwaysQuote) throws SQLException {
         Assertions.assertThrows(NullPointerException.class, () -> {
             cstmt.enquoteIdentifier(null, alwaysQuote);
diff --git a/test/jdk/java/sql/junit/test/sql/ConnectionTests.java b/test/jdk/java/sql/junit/test/sql/ConnectionTests.java
index c42885ec5eb..7bf717a8967 100644
--- a/test/jdk/java/sql/junit/test/sql/ConnectionTests.java
+++ b/test/jdk/java/sql/junit/test/sql/ConnectionTests.java
@@ -22,6 +22,7 @@
  */
 package test.sql;
 
+import org.junit.jupiter.params.provider.ValueSource;
 import util.BaseTest;
 import util.StubConnection;
 
@@ -92,7 +93,7 @@ public class ConnectionTests extends BaseTest {
      * enquoteIdentiifer is null
      */
     @ParameterizedTest
-    @MethodSource("trueFalse")
+    @ValueSource(booleans = {true, false})
     public void test04(boolean alwaysQuote) throws SQLException {
         Assertions.assertThrows(NullPointerException.class, () -> {
             conn.enquoteIdentifier(null, alwaysQuote);
diff --git a/test/jdk/java/sql/junit/test/sql/PreparedStatementTests.java b/test/jdk/java/sql/junit/test/sql/PreparedStatementTests.java
index 722222b4084..4fc23db7411 100644
--- a/test/jdk/java/sql/junit/test/sql/PreparedStatementTests.java
+++ b/test/jdk/java/sql/junit/test/sql/PreparedStatementTests.java
@@ -22,6 +22,7 @@
  */
 package test.sql;
 
+import org.junit.jupiter.params.provider.ValueSource;
 import util.BaseTest;
 import util.StubConnection;
 
@@ -99,7 +100,7 @@ public class PreparedStatementTests extends BaseTest {
      * enquoteIdentiifer is null
      */
     @ParameterizedTest
-    @MethodSource("trueFalse")
+    @ValueSource(booleans = {true, false})
     public void test04(boolean alwaysQuote) throws SQLException {
         Assertions.assertThrows(NullPointerException.class, () -> {
             pstmt.enquoteIdentifier(null, alwaysQuote);
diff --git a/test/jdk/java/sql/junit/test/sql/StatementTests.java b/test/jdk/java/sql/junit/test/sql/StatementTests.java
index 9f061bf20f3..f2c3d45cf32 100644
--- a/test/jdk/java/sql/junit/test/sql/StatementTests.java
+++ b/test/jdk/java/sql/junit/test/sql/StatementTests.java
@@ -34,6 +34,7 @@ import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import org.junit.jupiter.params.provider.ValueSource;
 import util.BaseTest;
 import util.StubConnection;
 
@@ -98,7 +99,7 @@ public class StatementTests extends BaseTest {
      * enquoteIdentiifer is null
      */
     @ParameterizedTest
-    @MethodSource("trueFalse")
+    @ValueSource(booleans = {true, false})
     public void test04(boolean alwaysQuote) throws SQLException {
         Assertions.assertThrows(NullPointerException.class, () -> {
             stmt.enquoteIdentifier(null, alwaysQuote);
diff --git a/test/jdk/java/sql/junit/util/BaseTest.java b/test/jdk/java/sql/junit/util/BaseTest.java
index 183da493ce5..56784cfd4f8 100644
--- a/test/jdk/java/sql/junit/util/BaseTest.java
+++ b/test/jdk/java/sql/junit/util/BaseTest.java
@@ -74,17 +74,6 @@ public class BaseTest {
         return o1;
     }
 
-    /*
-     * DataProvider used to specify the value to set and check for
-     * methods using boolean values
-     */
-    protected Object[][] trueFalse() {
-        return new Object[][]{
-            {true},
-            {false}
-        };
-    }
-
     /*
      * DataProvider used to specify the standard JDBC Types
      */