Spanner: Remove SQL logging from integration test runs

google-cloud-clients/google-cloud-contrib/google-cloud-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/AbstractSqlScriptVerifier.java

@@ -182,6 +182,8 @@ public static List<String> readStatementsFromFile(String filename, Class<?> reso
 
   private final Map<String, Object> variables = new HashMap<>();
 
+  private final boolean logStatements;
+
   /**
    * Constructor for a verifier that will take a {@link GenericConnection} as a parameter to the
    * {@link AbstractSqlScriptVerifier#verifyStatementsInFile(GenericConnection, String, Class,
@@ -194,6 +196,7 @@ public AbstractSqlScriptVerifier() {
   /** Constructor for a verifier that will use a connection provider for connections */
   public AbstractSqlScriptVerifier(GenericConnectionProvider provider) {
     this.connectionProvider = provider;
+    this.logStatements = Boolean.parseBoolean(System.getProperty("log_sql_statements", "false"));
   }
 
   /**
@@ -209,14 +212,10 @@ public AbstractSqlScriptVerifier(GenericConnectionProvider provider) {
    *     semicolon (;)
    * @param resourceClass The class that should be used to locate the resource specified by the file
    *     name
-   * @param logStatements Should the verifier log each statement that is executed and verified to
-   *     standard out
    * @throws Exception
    */
-  public void verifyStatementsInFile(String filename, Class<?> resourceClass, boolean logStatements)
-      throws Exception {
-    verifyStatementsInFile(
-        connectionProvider.getConnection(), filename, resourceClass, logStatements);
+  public void verifyStatementsInFile(String filename, Class<?> resourceClass) throws Exception {
+    verifyStatementsInFile(connectionProvider.getConnection(), filename, resourceClass);
   }
 
   /**
@@ -230,11 +229,9 @@ public void verifyStatementsInFile(String filename, Class<?> resourceClass, bool
    * @param filename The file name containing the statements. Statements must be separated by a
    *     semicolon (;)
    * @param resourceClass The class that defines the package where to find the input file
-   * @param logStatements Should all statements be logged to standard out?
    */
   public void verifyStatementsInFile(
-      GenericConnection connection, String filename, Class<?> resourceClass, boolean logStatements)
-      throws Exception {
+      GenericConnection connection, String filename, Class<?> resourceClass) throws Exception {
     try {
       List<String> statements = readStatementsFromFile(filename, resourceClass);
       for (String statement : statements) {

google-cloud-clients/google-cloud-contrib/google-cloud-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/ClientSideStatementsTest.java

@@ -48,7 +48,7 @@ public class ClientSideStatementsTest {
   @Test
   public void testExecuteClientSideStatementsScript() throws Exception {
     SqlScriptVerifier verifier = new SqlScriptVerifier(new TestConnectionProvider());
-    verifier.verifyStatementsInFile("ClientSideStatementsTest.sql", getClass(), false);
+    verifier.verifyStatementsInFile("ClientSideStatementsTest.sql", getClass());
   }
 
   private static final String SCRIPT_FILE =

google-cloud-clients/google-cloud-contrib/google-cloud-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/ConnectionImplGeneratedSqlScriptTest.java

@@ -59,7 +59,7 @@ public GenericConnection getConnection() {
   @Test
   public void testGeneratedScript() throws Exception {
     SqlScriptVerifier verifier = new SqlScriptVerifier(new TestConnectionProvider());
-    verifier.verifyStatementsInFile("ConnectionImplGeneratedSqlScriptTest.sql", getClass(), false);
+    verifier.verifyStatementsInFile("ConnectionImplGeneratedSqlScriptTest.sql", getClass());
   }
 
   /**

google-cloud-clients/google-cloud-contrib/google-cloud-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/JdbcConnectionGeneratedSqlScriptTest.java

@@ -57,6 +57,6 @@ public GenericConnection getConnection() {
   public void testGeneratedScript() throws Exception {
     JdbcSqlScriptVerifier verifier = new JdbcSqlScriptVerifier(new TestConnectionProvider());
     verifier.verifyStatementsInFile(
-        "ConnectionImplGeneratedSqlScriptTest.sql", SqlScriptVerifier.class, false);
+        "ConnectionImplGeneratedSqlScriptTest.sql", SqlScriptVerifier.class);
   }
 }

google-cloud-clients/google-cloud-contrib/google-cloud-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/JdbcTimeoutSqlTest.java

@@ -35,6 +35,6 @@ public class JdbcTimeoutSqlTest {
   @Test
   public void testTimeoutScript() throws Exception {
     JdbcSqlScriptVerifier verifier = new JdbcSqlScriptVerifier(new TestConnectionProvider());
-    verifier.verifyStatementsInFile("TimeoutSqlScriptTest.sql", getClass(), false);
+    verifier.verifyStatementsInFile("TimeoutSqlScriptTest.sql", getClass());
   }
 }

google-cloud-clients/google-cloud-contrib/google-cloud-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/SetReadOnlyStalenessSqlScriptTest.java

@@ -42,6 +42,6 @@ public GenericConnection getConnection() {
   @Test
   public void testSetReadOnlyStalenessScript() throws Exception {
     SqlScriptVerifier verifier = new SqlScriptVerifier(new TestConnectionProvider());
-    verifier.verifyStatementsInFile("SetReadOnlyStalenessTest.sql", getClass(), false);
+    verifier.verifyStatementsInFile("SetReadOnlyStalenessTest.sql", getClass());
   }
 }

google-cloud-clients/google-cloud-contrib/google-cloud-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/SetStatementTimeoutSqlScriptTest.java

@@ -38,6 +38,6 @@ public GenericConnection getConnection() {
   @Test
   public void testSetStatementTimeoutScript() throws Exception {
     SqlScriptVerifier verifier = new SqlScriptVerifier(new TestConnectionProvider());
-    verifier.verifyStatementsInFile("SetStatementTimeoutTest.sql", getClass(), false);
+    verifier.verifyStatementsInFile("SetStatementTimeoutTest.sql", getClass());
   }
 }

google-cloud-clients/google-cloud-contrib/google-cloud-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/it/ITDdlTest.java

@@ -32,6 +32,6 @@ public class ITDdlTest extends ITAbstractSpannerTest {
   @Test
   public void testSqlScript() throws Exception {
     SqlScriptVerifier verifier = new SqlScriptVerifier(new ITConnectionProvider());
-    verifier.verifyStatementsInFile("ITDdlTest.sql", SqlScriptVerifier.class, true);
+    verifier.verifyStatementsInFile("ITDdlTest.sql", SqlScriptVerifier.class);
   }
 }

google-cloud-clients/google-cloud-contrib/google-cloud-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcDdlTest.java

@@ -33,6 +33,6 @@ public class ITJdbcDdlTest extends ITAbstractJdbcTest {
   @Test
   public void testSqlScript() throws Exception {
     JdbcSqlScriptVerifier verifier = new JdbcSqlScriptVerifier(new ITJdbcConnectionProvider());
-    verifier.verifyStatementsInFile("ITDdlTest.sql", SqlScriptVerifier.class, true);
+    verifier.verifyStatementsInFile("ITDdlTest.sql", SqlScriptVerifier.class);
   }
 }

google-cloud-clients/google-cloud-contrib/google-cloud-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcReadOnlyTest.java

@@ -56,7 +56,7 @@ public void createTestTables() throws Exception {
         // create tables
         JdbcSqlScriptVerifier verifier = new JdbcSqlScriptVerifier(new ITJdbcConnectionProvider());
         verifier.verifyStatementsInFile(
-            "ITReadOnlySpannerTest_CreateTables.sql", SqlScriptVerifier.class, true);
+            "ITReadOnlySpannerTest_CreateTables.sql", SqlScriptVerifier.class);
 
         // fill tables with data
         connection.setAutoCommit(false);
@@ -89,7 +89,7 @@ public void createTestTables() throws Exception {
   @Test
   public void testSqlScript() throws Exception {
     JdbcSqlScriptVerifier verifier = new JdbcSqlScriptVerifier(new ITJdbcConnectionProvider());
-    verifier.verifyStatementsInFile("ITReadOnlySpannerTest.sql", SqlScriptVerifier.class, true);
+    verifier.verifyStatementsInFile("ITReadOnlySpannerTest.sql", SqlScriptVerifier.class);
   }
 
   @Test

google-cloud-clients/google-cloud-contrib/google-cloud-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcReadWriteAutocommitTest.java

@@ -56,7 +56,7 @@ public boolean doCreateDefaultTestTable() {
   public void test01_SqlScript() throws Exception {
     JdbcSqlScriptVerifier verifier = new JdbcSqlScriptVerifier(new ITJdbcConnectionProvider());
     verifier.verifyStatementsInFile(
-        "ITReadWriteAutocommitSpannerTest.sql", SqlScriptVerifier.class, true);
+        "ITReadWriteAutocommitSpannerTest.sql", SqlScriptVerifier.class);
   }
 
   @Test

google-cloud-clients/google-cloud-contrib/google-cloud-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcSqlScriptTest.java

@@ -72,7 +72,7 @@ public class ITJdbcSqlScriptTest extends ITAbstractJdbcTest {
   public void test01_CreateTables() throws Exception {
     try (Connection connection = createConnection()) {
       verifier.verifyStatementsInFile(
-          JdbcGenericConnection.of(connection), CREATE_TABLES_FILE, SqlScriptVerifier.class, true);
+          JdbcGenericConnection.of(connection), CREATE_TABLES_FILE, SqlScriptVerifier.class);
     }
   }
 
@@ -83,30 +83,23 @@ public void test02_InsertTestData() throws Exception {
       verifier.verifyStatementsInFile(
           JdbcGenericConnection.of(connection),
           INSERT_AND_VERIFY_TEST_DATA,
-          SqlScriptVerifier.class,
-          true);
+          SqlScriptVerifier.class);
     }
   }
 
   @Test
   public void test03_TestGetReadTimestamp() throws Exception {
     try (Connection connection = createConnection()) {
       verifier.verifyStatementsInFile(
-          JdbcGenericConnection.of(connection),
-          TEST_GET_READ_TIMESTAMP,
-          SqlScriptVerifier.class,
-          true);
+          JdbcGenericConnection.of(connection), TEST_GET_READ_TIMESTAMP, SqlScriptVerifier.class);
     }
   }
 
   @Test
   public void test04_TestGetCommitTimestamp() throws Exception {
     try (Connection connection = createConnection()) {
       verifier.verifyStatementsInFile(
-          JdbcGenericConnection.of(connection),
-          TEST_GET_COMMIT_TIMESTAMP,
-          SqlScriptVerifier.class,
-          true);
+          JdbcGenericConnection.of(connection), TEST_GET_COMMIT_TIMESTAMP, SqlScriptVerifier.class);
     }
   }
 
@@ -116,19 +109,15 @@ public void test05_TestTemporaryTransactions() throws Exception {
       verifier.verifyStatementsInFile(
           JdbcGenericConnection.of(connection),
           TEST_TEMPORARY_TRANSACTIONS,
-          SqlScriptVerifier.class,
-          true);
+          SqlScriptVerifier.class);
     }
   }
 
   @Test
   public void test06_TestTransactionMode() throws Exception {
     try (Connection connection = createConnection()) {
       verifier.verifyStatementsInFile(
-          JdbcGenericConnection.of(connection),
-          TEST_TRANSACTION_MODE,
-          SqlScriptVerifier.class,
-          true);
+          JdbcGenericConnection.of(connection), TEST_TRANSACTION_MODE, SqlScriptVerifier.class);
     }
   }
 
@@ -138,52 +127,39 @@ public void test07_TestTransactionModeReadOnly() throws Exception {
       verifier.verifyStatementsInFile(
           JdbcGenericConnection.of(connection),
           TEST_TRANSACTION_MODE_READ_ONLY,
-          SqlScriptVerifier.class,
-          true);
+          SqlScriptVerifier.class);
     }
   }
 
   @Test
   public void test08_TestReadOnlyStaleness() throws Exception {
     try (Connection connection = createConnection()) {
       verifier.verifyStatementsInFile(
-          JdbcGenericConnection.of(connection),
-          TEST_READ_ONLY_STALENESS,
-          SqlScriptVerifier.class,
-          true);
+          JdbcGenericConnection.of(connection), TEST_READ_ONLY_STALENESS, SqlScriptVerifier.class);
     }
   }
 
   @Test
   public void test09_TestAutocommitDmlMode() throws Exception {
     try (Connection connection = createConnection()) {
       verifier.verifyStatementsInFile(
-          JdbcGenericConnection.of(connection),
-          TEST_AUTOCOMMIT_DML_MODE,
-          SqlScriptVerifier.class,
-          true);
+          JdbcGenericConnection.of(connection), TEST_AUTOCOMMIT_DML_MODE, SqlScriptVerifier.class);
     }
   }
 
   @Test
   public void test10_TestAutocommitReadOnly() throws Exception {
     try (Connection connection = createConnection()) {
       verifier.verifyStatementsInFile(
-          JdbcGenericConnection.of(connection),
-          TEST_AUTOCOMMIT_READ_ONLY,
-          SqlScriptVerifier.class,
-          true);
+          JdbcGenericConnection.of(connection), TEST_AUTOCOMMIT_READ_ONLY, SqlScriptVerifier.class);
     }
   }
 
   @Test
   public void test11_TestStatementTimeout() throws Exception {
     try (Connection connection = createConnection()) {
       verifier.verifyStatementsInFile(
-          JdbcGenericConnection.of(connection),
-          TEST_STATEMENT_TIMEOUT,
-          SqlScriptVerifier.class,
-          true);
+          JdbcGenericConnection.of(connection), TEST_STATEMENT_TIMEOUT, SqlScriptVerifier.class);
     }
     try (Connection connection = createConnection()) {
       // Create a statement with a query timeout, but do not set a statement timeout on the
@@ -221,18 +197,15 @@ public void test11_TestStatementTimeout() throws Exception {
   public void test12_TestSetStatements() throws Exception {
     try (Connection connection = createConnection()) {
       verifier.verifyStatementsInFile(
-          JdbcGenericConnection.of(connection), TEST_SET_STATEMENTS, SqlScriptVerifier.class, true);
+          JdbcGenericConnection.of(connection), TEST_SET_STATEMENTS, SqlScriptVerifier.class);
     }
   }
 
   @Test
   public void test13_TestInvalidStatements() throws Exception {
     try (Connection connection = createConnection()) {
       verifier.verifyStatementsInFile(
-          JdbcGenericConnection.of(connection),
-          TEST_INVALID_STATEMENTS,
-          SqlScriptVerifier.class,
-          true);
+          JdbcGenericConnection.of(connection), TEST_INVALID_STATEMENTS, SqlScriptVerifier.class);
     }
   }
 }

google-cloud-clients/google-cloud-contrib/google-cloud-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/it/ITReadOnlySpannerTest.java

@@ -69,7 +69,7 @@ public void createTestTables() throws Exception {
         // create tables
         SqlScriptVerifier verifier = new SqlScriptVerifier(new ITConnectionProvider());
         verifier.verifyStatementsInFile(
-            "ITReadOnlySpannerTest_CreateTables.sql", SqlScriptVerifier.class, true);
+            "ITReadOnlySpannerTest_CreateTables.sql", SqlScriptVerifier.class);
 
         // fill tables with data
         connection.setAutocommit(false);
@@ -102,7 +102,7 @@ public void createTestTables() throws Exception {
   @Test
   public void testSqlScript() throws Exception {
     SqlScriptVerifier verifier = new SqlScriptVerifier(new ITConnectionProvider());
-    verifier.verifyStatementsInFile("ITReadOnlySpannerTest.sql", SqlScriptVerifier.class, true);
+    verifier.verifyStatementsInFile("ITReadOnlySpannerTest.sql", SqlScriptVerifier.class);
   }
 
   @Test

google-cloud-clients/google-cloud-contrib/google-cloud-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/it/ITReadWriteAutocommitSpannerTest.java

@@ -63,7 +63,7 @@ public boolean doCreateDefaultTestTable() {
   public void test01_SqlScript() throws Exception {
     SqlScriptVerifier verifier = new SqlScriptVerifier(new ITConnectionProvider());
     verifier.verifyStatementsInFile(
-        "ITReadWriteAutocommitSpannerTest.sql", SqlScriptVerifier.class, true);
+        "ITReadWriteAutocommitSpannerTest.sql", SqlScriptVerifier.class);
   }
 
   @Test