Changeset: d44c410782d6 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/d44c410782d6
Modified Files:
        src/test/java/JDBC_API_Tester.java
        src/test/java/org/monetdb/jdbc/ApiTests.java
Branch: default
Log Message:

Convert Test_PSlargeamount() -> ApiTests#testPreparedLargeAmount()


diffs (128 lines):

diff --git a/src/test/java/JDBC_API_Tester.java 
b/src/test/java/JDBC_API_Tester.java
--- a/src/test/java/JDBC_API_Tester.java
+++ b/src/test/java/JDBC_API_Tester.java
@@ -1023,93 +1023,6 @@ public final class JDBC_API_Tester exten
                compareExpectedOutput("Test_DBCmetadata", "");
        }
 
-       /* Create a lot of PreparedStatements, to emulate webloads such as 
those from Hibernate. */
-       /* this test is same as Test_PSsomeamount() but for many more 
PreparedStatements to stress the server */
-       @Test
-       @Tag("slow")
-       @DisabledIf("org.monetdb.testinfra.Config#isSkipSlow")
-       public void Test_PSlargeamount() {
-               sb.setLength(0);        // clear the output log buffer
-
-               PreparedStatement pstmt = null;
-               ResultSet rs = null;
-               try {
-                       // >> true: auto commit should be on
-                       sb.append("0. 
true\t").append(con.getAutoCommit()).append("\n");
-
-                       sb.append("1. Preparing and executing a unique 
statement\n");
-                       for (int i = 0; i < 50001; i++) {
-                               pstmt = con.prepareStatement("select " + i + ", 
" + i + " = ?");
-                               pstmt.setInt(1, i);
-                               rs = pstmt.executeQuery();
-                               if (rs != null && rs.next() && i % 1000 == 0) {
-                                       sb.append(rs.getInt(1)).append(", 
").append(rs.getBoolean(2)).append("\n");
-                               }
-                               /* next call should cause resources on the 
server to be freed */
-                               pstmt.close();
-                       }
-               } catch (SQLException e) {
-                       sb.append("FAILED: 
").append(e.getMessage()).append("\n");
-               }
-
-               closeStmtResSet(pstmt, rs);
-
-               compareExpectedOutput("Test_PSlargeamount",
-                       "0. true        true\n" +
-                       "1. Preparing and executing a unique statement\n" +
-                       "0, true\n" +
-                       "1000, true\n" +
-                       "2000, true\n" +
-                       "3000, true\n" +
-                       "4000, true\n" +
-                       "5000, true\n" +
-                       "6000, true\n" +
-                       "7000, true\n" +
-                       "8000, true\n" +
-                       "9000, true\n" +
-                       "10000, true\n" +
-                       "11000, true\n" +
-                       "12000, true\n" +
-                       "13000, true\n" +
-                       "14000, true\n" +
-                       "15000, true\n" +
-                       "16000, true\n" +
-                       "17000, true\n" +
-                       "18000, true\n" +
-                       "19000, true\n" +
-                       "20000, true\n" +
-                       "21000, true\n" +
-                       "22000, true\n" +
-                       "23000, true\n" +
-                       "24000, true\n" +
-                       "25000, true\n" +
-                       "26000, true\n" +
-                       "27000, true\n" +
-                       "28000, true\n" +
-                       "29000, true\n" +
-                       "30000, true\n" +
-                       "31000, true\n" +
-                       "32000, true\n" +
-                       "33000, true\n" +
-                       "34000, true\n" +
-                       "35000, true\n" +
-                       "36000, true\n" +
-                       "37000, true\n" +
-                       "38000, true\n" +
-                       "39000, true\n" +
-                       "40000, true\n" +
-                       "41000, true\n" +
-                       "42000, true\n" +
-                       "43000, true\n" +
-                       "44000, true\n" +
-                       "45000, true\n" +
-                       "46000, true\n" +
-                       "47000, true\n" +
-                       "48000, true\n" +
-                       "49000, true\n" +
-                       "50000, true\n");
-       }
-
        @Test
        public void Test_PStimedate() {
                sb.setLength(0);        // clear the output log buffer
diff --git a/src/test/java/org/monetdb/jdbc/ApiTests.java 
b/src/test/java/org/monetdb/jdbc/ApiTests.java
--- a/src/test/java/org/monetdb/jdbc/ApiTests.java
+++ b/src/test/java/org/monetdb/jdbc/ApiTests.java
@@ -1,6 +1,7 @@
 package org.monetdb.jdbc;
 
 import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.condition.DisabledIf;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.FieldSource;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -1245,7 +1246,18 @@ public class ApiTests {
 
        @Test
        public void testPreparedSomeAmount() throws SQLException {
-               for (int i = 0; i < 120; i++) {
+               testManyPrepareStatements(120);
+       }
+
+       @Test
+       @Tag("slow")
+       @DisabledIf("org.monetdb.testinfra.Config#isSkipSlow")
+       public void testPreparedLargeAmount() throws SQLException {
+               testManyPrepareStatements(50001);
+       }
+
+       private void testManyPrepareStatements(int n) throws SQLException {
+               for (int i = 0; i < n; i++) {
                        String query = String.format("SELECT %d, %d = ?", i, i);
                        try (PreparedStatement ps = 
conn.prepareStatement(query)) {
                                ps.setInt(1, i);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to