Simplify boolean value sources for base tests

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);

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);

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);

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);

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
      */