Repository: ignite Updated Branches: refs/heads/ignite-9893 d9bd387e3 -> 7b09d7970
Test fixes Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7b09d797 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7b09d797 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7b09d797 Branch: refs/heads/ignite-9893 Commit: 7b09d797071e83a80fe2dcd863ac9adf196c4c85 Parents: d9bd387 Author: Ilya Kasnacheev <ilya.kasnach...@gmail.com> Authored: Wed Dec 19 17:53:54 2018 +0300 Committer: Ilya Kasnacheev <ilya.kasnach...@gmail.com> Committed: Wed Dec 19 17:53:54 2018 +0300 ---------------------------------------------------------------------- .../hibernate/HibernateL2CacheMultiJvmTest.java | 25 ++++++++++++++------ .../hibernate/HibernateL2CacheMultiJvmTest.java | 25 ++++++++++++++------ .../HibernateL2CacheConfigurationSelfTest.java | 6 ----- .../hibernate/HibernateL2CacheMultiJvmTest.java | 9 ------- .../hibernate/HibernateL2CacheSelfTest.java | 6 ----- .../HibernateL2CacheStrategySelfTest.java | 6 ----- 6 files changed, 36 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7b09d797/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java index 8221226..e88962a 100644 --- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java +++ b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java @@ -40,6 +40,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; +import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; import static org.apache.ignite.cache.hibernate.HibernateL2CacheSelfTest.CONNECTION_URL; import static org.apache.ignite.cache.hibernate.HibernateL2CacheSelfTest.hibernateProperties; @@ -51,7 +53,7 @@ import static org.hibernate.cache.spi.access.AccessType.NONSTRICT_READ_WRITE; @RunWith(JUnit4.class) public class HibernateL2CacheMultiJvmTest extends GridCommonAbstractTest { /** */ - private static final String CACHE_NAME = "hibernateCache"; + private static final String TIMESTAMP_CACHE = "org.hibernate.cache.spi.UpdateTimestampsCache"; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { @@ -60,12 +62,12 @@ public class HibernateL2CacheMultiJvmTest extends GridCommonAbstractTest { if (!getTestIgniteInstanceName(0).equals(igniteInstanceName)) cfg.setClientMode(true); - CacheConfiguration ccfg = new CacheConfiguration(); - - ccfg.setName(CACHE_NAME); - ccfg.setWriteSynchronizationMode(FULL_SYNC); - - cfg.setCacheConfiguration(ccfg); + cfg.setCacheConfiguration( + cacheConfiguration(TIMESTAMP_CACHE), + cacheConfiguration(Entity1.class.getName()), + cacheConfiguration(Entity2.class.getName()), + cacheConfiguration(Entity3.class.getName()) + ); cfg.setMarshaller(new BinaryMarshaller()); @@ -74,6 +76,15 @@ public class HibernateL2CacheMultiJvmTest extends GridCommonAbstractTest { return cfg; } + private CacheConfiguration cacheConfiguration(String cacheName) { + CacheConfiguration cfg = new CacheConfiguration(); + cfg.setName(cacheName); + cfg.setCacheMode(PARTITIONED); + cfg.setAtomicityMode(ATOMIC); + cfg.setWriteSynchronizationMode(FULL_SYNC); + return cfg; + } + /** {@inheritDoc} */ @Override protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/ignite/blob/7b09d797/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java b/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java index adc4418..e712484 100644 --- a/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java +++ b/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java @@ -40,6 +40,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; +import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; import static org.apache.ignite.cache.hibernate.HibernateL2CacheSelfTest.CONNECTION_URL; import static org.apache.ignite.cache.hibernate.HibernateL2CacheSelfTest.hibernateProperties; @@ -51,7 +53,7 @@ import static org.hibernate.cache.spi.access.AccessType.NONSTRICT_READ_WRITE; @RunWith(JUnit4.class) public class HibernateL2CacheMultiJvmTest extends GridCommonAbstractTest { /** */ - private static final String CACHE_NAME = "hibernateCache"; + private static final String TIMESTAMP_CACHE = "org.hibernate.cache.spi.UpdateTimestampsCache"; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { @@ -60,12 +62,12 @@ public class HibernateL2CacheMultiJvmTest extends GridCommonAbstractTest { if (!getTestIgniteInstanceName(0).equals(igniteInstanceName)) cfg.setClientMode(true); - CacheConfiguration ccfg = new CacheConfiguration(); - - ccfg.setName(CACHE_NAME); - ccfg.setWriteSynchronizationMode(FULL_SYNC); - - cfg.setCacheConfiguration(ccfg); + cfg.setCacheConfiguration( + cacheConfiguration(TIMESTAMP_CACHE), + cacheConfiguration(Entity1.class.getName()), + cacheConfiguration(Entity2.class.getName()), + cacheConfiguration(Entity3.class.getName()) + ); cfg.setMarshaller(new BinaryMarshaller()); @@ -74,6 +76,15 @@ public class HibernateL2CacheMultiJvmTest extends GridCommonAbstractTest { return cfg; } + private CacheConfiguration cacheConfiguration(String cacheName) { + CacheConfiguration cfg = new CacheConfiguration(); + cfg.setName(cacheName); + cfg.setCacheMode(PARTITIONED); + cfg.setAtomicityMode(ATOMIC); + cfg.setWriteSynchronizationMode(FULL_SYNC); + return cfg; + } + /** {@inheritDoc} */ @Override protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/ignite/blob/7b09d797/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java b/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java index c70f4a0..a1f8ae0 100644 --- a/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java +++ b/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java @@ -43,9 +43,6 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cache.spi.access.AccessType; import org.hibernate.cfg.Configuration; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -83,19 +80,16 @@ public class HibernateL2CacheConfigurationSelfTest extends GridCommonAbstractTes public static final String CONNECTION_URL = "jdbc:h2:mem:example;DB_CLOSE_DELAY=-1"; /** {@inheritDoc} */ - @BeforeClass @Override protected void beforeTestsStarted() throws Exception { startGrid(0); } /** {@inheritDoc} */ - @AfterClass @Override protected void afterTestsStopped() throws Exception { stopAllGrids(); } /** {@inheritDoc} */ - @After @Override protected void afterTest() throws Exception { for (IgniteCacheProxy<?, ?> cache : ((IgniteKernal)grid(0)).caches()) cache.clear(); http://git-wip-us.apache.org/repos/asf/ignite/blob/7b09d797/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java b/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java index 994eeff..5f54ad0 100644 --- a/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java +++ b/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java @@ -36,8 +36,6 @@ import org.hibernate.Transaction; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -55,9 +53,6 @@ import static org.hibernate.cache.spi.access.AccessType.NONSTRICT_READ_WRITE; */ @RunWith(JUnit4.class) public class HibernateL2CacheMultiJvmTest extends GridCommonAbstractTest { - /** */ - private static final String CACHE_NAME = "hibernateCache"; - /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); @@ -65,9 +60,7 @@ public class HibernateL2CacheMultiJvmTest extends GridCommonAbstractTest { if (!getTestIgniteInstanceName(0).equals(igniteInstanceName)) cfg.setClientMode(true); - cfg.setCacheConfiguration( - cacheConfiguration(CACHE_NAME), cacheConfiguration(DEFAULT_UPDATE_TIMESTAMPS_REGION_UNQUALIFIED_NAME), cacheConfiguration(Entity1.class.getName()), cacheConfiguration(Entity2.class.getName()), @@ -96,7 +89,6 @@ public class HibernateL2CacheMultiJvmTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @BeforeClass @Override protected void beforeTestsStarted() throws Exception { super.beforeTestsStarted(); @@ -107,7 +99,6 @@ public class HibernateL2CacheMultiJvmTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @AfterClass @Override protected void afterTestsStopped() throws Exception { stopAllGrids(); http://git-wip-us.apache.org/repos/asf/ignite/blob/7b09d797/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java b/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java index 1919ce9..ea43ea7 100644 --- a/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java +++ b/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java @@ -58,9 +58,6 @@ import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.RootClass; import org.hibernate.query.Query; import org.hibernate.stat.CacheRegionStatistics; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -507,19 +504,16 @@ public class HibernateL2CacheSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @BeforeClass @Override protected void beforeTestsStarted() throws Exception { startGrids(2); } /** {@inheritDoc} */ - @AfterClass @Override protected void afterTestsStopped() throws Exception { stopAllGrids(); } /** {@inheritDoc} */ - @After @Override protected void afterTest() throws Exception { cleanup(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/7b09d797/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheStrategySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheStrategySelfTest.java b/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheStrategySelfTest.java index e653658..e859284 100644 --- a/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheStrategySelfTest.java +++ b/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheStrategySelfTest.java @@ -40,9 +40,6 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cache.spi.access.AccessType; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.RootClass; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -80,19 +77,16 @@ public class HibernateL2CacheStrategySelfTest extends GridCommonAbstractTest { private SessionFactory sesFactory1; /** {@inheritDoc} */ - @BeforeClass @Override protected void beforeTestsStarted() throws Exception { startGrid(0); } /** {@inheritDoc} */ - @AfterClass @Override protected void afterTestsStopped() throws Exception { stopAllGrids(); } /** {@inheritDoc} */ - @After @Override protected void afterTest() throws Exception { for (IgniteCacheProxy<?, ?> cache : ((IgniteKernal)grid(0)).caches()) cache.clear();
