From 178193aa935fdbaa227a70af43dce64f5762afaf Mon Sep 17 00:00:00 2001 From: Lance Andersen Date: Tue, 28 Oct 2014 19:55:20 -0400 Subject: [PATCH] 8062288: Minor re-org of java/sql testing tests Reviewed-by: joehw, rriggs --- jdk/test/java/sql/{ => testng}/TEST.properties | 0 .../sql/{ => testng}/test/sql/BatchUpdateExceptionTests.java | 0 .../java/sql/{ => testng}/test/sql/DataTruncationTests.java | 0 jdk/test/java/sql/{ => testng}/test/sql/DateTests.java | 0 .../{ => testng}/test/sql/DriverManagerPermissionsTests.java | 0 jdk/test/java/sql/{ => testng}/test/sql/DriverManagerTests.java | 0 .../sql/{ => testng}/test/sql/SQLClientInfoExceptionTests.java | 0 .../java/sql/{ => testng}/test/sql/SQLDataExceptionTests.java | 0 jdk/test/java/sql/{ => testng}/test/sql/SQLExceptionTests.java | 0 .../test/sql/SQLFeatureNotSupportedExceptionTests.java | 0 .../test/sql/SQLIntegrityConstraintViolationExceptionTests.java | 0 .../test/sql/SQLInvalidAuthorizationSpecExceptionTests.java | 0 .../test/sql/SQLNonTransientConnectionExceptionTests.java | 0 .../{ => testng}/test/sql/SQLNonTransientExceptionTests.java | 0 .../sql/{ => testng}/test/sql/SQLRecoverableExceptionTests.java | 0 .../sql/{ => testng}/test/sql/SQLSyntaxErrorExceptionTests.java | 0 .../sql/{ => testng}/test/sql/SQLTimeoutExceptionTests.java | 0 .../test/sql/SQLTransactionRollbackExceptionTests.java | 0 .../test/sql/SQLTransientConnectionExceptionTests.java | 0 .../sql/{ => testng}/test/sql/SQLTransientExceptionTests.java | 0 jdk/test/java/sql/{ => testng}/test/sql/SQLWarningTests.java | 0 jdk/test/java/sql/{ => testng}/test/sql/TimeTests.java | 0 jdk/test/java/sql/{ => testng}/test/sql/TimestampTests.java | 0 jdk/test/java/sql/{ => testng}/util/BaseTest.java | 0 jdk/test/java/sql/{ => testng}/util/DriverActionImpl.java | 0 .../sql/{ => testng}/util/SerializedBatchUpdateException.java | 0 jdk/test/java/sql/{ => testng}/util/StubConnection.java | 0 jdk/test/java/sql/{ => testng}/util/StubDriver.java | 0 jdk/test/java/sql/{ => testng}/util/StubDriverDA.java | 0 jdk/test/java/sql/{ => testng}/util/TestPolicy.java | 0 jdk/test/javax/sql/testng/TEST.properties | 2 +- 31 files changed, 1 insertion(+), 1 deletion(-) rename jdk/test/java/sql/{ => testng}/TEST.properties (100%) rename jdk/test/java/sql/{ => testng}/test/sql/BatchUpdateExceptionTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/DataTruncationTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/DateTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/DriverManagerPermissionsTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/DriverManagerTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/SQLClientInfoExceptionTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/SQLDataExceptionTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/SQLExceptionTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/SQLFeatureNotSupportedExceptionTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/SQLIntegrityConstraintViolationExceptionTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/SQLNonTransientConnectionExceptionTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/SQLNonTransientExceptionTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/SQLRecoverableExceptionTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/SQLSyntaxErrorExceptionTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/SQLTimeoutExceptionTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/SQLTransactionRollbackExceptionTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/SQLTransientConnectionExceptionTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/SQLTransientExceptionTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/SQLWarningTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/TimeTests.java (100%) rename jdk/test/java/sql/{ => testng}/test/sql/TimestampTests.java (100%) rename jdk/test/java/sql/{ => testng}/util/BaseTest.java (100%) rename jdk/test/java/sql/{ => testng}/util/DriverActionImpl.java (100%) rename jdk/test/java/sql/{ => testng}/util/SerializedBatchUpdateException.java (100%) rename jdk/test/java/sql/{ => testng}/util/StubConnection.java (100%) rename jdk/test/java/sql/{ => testng}/util/StubDriver.java (100%) rename jdk/test/java/sql/{ => testng}/util/StubDriverDA.java (100%) rename jdk/test/java/sql/{ => testng}/util/TestPolicy.java (100%) diff --git a/jdk/test/java/sql/TEST.properties b/jdk/test/java/sql/testng/TEST.properties similarity index 100% rename from jdk/test/java/sql/TEST.properties rename to jdk/test/java/sql/testng/TEST.properties diff --git a/jdk/test/java/sql/test/sql/BatchUpdateExceptionTests.java b/jdk/test/java/sql/testng/test/sql/BatchUpdateExceptionTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/BatchUpdateExceptionTests.java rename to jdk/test/java/sql/testng/test/sql/BatchUpdateExceptionTests.java diff --git a/jdk/test/java/sql/test/sql/DataTruncationTests.java b/jdk/test/java/sql/testng/test/sql/DataTruncationTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/DataTruncationTests.java rename to jdk/test/java/sql/testng/test/sql/DataTruncationTests.java diff --git a/jdk/test/java/sql/test/sql/DateTests.java b/jdk/test/java/sql/testng/test/sql/DateTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/DateTests.java rename to jdk/test/java/sql/testng/test/sql/DateTests.java diff --git a/jdk/test/java/sql/test/sql/DriverManagerPermissionsTests.java b/jdk/test/java/sql/testng/test/sql/DriverManagerPermissionsTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/DriverManagerPermissionsTests.java rename to jdk/test/java/sql/testng/test/sql/DriverManagerPermissionsTests.java diff --git a/jdk/test/java/sql/test/sql/DriverManagerTests.java b/jdk/test/java/sql/testng/test/sql/DriverManagerTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/DriverManagerTests.java rename to jdk/test/java/sql/testng/test/sql/DriverManagerTests.java diff --git a/jdk/test/java/sql/test/sql/SQLClientInfoExceptionTests.java b/jdk/test/java/sql/testng/test/sql/SQLClientInfoExceptionTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/SQLClientInfoExceptionTests.java rename to jdk/test/java/sql/testng/test/sql/SQLClientInfoExceptionTests.java diff --git a/jdk/test/java/sql/test/sql/SQLDataExceptionTests.java b/jdk/test/java/sql/testng/test/sql/SQLDataExceptionTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/SQLDataExceptionTests.java rename to jdk/test/java/sql/testng/test/sql/SQLDataExceptionTests.java diff --git a/jdk/test/java/sql/test/sql/SQLExceptionTests.java b/jdk/test/java/sql/testng/test/sql/SQLExceptionTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/SQLExceptionTests.java rename to jdk/test/java/sql/testng/test/sql/SQLExceptionTests.java diff --git a/jdk/test/java/sql/test/sql/SQLFeatureNotSupportedExceptionTests.java b/jdk/test/java/sql/testng/test/sql/SQLFeatureNotSupportedExceptionTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/SQLFeatureNotSupportedExceptionTests.java rename to jdk/test/java/sql/testng/test/sql/SQLFeatureNotSupportedExceptionTests.java diff --git a/jdk/test/java/sql/test/sql/SQLIntegrityConstraintViolationExceptionTests.java b/jdk/test/java/sql/testng/test/sql/SQLIntegrityConstraintViolationExceptionTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/SQLIntegrityConstraintViolationExceptionTests.java rename to jdk/test/java/sql/testng/test/sql/SQLIntegrityConstraintViolationExceptionTests.java diff --git a/jdk/test/java/sql/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java b/jdk/test/java/sql/testng/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java rename to jdk/test/java/sql/testng/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java diff --git a/jdk/test/java/sql/test/sql/SQLNonTransientConnectionExceptionTests.java b/jdk/test/java/sql/testng/test/sql/SQLNonTransientConnectionExceptionTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/SQLNonTransientConnectionExceptionTests.java rename to jdk/test/java/sql/testng/test/sql/SQLNonTransientConnectionExceptionTests.java diff --git a/jdk/test/java/sql/test/sql/SQLNonTransientExceptionTests.java b/jdk/test/java/sql/testng/test/sql/SQLNonTransientExceptionTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/SQLNonTransientExceptionTests.java rename to jdk/test/java/sql/testng/test/sql/SQLNonTransientExceptionTests.java diff --git a/jdk/test/java/sql/test/sql/SQLRecoverableExceptionTests.java b/jdk/test/java/sql/testng/test/sql/SQLRecoverableExceptionTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/SQLRecoverableExceptionTests.java rename to jdk/test/java/sql/testng/test/sql/SQLRecoverableExceptionTests.java diff --git a/jdk/test/java/sql/test/sql/SQLSyntaxErrorExceptionTests.java b/jdk/test/java/sql/testng/test/sql/SQLSyntaxErrorExceptionTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/SQLSyntaxErrorExceptionTests.java rename to jdk/test/java/sql/testng/test/sql/SQLSyntaxErrorExceptionTests.java diff --git a/jdk/test/java/sql/test/sql/SQLTimeoutExceptionTests.java b/jdk/test/java/sql/testng/test/sql/SQLTimeoutExceptionTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/SQLTimeoutExceptionTests.java rename to jdk/test/java/sql/testng/test/sql/SQLTimeoutExceptionTests.java diff --git a/jdk/test/java/sql/test/sql/SQLTransactionRollbackExceptionTests.java b/jdk/test/java/sql/testng/test/sql/SQLTransactionRollbackExceptionTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/SQLTransactionRollbackExceptionTests.java rename to jdk/test/java/sql/testng/test/sql/SQLTransactionRollbackExceptionTests.java diff --git a/jdk/test/java/sql/test/sql/SQLTransientConnectionExceptionTests.java b/jdk/test/java/sql/testng/test/sql/SQLTransientConnectionExceptionTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/SQLTransientConnectionExceptionTests.java rename to jdk/test/java/sql/testng/test/sql/SQLTransientConnectionExceptionTests.java diff --git a/jdk/test/java/sql/test/sql/SQLTransientExceptionTests.java b/jdk/test/java/sql/testng/test/sql/SQLTransientExceptionTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/SQLTransientExceptionTests.java rename to jdk/test/java/sql/testng/test/sql/SQLTransientExceptionTests.java diff --git a/jdk/test/java/sql/test/sql/SQLWarningTests.java b/jdk/test/java/sql/testng/test/sql/SQLWarningTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/SQLWarningTests.java rename to jdk/test/java/sql/testng/test/sql/SQLWarningTests.java diff --git a/jdk/test/java/sql/test/sql/TimeTests.java b/jdk/test/java/sql/testng/test/sql/TimeTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/TimeTests.java rename to jdk/test/java/sql/testng/test/sql/TimeTests.java diff --git a/jdk/test/java/sql/test/sql/TimestampTests.java b/jdk/test/java/sql/testng/test/sql/TimestampTests.java similarity index 100% rename from jdk/test/java/sql/test/sql/TimestampTests.java rename to jdk/test/java/sql/testng/test/sql/TimestampTests.java diff --git a/jdk/test/java/sql/util/BaseTest.java b/jdk/test/java/sql/testng/util/BaseTest.java similarity index 100% rename from jdk/test/java/sql/util/BaseTest.java rename to jdk/test/java/sql/testng/util/BaseTest.java diff --git a/jdk/test/java/sql/util/DriverActionImpl.java b/jdk/test/java/sql/testng/util/DriverActionImpl.java similarity index 100% rename from jdk/test/java/sql/util/DriverActionImpl.java rename to jdk/test/java/sql/testng/util/DriverActionImpl.java diff --git a/jdk/test/java/sql/util/SerializedBatchUpdateException.java b/jdk/test/java/sql/testng/util/SerializedBatchUpdateException.java similarity index 100% rename from jdk/test/java/sql/util/SerializedBatchUpdateException.java rename to jdk/test/java/sql/testng/util/SerializedBatchUpdateException.java diff --git a/jdk/test/java/sql/util/StubConnection.java b/jdk/test/java/sql/testng/util/StubConnection.java similarity index 100% rename from jdk/test/java/sql/util/StubConnection.java rename to jdk/test/java/sql/testng/util/StubConnection.java diff --git a/jdk/test/java/sql/util/StubDriver.java b/jdk/test/java/sql/testng/util/StubDriver.java similarity index 100% rename from jdk/test/java/sql/util/StubDriver.java rename to jdk/test/java/sql/testng/util/StubDriver.java diff --git a/jdk/test/java/sql/util/StubDriverDA.java b/jdk/test/java/sql/testng/util/StubDriverDA.java similarity index 100% rename from jdk/test/java/sql/util/StubDriverDA.java rename to jdk/test/java/sql/testng/util/StubDriverDA.java diff --git a/jdk/test/java/sql/util/TestPolicy.java b/jdk/test/java/sql/testng/util/TestPolicy.java similarity index 100% rename from jdk/test/java/sql/util/TestPolicy.java rename to jdk/test/java/sql/testng/util/TestPolicy.java diff --git a/jdk/test/javax/sql/testng/TEST.properties b/jdk/test/javax/sql/testng/TEST.properties index 6959dd476fd..97bfe7c5e31 100644 --- a/jdk/test/javax/sql/testng/TEST.properties +++ b/jdk/test/javax/sql/testng/TEST.properties @@ -1,4 +1,4 @@ # JDBC unit tests uses TestNG TestNG.dirs= . othervm.dirs= . -lib.dirs = /java/sql/ +lib.dirs = /java/sql/testng