Replace with beforemethod annotation

Author: mzitnik

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/AccessManagementTest.java

@@ -17,11 +17,6 @@
 import java.util.Properties;
 
 public class AccessManagementTest extends JdbcIntegrationTest {
-    @BeforeClass
-    public void setUp() {
-        System.setProperty("clickhouse.jdbc.v1","true");
-    }
-
     @Test(groups = "integration", dataProvider = "setRolesArgsForTestSetRole")
     public void testSetRoleDifferentConnections(String[] roles, String setRoleExpr, String[] activeRoles,
                                                 String connectionProvider) throws SQLException {

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseConnectionTest.java

@@ -22,10 +22,6 @@
 import org.testng.annotations.Test;
 
 public class ClickHouseConnectionTest extends JdbcIntegrationTest {
-    @BeforeClass
-    public void setUp() {
-        System.setProperty("clickhouse.jdbc.v1","true");
-    }
     @Override
     public ClickHouseConnection newConnection(Properties properties) throws SQLException {
         return (ClickHouseConnection) newDataSource(properties).getConnection();

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseDataSourceTest.java

@@ -20,10 +20,6 @@
 import com.clickhouse.client.config.ClickHouseDefaults;
 
 public class ClickHouseDataSourceTest extends JdbcIntegrationTest {
-    @BeforeClass
-    public void setUp() {
-        System.setProperty("clickhouse.jdbc.v1","true");
-    }
     @Test(groups = "integration")
     public void testHighAvailabilityConfig() throws SQLException {
         if (isCloud() || ClickHouseDriver.isV2()) return; //TODO: testHighAvailabilityConfig - Revisit, see: https://github.com/ClickHouse/clickhouse-java/issues/1747

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseDatabaseMetaDataTest.java

@@ -17,12 +17,13 @@
 import com.clickhouse.logging.LoggerFactory;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 public class ClickHouseDatabaseMetaDataTest extends JdbcIntegrationTest {
-    @BeforeClass
-    public void setUp() {
+    @BeforeMethod(groups = "integration")
+    public void setV1() {
         System.setProperty("clickhouse.jdbc.v1","true");
     }
 

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseDriverTest.java

@@ -31,6 +31,7 @@ public void testConnect() throws SQLException {
     }
     @Test(groups = "integration")
     public void testV2Driver() {
+        System.setProperty("clickhouse.jdbc.v1","false");
         ClickHouseDriver driver = new ClickHouseDriver();
         Boolean V1 = false;
         Boolean V2 = true;
@@ -39,6 +40,6 @@ public void testV2Driver() {
         Assert.assertEquals(driver.isV2("jdbc:clickhouse://localhost:8123?clickhouse.jdbc.v1=false"), V2);
         Assert.assertEquals(driver.isV2("jdbc:clickhouse://localhost:8123?clickhouse.jdbc.v2=true"), V2);
         Assert.assertEquals(driver.isV2("jdbc:clickhouse://localhost:8123?clickhouse.jdbc.v2=false"), V1);
-
+        System.setProperty("clickhouse.jdbc.v1","true");
     }
 }

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHousePreparedStatementTest.java

@@ -66,10 +66,6 @@
 import org.testng.annotations.Test;
 
 public class ClickHousePreparedStatementTest extends JdbcIntegrationTest {
-    @BeforeClass
-    public void setUp() {
-        System.setProperty("clickhouse.jdbc.v1","true");
-    }
     @DataProvider(name = "columnsWithDefaultValue")
     private Object[][] getColumnsWithDefaultValue() {
         return new Object[][] {

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseResultSetTest.java

@@ -39,10 +39,6 @@
 import org.testng.annotations.Test;
 
 public class ClickHouseResultSetTest extends JdbcIntegrationTest {
-    @BeforeClass
-    public void setUp() {
-        System.setProperty("clickhouse.jdbc.v1","true");
-    }
     @DataProvider(name = "nullableTypes")
     private Object[][] getNullableTypes() {
         return new Object[][] {

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java

@@ -60,11 +60,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 public class ClickHouseStatementTest extends JdbcIntegrationTest {
-    @BeforeClass
-    public void setUp() {
-        System.setProperty("clickhouse.jdbc.v1","true");
-    }
-
     @DataProvider(name = "timeZoneTestOptions")
     private Object[][] getTimeZoneTestOptions() {
         return new Object[][] {

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/CombinedResultSetTest.java

@@ -16,11 +16,6 @@
 import com.clickhouse.data.ClickHouseColumn;
 
 public class CombinedResultSetTest {
-    @BeforeClass
-    public void setUp() {
-        System.setProperty("clickhouse.jdbc.v1","true");
-    }
-
     @DataProvider(name = "multipleResultSetsProvider")
     private Object[][] getMultipleResultSets() {
         ClickHouseConfig config = new ClickHouseConfig();

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/GenericJDBCTest.java

@@ -10,11 +10,6 @@
 import static org.testng.Assert.assertThrows;
 
 public class GenericJDBCTest extends JdbcIntegrationTest {
-    @BeforeClass
-    public void setUp() {
-        System.setProperty("clickhouse.jdbc.v1","true");
-    }
-
     public Connection getConnection(Properties properties) throws SQLException {
         if (properties == null) {
             properties = new Properties();