ignite-615 ignite-616 test implementation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2335ef99 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2335ef99 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2335ef99 Branch: refs/heads/ignite-615-616 Commit: 2335ef9921295241960af20e245b69b7919c0b4f Parents: ef5d647 Author: avinogradov <avinogra...@gridgain.com> Authored: Fri Mar 27 19:16:58 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Fri Mar 27 19:16:58 2015 +0300 ---------------------------------------------------------------------- ...IgniteCacheJdbcBlobStoreNodeRestartTest.java | 52 +++++++++++++++++++ ...IgniteCacheStoreNodeRestartAbstractTest.java | 9 ++-- .../CacheHibernateBlobStoreNodeRestartTest.java | 52 +++++++++++++++++++ ...bernateBlobStoreNodeRestartAbstractTest.java | 53 -------------------- .../testsuites/IgniteHibernateTestSuite.java | 2 + 5 files changed, 112 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2335ef99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheJdbcBlobStoreNodeRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheJdbcBlobStoreNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheJdbcBlobStoreNodeRestartTest.java new file mode 100644 index 0000000..89c925f --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheJdbcBlobStoreNodeRestartTest.java @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache.integration; + +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.store.*; +import org.apache.ignite.cache.store.jdbc.*; +import org.apache.ignite.configuration.*; + +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; + +public class IgniteCacheJdbcBlobStoreNodeRestartTest extends IgniteCacheStoreNodeRestartAbstractTest { + /** {@inheritDoc} */ + @Override protected CacheStore getStore() { + return new CacheJdbcBlobStore(); + } + + /** {@inheritDoc} */ + @Override protected CacheMode cacheMode() { + return CacheMode.PARTITIONED; + } + + /** {@inheritDoc} */ + @Override protected CacheAtomicityMode atomicityMode() { + return CacheAtomicityMode.ATOMIC; + } + + /** {@inheritDoc} */ + @Override protected NearCacheConfiguration nearConfiguration() { + return null; + } + + /** {@inheritDoc} */ + @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { + return PRIMARY; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2335ef99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreNodeRestartAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreNodeRestartAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreNodeRestartAbstractTest.java index 89a203f..37fa531 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreNodeRestartAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreNodeRestartAbstractTest.java @@ -59,7 +59,7 @@ public abstract class IgniteCacheStoreNodeRestartAbstractTest extends IgniteCach } @Override protected int gridCount() { - return 2; + return 1; } /** */ @@ -71,10 +71,13 @@ public abstract class IgniteCacheStoreNodeRestartAbstractTest extends IgniteCach public void testStoreSession() throws Exception { grid(0).cache(CACHE_NAME1).put("key1", new UserObject("key1")); stopGrid(0); - startGrid(0); - grid(1).cache(CACHE_NAME1).get("key1"); + startGrid(1); + //Checking that marshaller works correct after all nodes was stopped. + UserObject obj = grid(1).<Object, UserObject>cache(CACHE_NAME1).get("key1"); + assert obj.field.equals("key1"); } + /** */ private static class UserObject implements Serializable{ private String field; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2335ef99/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java new file mode 100644 index 0000000..ad5ae7d --- /dev/null +++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.cache.store.hibernate; + +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.store.*; +import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.processors.cache.integration.*; + +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; + +public class CacheHibernateBlobStoreNodeRestartTest extends IgniteCacheStoreNodeRestartAbstractTest { + /** {@inheritDoc} */ + @Override protected CacheStore getStore() { + return new CacheHibernateBlobStore(); + } + + /** {@inheritDoc} */ + @Override protected CacheMode cacheMode() { + return CacheMode.PARTITIONED; + } + + /** {@inheritDoc} */ + @Override protected CacheAtomicityMode atomicityMode() { + return CacheAtomicityMode.ATOMIC; + } + + /** {@inheritDoc} */ + @Override protected NearCacheConfiguration nearConfiguration() { + return null; + } + + /** {@inheritDoc} */ + @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { + return PRIMARY; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2335ef99/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/IgniteCacheHibernateBlobStoreNodeRestartAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/IgniteCacheHibernateBlobStoreNodeRestartAbstractTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/IgniteCacheHibernateBlobStoreNodeRestartAbstractTest.java deleted file mode 100644 index 79009d0..0000000 --- a/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/IgniteCacheHibernateBlobStoreNodeRestartAbstractTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.cache.store.hibernate; - -import org.apache.ignite.cache.*; -import org.apache.ignite.cache.store.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.processors.cache.integration.*; - -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; - -public class IgniteCacheHibernateBlobStoreNodeRestartAbstractTest extends IgniteCacheStoreNodeRestartAbstractTest { - - /** {@inheritDoc} */ - @Override protected CacheStore getStore() { - return new CacheHibernateBlobStore(); - } - - /** {@inheritDoc} */ - @Override protected CacheMode cacheMode() { - return CacheMode.PARTITIONED; - } - - /** {@inheritDoc} */ - @Override protected CacheAtomicityMode atomicityMode() { - return CacheAtomicityMode.ATOMIC; - } - - /** {@inheritDoc} */ - @Override protected NearCacheConfiguration nearConfiguration() { - return null; - } - - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2335ef99/modules/hibernate/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java b/modules/hibernate/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java index f9f65bd..da741f8 100644 --- a/modules/hibernate/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java +++ b/modules/hibernate/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java @@ -39,6 +39,8 @@ public class IgniteHibernateTestSuite extends TestSuite { suite.addTestSuite(CacheHibernateBlobStoreSelfTest.class); + suite.addTestSuite(CacheHibernateBlobStoreNodeRestartTest.class); + return suite; } }
