# IGNITE-591 Enable tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bac6f481 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bac6f481 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bac6f481 Branch: refs/heads/master Commit: bac6f481dd766ac1105fcc127e7ee557f96598de Parents: 4b06e77 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Thu Jul 2 14:56:12 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Thu Jul 2 14:56:12 2015 +0300 ---------------------------------------------------------------------- .../hibernate/HibernateL2CacheSelfTest.java | 50 ++++++++++---------- .../HibernateL2CacheTransactionalSelfTest.java | 38 +++++++-------- .../processors/cache/GridCacheJtaSelfTest.java | 23 ++++----- 3 files changed, 55 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bac6f481/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java index bb5884a..fe34ea8 100644 --- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java +++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java @@ -17,32 +17,37 @@ package org.apache.ignite.cache.hibernate; -import org.apache.ignite.cache.affinity.rendezvous.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.spi.discovery.tcp.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.apache.ignite.testframework.*; -import org.apache.ignite.testframework.junits.common.*; +import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteKernal; +import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.hibernate.*; import org.hibernate.Query; -import org.hibernate.annotations.*; -import org.hibernate.cache.spi.*; +import org.hibernate.annotations.NaturalId; +import org.hibernate.annotations.NaturalIdCache; +import org.hibernate.cache.spi.GeneralDataRegion; +import org.hibernate.cache.spi.TransactionalDataRegion; import org.hibernate.cache.spi.access.AccessType; -import org.hibernate.cfg.*; -import org.hibernate.exception.*; -import org.hibernate.service.*; -import org.hibernate.stat.*; +import org.hibernate.cfg.Configuration; +import org.hibernate.exception.ConstraintViolationException; +import org.hibernate.service.ServiceRegistryBuilder; +import org.hibernate.stat.NaturalIdCacheStatistics; +import org.hibernate.stat.SecondLevelCacheStatistics; import javax.persistence.*; import java.util.*; -import java.util.concurrent.*; +import java.util.concurrent.Callable; -import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; +import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; +import static org.apache.ignite.cache.CacheMode.PARTITIONED; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; import static org.apache.ignite.cache.hibernate.HibernateRegionFactory.*; import static org.hibernate.cfg.Environment.*; @@ -51,11 +56,6 @@ import static org.hibernate.cfg.Environment.*; * Tests Hibernate L2 cache. */ public class HibernateL2CacheSelfTest extends GridCommonAbstractTest { - /** {@inheritDoc} */ - @Override protected void beforeTest() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-591";); - } - /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -1128,6 +1128,8 @@ public class HibernateL2CacheSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testNaturalIdCache() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-1084";); + for (AccessType accessType : accessTypes()) testNaturalIdCache(accessType); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bac6f481/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java index c429d9a..6f47d3b 100644 --- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java +++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java @@ -17,23 +17,24 @@ package org.apache.ignite.cache.hibernate; -import org.apache.commons.dbcp.managed.*; -import org.apache.ignite.cache.jta.*; -import org.apache.ignite.configuration.*; -import org.h2.jdbcx.*; -import org.hibernate.cache.spi.access.*; -import org.hibernate.engine.transaction.internal.jta.*; +import org.apache.commons.dbcp.managed.BasicManagedDataSource; +import org.apache.ignite.cache.jta.CacheTmLookup; +import org.apache.ignite.configuration.CacheConfiguration; +import org.h2.jdbcx.JdbcDataSource; +import org.hibernate.cache.spi.access.AccessType; +import org.hibernate.engine.transaction.internal.jta.JtaTransactionFactory; import org.hibernate.engine.transaction.spi.TransactionFactory; -import org.hibernate.service.*; -import org.hibernate.service.jdbc.connections.internal.*; -import org.hibernate.service.jdbc.connections.spi.*; -import org.hibernate.service.jta.platform.internal.*; -import org.hibernate.service.jta.platform.spi.*; -import org.jetbrains.annotations.*; -import org.objectweb.jotm.*; - -import javax.transaction.*; -import java.util.*; +import org.hibernate.service.ServiceRegistryBuilder; +import org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl; +import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; +import org.hibernate.service.jta.platform.internal.AbstractJtaPlatform; +import org.hibernate.service.jta.platform.spi.JtaPlatform; +import org.jetbrains.annotations.Nullable; +import org.objectweb.jotm.Jotm; + +import javax.transaction.TransactionManager; +import javax.transaction.UserTransaction; +import java.util.Collections; /** * @@ -41,11 +42,6 @@ import java.util.*; * to used the same TransactionManager). */ public class HibernateL2CacheTransactionalSelfTest extends HibernateL2CacheSelfTest { - /** {@inheritDoc} */ - @Override protected void beforeTest() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-591";); - } - /** */ private static Jotm jotm; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bac6f481/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java index 37e9ed2..9b8cb15 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java @@ -17,18 +17,21 @@ package org.apache.ignite.internal.processors.cache; -import org.apache.ignite.*; -import org.apache.ignite.cache.*; -import org.apache.ignite.cache.jta.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.*; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.cache.jta.CacheTmLookup; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.transactions.Transaction; -import org.objectweb.jotm.*; +import org.objectweb.jotm.Jotm; -import javax.transaction.*; +import javax.transaction.Status; +import javax.transaction.TransactionManager; +import javax.transaction.UserTransaction; -import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.transactions.TransactionState.*; +import static org.apache.ignite.cache.CacheMode.PARTITIONED; +import static org.apache.ignite.transactions.TransactionState.ACTIVE; /** * Abstract class for cache tests. @@ -145,8 +148,6 @@ public class GridCacheJtaSelfTest extends GridCacheAbstractSelfTest { } /** - * TODO: IGNITE-591. - * * @throws Exception If failed. */ @SuppressWarnings("ConstantConditions")
