From 93bc4272dfb024f63360b0b4c48bc8e7944953c5 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Fri, 8 Oct 2010 20:29:59 -0500 Subject: [PATCH] HHH-5616 - Switch to Gradle for builds --- .../functional/SingleNodeTestCase.java | 2 -- .../subquery/CorrelatedSubqueryTest.java | 2 -- .../envers/test/AbstractEntityTest.java | 1 - .../cache/BaseCacheProviderTestCase.java | 0 .../org/hibernate/testing/cache/Item.hbm.xml | 0 .../java/org/hibernate/testing/cache/Item.java | 0 .../hibernate/testing/cache/VersionedItem.java | 0 .../AbstractClassLoaderIsolatedTestCase.java | 0 .../hibernate/testing/junit/DialectChecks.java | 0 .../testing/junit/FailureExpected.java | 0 .../testing/junit/RequiresDialect.java | 0 .../testing/junit/RequiresDialectFeature.java | 0 .../testing/junit/SkipForDialect.java | 0 .../org/hibernate/testing/junit/SkipLog.java | 0 .../testing/junit/TestSuiteVisitor.java | 0 .../hibernate/testing/junit/UnitTestCase.java | 0 .../DatabaseSpecificFunctionalTestCase.java | 0 .../junit/functional/ExecutionEnvironment.java | 0 .../junit/functional/FunctionalTestCase.java | 0 .../FunctionalTestClassTestSuite.java | 0 .../annotations/HibernateTestCase.java | 0 .../testing/tm/ConnectionProviderImpl.java | 0 .../testing/tm/SimpleJtaTransactionImpl.java | 0 .../tm/SimpleJtaTransactionManagerImpl.java | 0 .../tm/TransactionManagerLookupImpl.java | 0 .../java/org/hibernate/testing/tm/package.html | 0 .../bytecode/cglib/CGLIBThreadLocalTest.java | 3 --- .../test/hql/ASTParserLoadingOrderByTest.java | 18 ------------------ .../test/legacy/ComponentNotNullTest.java | 1 - ...nedRecursiveBidirectionalOneToManyTest.java | 3 --- ...bstractQueryCacheResultTransformerTest.java | 1 - 31 files changed, 31 deletions(-) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/cache/BaseCacheProviderTestCase.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/cache/Item.hbm.xml (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/cache/Item.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/cache/VersionedItem.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/junit/AbstractClassLoaderIsolatedTestCase.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/junit/DialectChecks.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/junit/FailureExpected.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/junit/RequiresDialect.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/junit/RequiresDialectFeature.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/junit/SkipForDialect.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/junit/SkipLog.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/junit/TestSuiteVisitor.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/junit/UnitTestCase.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/junit/functional/DatabaseSpecificFunctionalTestCase.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/junit/functional/ExecutionEnvironment.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/junit/functional/FunctionalTestCase.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/junit/functional/FunctionalTestClassTestSuite.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/tm/ConnectionProviderImpl.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/tm/SimpleJtaTransactionImpl.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/tm/SimpleJtaTransactionManagerImpl.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/tm/TransactionManagerLookupImpl.java (100%) rename {testing/src/main => hibernate-core/src/test}/java/org/hibernate/testing/tm/package.html (100%) diff --git a/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java b/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java index 9799a26600..8e40eafa9e 100644 --- a/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java +++ b/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java @@ -1,7 +1,5 @@ package org.hibernate.test.cache.infinispan.functional; -import java.util.Map; - import javax.transaction.Status; import javax.transaction.TransactionManager; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/criteria/subquery/CorrelatedSubqueryTest.java b/entitymanager/src/test/java/org/hibernate/ejb/criteria/subquery/CorrelatedSubqueryTest.java index 1b25611f6c..f80868e066 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/criteria/subquery/CorrelatedSubqueryTest.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/criteria/subquery/CorrelatedSubqueryTest.java @@ -23,9 +23,7 @@ */ package org.hibernate.ejb.criteria.subquery; -import java.util.List; import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Join; diff --git a/envers/src/test/java/org/hibernate/envers/test/AbstractEntityTest.java b/envers/src/test/java/org/hibernate/envers/test/AbstractEntityTest.java index c3431f11ed..b6e1e32fcf 100644 --- a/envers/src/test/java/org/hibernate/envers/test/AbstractEntityTest.java +++ b/envers/src/test/java/org/hibernate/envers/test/AbstractEntityTest.java @@ -37,7 +37,6 @@ import org.hibernate.testing.tm.TransactionManagerLookupImpl; import org.testng.annotations.*; import org.hibernate.ejb.Ejb3Configuration; -import org.hibernate.event.*; /** * @author Adam Warski (adam at warski dot org) diff --git a/testing/src/main/java/org/hibernate/testing/cache/BaseCacheProviderTestCase.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/BaseCacheProviderTestCase.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/cache/BaseCacheProviderTestCase.java rename to hibernate-core/src/test/java/org/hibernate/testing/cache/BaseCacheProviderTestCase.java diff --git a/testing/src/main/java/org/hibernate/testing/cache/Item.hbm.xml b/hibernate-core/src/test/java/org/hibernate/testing/cache/Item.hbm.xml similarity index 100% rename from testing/src/main/java/org/hibernate/testing/cache/Item.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/testing/cache/Item.hbm.xml diff --git a/testing/src/main/java/org/hibernate/testing/cache/Item.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/Item.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/cache/Item.java rename to hibernate-core/src/test/java/org/hibernate/testing/cache/Item.java diff --git a/testing/src/main/java/org/hibernate/testing/cache/VersionedItem.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/VersionedItem.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/cache/VersionedItem.java rename to hibernate-core/src/test/java/org/hibernate/testing/cache/VersionedItem.java diff --git a/testing/src/main/java/org/hibernate/testing/junit/AbstractClassLoaderIsolatedTestCase.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/AbstractClassLoaderIsolatedTestCase.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/junit/AbstractClassLoaderIsolatedTestCase.java rename to hibernate-core/src/test/java/org/hibernate/testing/junit/AbstractClassLoaderIsolatedTestCase.java diff --git a/testing/src/main/java/org/hibernate/testing/junit/DialectChecks.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/DialectChecks.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/junit/DialectChecks.java rename to hibernate-core/src/test/java/org/hibernate/testing/junit/DialectChecks.java diff --git a/testing/src/main/java/org/hibernate/testing/junit/FailureExpected.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/FailureExpected.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/junit/FailureExpected.java rename to hibernate-core/src/test/java/org/hibernate/testing/junit/FailureExpected.java diff --git a/testing/src/main/java/org/hibernate/testing/junit/RequiresDialect.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/RequiresDialect.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/junit/RequiresDialect.java rename to hibernate-core/src/test/java/org/hibernate/testing/junit/RequiresDialect.java diff --git a/testing/src/main/java/org/hibernate/testing/junit/RequiresDialectFeature.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/RequiresDialectFeature.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/junit/RequiresDialectFeature.java rename to hibernate-core/src/test/java/org/hibernate/testing/junit/RequiresDialectFeature.java diff --git a/testing/src/main/java/org/hibernate/testing/junit/SkipForDialect.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/SkipForDialect.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/junit/SkipForDialect.java rename to hibernate-core/src/test/java/org/hibernate/testing/junit/SkipForDialect.java diff --git a/testing/src/main/java/org/hibernate/testing/junit/SkipLog.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/SkipLog.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/junit/SkipLog.java rename to hibernate-core/src/test/java/org/hibernate/testing/junit/SkipLog.java diff --git a/testing/src/main/java/org/hibernate/testing/junit/TestSuiteVisitor.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/TestSuiteVisitor.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/junit/TestSuiteVisitor.java rename to hibernate-core/src/test/java/org/hibernate/testing/junit/TestSuiteVisitor.java diff --git a/testing/src/main/java/org/hibernate/testing/junit/UnitTestCase.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/UnitTestCase.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/junit/UnitTestCase.java rename to hibernate-core/src/test/java/org/hibernate/testing/junit/UnitTestCase.java diff --git a/testing/src/main/java/org/hibernate/testing/junit/functional/DatabaseSpecificFunctionalTestCase.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/DatabaseSpecificFunctionalTestCase.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/junit/functional/DatabaseSpecificFunctionalTestCase.java rename to hibernate-core/src/test/java/org/hibernate/testing/junit/functional/DatabaseSpecificFunctionalTestCase.java diff --git a/testing/src/main/java/org/hibernate/testing/junit/functional/ExecutionEnvironment.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/ExecutionEnvironment.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/junit/functional/ExecutionEnvironment.java rename to hibernate-core/src/test/java/org/hibernate/testing/junit/functional/ExecutionEnvironment.java diff --git a/testing/src/main/java/org/hibernate/testing/junit/functional/FunctionalTestCase.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/FunctionalTestCase.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/junit/functional/FunctionalTestCase.java rename to hibernate-core/src/test/java/org/hibernate/testing/junit/functional/FunctionalTestCase.java diff --git a/testing/src/main/java/org/hibernate/testing/junit/functional/FunctionalTestClassTestSuite.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/FunctionalTestClassTestSuite.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/junit/functional/FunctionalTestClassTestSuite.java rename to hibernate-core/src/test/java/org/hibernate/testing/junit/functional/FunctionalTestClassTestSuite.java diff --git a/testing/src/main/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java rename to hibernate-core/src/test/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java diff --git a/testing/src/main/java/org/hibernate/testing/tm/ConnectionProviderImpl.java b/hibernate-core/src/test/java/org/hibernate/testing/tm/ConnectionProviderImpl.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/tm/ConnectionProviderImpl.java rename to hibernate-core/src/test/java/org/hibernate/testing/tm/ConnectionProviderImpl.java diff --git a/testing/src/main/java/org/hibernate/testing/tm/SimpleJtaTransactionImpl.java b/hibernate-core/src/test/java/org/hibernate/testing/tm/SimpleJtaTransactionImpl.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/tm/SimpleJtaTransactionImpl.java rename to hibernate-core/src/test/java/org/hibernate/testing/tm/SimpleJtaTransactionImpl.java diff --git a/testing/src/main/java/org/hibernate/testing/tm/SimpleJtaTransactionManagerImpl.java b/hibernate-core/src/test/java/org/hibernate/testing/tm/SimpleJtaTransactionManagerImpl.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/tm/SimpleJtaTransactionManagerImpl.java rename to hibernate-core/src/test/java/org/hibernate/testing/tm/SimpleJtaTransactionManagerImpl.java diff --git a/testing/src/main/java/org/hibernate/testing/tm/TransactionManagerLookupImpl.java b/hibernate-core/src/test/java/org/hibernate/testing/tm/TransactionManagerLookupImpl.java similarity index 100% rename from testing/src/main/java/org/hibernate/testing/tm/TransactionManagerLookupImpl.java rename to hibernate-core/src/test/java/org/hibernate/testing/tm/TransactionManagerLookupImpl.java diff --git a/testing/src/main/java/org/hibernate/testing/tm/package.html b/hibernate-core/src/test/java/org/hibernate/testing/tm/package.html similarity index 100% rename from testing/src/main/java/org/hibernate/testing/tm/package.html rename to hibernate-core/src/test/java/org/hibernate/testing/tm/package.html diff --git a/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/CGLIBThreadLocalTest.java b/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/CGLIBThreadLocalTest.java index 704b8bb370..8cac960f61 100644 --- a/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/CGLIBThreadLocalTest.java +++ b/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/CGLIBThreadLocalTest.java @@ -1,8 +1,5 @@ package org.hibernate.test.bytecode.cglib; -import org.hibernate.cfg.*; -import org.hibernate.*; -import org.hibernate.proxy.*; import org.hibernate.test.bytecode.*; import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; diff --git a/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingOrderByTest.java b/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingOrderByTest.java index a36af4f797..38ec1b5eb1 100644 --- a/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingOrderByTest.java +++ b/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingOrderByTest.java @@ -23,16 +23,7 @@ */ package org.hibernate.test.hql; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.sql.Date; -import java.sql.Time; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -66,15 +57,6 @@ import org.hibernate.hql.ast.ASTQueryTranslatorFactory; import org.hibernate.hql.ast.QuerySyntaxException; import org.hibernate.persister.entity.DiscriminatorType; import org.hibernate.stat.QueryStatistics; -import org.hibernate.test.any.IntegerPropertyValue; -import org.hibernate.test.any.PropertySet; -import org.hibernate.test.any.PropertyValue; -import org.hibernate.test.any.StringPropertyValue; -import org.hibernate.test.cid.Customer; -import org.hibernate.test.cid.LineItem; -import org.hibernate.test.cid.LineItem.Id; -import org.hibernate.test.cid.Order; -import org.hibernate.test.cid.Product; import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.transform.DistinctRootEntityResultTransformer; diff --git a/testsuite/src/test/java/org/hibernate/test/legacy/ComponentNotNullTest.java b/testsuite/src/test/java/org/hibernate/test/legacy/ComponentNotNullTest.java index ebad8c61b1..4cac85ae6e 100644 --- a/testsuite/src/test/java/org/hibernate/test/legacy/ComponentNotNullTest.java +++ b/testsuite/src/test/java/org/hibernate/test/legacy/ComponentNotNullTest.java @@ -4,7 +4,6 @@ package org.hibernate.test.legacy; import java.util.ArrayList; import junit.framework.Test; -import junit.textui.TestRunner; import org.hibernate.PropertyValueException; import org.hibernate.Session; diff --git a/testsuite/src/test/java/org/hibernate/test/onetomany/AbstractVersionedRecursiveBidirectionalOneToManyTest.java b/testsuite/src/test/java/org/hibernate/test/onetomany/AbstractVersionedRecursiveBidirectionalOneToManyTest.java index ac88570137..e169515988 100644 --- a/testsuite/src/test/java/org/hibernate/test/onetomany/AbstractVersionedRecursiveBidirectionalOneToManyTest.java +++ b/testsuite/src/test/java/org/hibernate/test/onetomany/AbstractVersionedRecursiveBidirectionalOneToManyTest.java @@ -24,14 +24,11 @@ */ package org.hibernate.test.onetomany; -import java.util.ArrayList; - import org.hibernate.CacheMode; import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.testing.junit.functional.FunctionalTestCase; -import org.hibernate.test.readonly.VersionedNode; /** * @author Burkhard Graves, Gail Badner diff --git a/testsuite/src/test/java/org/hibernate/test/querycache/AbstractQueryCacheResultTransformerTest.java b/testsuite/src/test/java/org/hibernate/test/querycache/AbstractQueryCacheResultTransformerTest.java index 3c65a4f262..c8933742be 100644 --- a/testsuite/src/test/java/org/hibernate/test/querycache/AbstractQueryCacheResultTransformerTest.java +++ b/testsuite/src/test/java/org/hibernate/test/querycache/AbstractQueryCacheResultTransformerTest.java @@ -44,7 +44,6 @@ import org.hibernate.criterion.Projections; import org.hibernate.criterion.Property; import org.hibernate.criterion.Restrictions; import org.hibernate.impl.SessionFactoryImpl; -import org.hibernate.test.fetchprofiles.join.Enrollment; import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.proxy.HibernateProxy; import org.hibernate.transform.AliasToBeanConstructorResultTransformer;