Remove redundant test instance annotations from BaseTest children

test/jdk/java/sql/junit/test/sql/BatchUpdateExceptionTests.java

@@ -31,12 +31,10 @@ import java.util.Arrays;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.SerializedBatchUpdateException;
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class BatchUpdateExceptionTests extends BaseTest {
 
     private final int[] uc = {1, 2, 3};

test/jdk/java/sql/junit/test/sql/CallableStatementTests.java

@@ -34,11 +34,9 @@ import org.junit.jupiter.api.Assertions;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CallableStatementTests extends BaseTest {
     private CallableStatement cstmt;
 

test/jdk/java/sql/junit/test/sql/ConnectionTests.java

@@ -32,11 +32,9 @@ import org.junit.jupiter.api.Assertions;
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class ConnectionTests extends BaseTest {
 
     protected StubConnection conn;

test/jdk/java/sql/junit/test/sql/DataTruncationTests.java

@@ -27,11 +27,9 @@ import java.sql.SQLException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class DataTruncationTests extends BaseTest {
 
     private final String READ_TRUNCATION = "01004";

test/jdk/java/sql/junit/test/sql/DateTests.java

@@ -23,19 +23,16 @@
 package test.sql;
 
 import java.sql.Date;
-import java.time.Instant;
 import java.time.LocalDate;
 
 import org.junit.jupiter.api.Assertions;
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class DateTests extends BaseTest {
 
     /*

test/jdk/java/sql/junit/test/sql/PreparedStatementTests.java

@@ -34,11 +34,9 @@ import org.junit.jupiter.api.Assertions;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class PreparedStatementTests extends BaseTest {
 
     private PreparedStatement pstmt;

test/jdk/java/sql/junit/test/sql/SQLClientInfoExceptionTests.java

@@ -29,11 +29,9 @@ import java.util.HashMap;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLClientInfoExceptionTests extends BaseTest {
 
     private final HashMap<String, ClientInfoStatus> map = new HashMap<>();

test/jdk/java/sql/junit/test/sql/SQLDataExceptionTests.java

@@ -28,11 +28,9 @@ import java.sql.SQLNonTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLDataExceptionTests extends BaseTest {
 
     /**

test/jdk/java/sql/junit/test/sql/SQLExceptionTests.java

@@ -26,11 +26,9 @@ import java.sql.SQLException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLExceptionTests extends BaseTest {
 
     /**

test/jdk/java/sql/junit/test/sql/SQLFeatureNotSupportedExceptionTests.java

@@ -28,11 +28,9 @@ import java.sql.SQLNonTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLFeatureNotSupportedExceptionTests extends BaseTest {
 
     /**

test/jdk/java/sql/junit/test/sql/SQLIntegrityConstraintViolationExceptionTests.java

@@ -28,11 +28,9 @@ import java.sql.SQLNonTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLIntegrityConstraintViolationExceptionTests extends BaseTest {
 
     /**

test/jdk/java/sql/junit/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java

@@ -28,11 +28,9 @@ import java.sql.SQLNonTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLInvalidAuthorizationSpecExceptionTests extends BaseTest {
 
     /**

test/jdk/java/sql/junit/test/sql/SQLNonTransientConnectionExceptionTests.java

@@ -28,11 +28,9 @@ import java.sql.SQLNonTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLNonTransientConnectionExceptionTests extends BaseTest {
 
     /**

test/jdk/java/sql/junit/test/sql/SQLNonTransientExceptionTests.java

@@ -27,11 +27,9 @@ import java.sql.SQLNonTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLNonTransientExceptionTests extends BaseTest {
 
     /**

test/jdk/java/sql/junit/test/sql/SQLRecoverableExceptionTests.java

@@ -27,11 +27,9 @@ import java.sql.SQLRecoverableException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLRecoverableExceptionTests extends BaseTest {
 
     /**

test/jdk/java/sql/junit/test/sql/SQLSyntaxErrorExceptionTests.java

@@ -28,11 +28,9 @@ import java.sql.SQLSyntaxErrorException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLSyntaxErrorExceptionTests extends BaseTest {
 
     /**

test/jdk/java/sql/junit/test/sql/SQLTimeoutExceptionTests.java

@@ -28,11 +28,9 @@ import java.sql.SQLTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLTimeoutExceptionTests extends BaseTest {
 
     /**

test/jdk/java/sql/junit/test/sql/SQLTransactionRollbackExceptionTests.java

@@ -28,11 +28,9 @@ import java.sql.SQLTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLTransactionRollbackExceptionTests extends BaseTest {
 
     /**

test/jdk/java/sql/junit/test/sql/SQLTransientConnectionExceptionTests.java

@@ -28,11 +28,9 @@ import java.sql.SQLTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLTransientConnectionExceptionTests extends BaseTest {
 
     /**

test/jdk/java/sql/junit/test/sql/SQLTransientExceptionTests.java

@@ -27,11 +27,9 @@ import java.sql.SQLTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLTransientExceptionTests extends BaseTest {
 
     /**

test/jdk/java/sql/junit/test/sql/SQLWarningTests.java

@@ -27,11 +27,9 @@ import java.sql.SQLWarning;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLWarningTests extends BaseTest {
 
     private final String[] warnings = {"Warning 1", "cause 1", "Warning 2",

test/jdk/java/sql/junit/test/sql/StatementTests.java

@@ -30,7 +30,6 @@ import org.junit.jupiter.api.Assertions;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -38,7 +37,6 @@ import org.junit.jupiter.params.provider.ValueSource;
 import util.BaseTest;
 import util.StubConnection;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class StatementTests extends BaseTest {
 
     private Statement stmt;

test/jdk/java/sql/junit/test/sql/TimeTests.java

@@ -28,13 +28,11 @@ import java.time.LocalTime;
 import org.junit.jupiter.api.Assertions;
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TimeTests extends BaseTest {
 
     /*

test/jdk/java/sql/junit/test/sql/TimestampTests.java

@@ -36,13 +36,11 @@ import org.junit.jupiter.api.Assertions;
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TimestampTests extends BaseTest {
 
     private static TimeZone defaultTimeZone = null;