ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [18/18] ignite git commit: Minors.
Date Wed, 09 Mar 2016 06:48:51 GMT
Minors.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6d4dea76
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6d4dea76
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6d4dea76

Branch: refs/heads/ignite-2753
Commit: 6d4dea76c8ef09c84a1f9c7edbcefae30de57e9b
Parents: 1e40f44
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Wed Mar 9 09:48:16 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Wed Mar 9 09:48:16 2016 +0300

----------------------------------------------------------------------
 .../CacheStoreManagerSerializationTest.java     | 349 +++++++++++++++++++
 .../cache/GridCacheStreamLocalStoreTest.java    | 341 ------------------
 .../GridLocalCacheStreamLocalStoreTest.java     | 102 ------
 ...LocalCacheStoreManagerSerializationTest.java | 100 ++++++
 .../testsuites/IgniteCacheTestSuite4.java       |   4 +-
 5 files changed, 451 insertions(+), 445 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6d4dea76/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreManagerSerializationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreManagerSerializationTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreManagerSerializationTest.java
new file mode 100644
index 0000000..2cfd6e9
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreManagerSerializationTest.java
@@ -0,0 +1,349 @@
+/*
+ * 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;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.binary.BinaryObjectBuilder;
+import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.cache.store.CacheStoreAdapter;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
+import org.apache.ignite.internal.processors.cache.extras.GridCacheObsoleteEntryExtras;
+import org.apache.ignite.internal.processors.cache.store.CacheLocalStore;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+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.junits.common.GridCommonAbstractTest;
+import org.jsr166.ConcurrentHashMap8;
+
+import javax.cache.Cache;
+import javax.cache.integration.CacheLoaderException;
+import javax.cache.integration.CacheWriterException;
+import java.io.Serializable;
+import java.util.Map;
+
+import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
+
+/**
+ * Checks whether storing to local store doesn't cause binary objects unmarshalling,
+ * and as a consequence {@link ClassNotFoundException} to be thrown.
+ *
+ * @see <a href="https://issues.apache.org/jira/browse/IGNITE-2753">
+ *     https://issues.apache.org/jira/browse/IGNITE-2753
+ *     </a>
+ */
+public class CacheStoreManagerSerializationTest extends GridCommonAbstractTest {
+    /** IP finder. */
+    protected static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+    /** Cache store. */
+    protected static final GridCacheLocalTestStore store = new GridCacheLocalTestStore();
+
+    /** Test cache name. */
+    protected static final String CACHE_NAME = "cache_name";
+
+    /** Cache mode. */
+    protected CacheMode cacheMode() {
+        return CacheMode.PARTITIONED;
+    }
+
+    /** Cache write order mode. */
+    protected CacheAtomicWriteOrderMode cacheAtomicWriteOrderMode() {
+        return CacheAtomicWriteOrderMode.PRIMARY;
+    }
+
+    /** Cache synchronization mode. */
+    private CacheWriteSynchronizationMode cacheWriteSynchronizationMode() {
+        return CacheWriteSynchronizationMode.PRIMARY_SYNC;
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("unchecked")
+    @Override protected IgniteConfiguration getConfiguration(final String gridName) throws
Exception {
+        IgniteConfiguration c = super.getConfiguration(gridName);
+
+        if (gridName != null && gridName.toLowerCase().startsWith("binary"))
+            c.setMarshaller(new BinaryMarshaller());
+        else
+            c.setMarshaller(new OptimizedMarshaller());
+
+        TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+        disco.setIpFinder(IP_FINDER);
+
+        c.setDiscoverySpi(disco);
+
+        c.setCacheConfiguration(cacheConfiguration());
+
+        return c;
+    }
+
+    /** Cache configuration */
+    protected CacheConfiguration cacheConfiguration() {
+        CacheConfiguration cc = defaultCacheConfiguration();
+
+        cc.setSwapEnabled(false);
+        cc.setRebalanceMode(SYNC);
+
+        cc.setCacheStoreFactory(singletonFactory(store));
+        cc.setReadThrough(true);
+        cc.setWriteThrough(true);
+        cc.setLoadPreviousValue(true);
+        cc.setStoreKeepBinary(true);
+
+        cc.setCacheMode(cacheMode());
+        cc.setAtomicWriteOrderMode(cacheAtomicWriteOrderMode());
+        cc.setWriteSynchronizationMode(cacheWriteSynchronizationMode());
+
+        cc.setBackups(0);
+
+        cc.setAtomicityMode(CacheAtomicityMode.ATOMIC);
+
+        return cc;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void beforeTest() throws Exception {
+        store.map.clear();
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void afterTest() throws Exception {
+        stopAllGrids();
+    }
+
+    /**
+     * Check whether test objects are stored correctly via stream API.
+     *
+     * @throws Exception
+     */
+    public void testStream() throws Exception {
+        final Ignite grid = startGrid();
+
+        final IgniteCache<TestObj, TestObj> cache = grid.createCache(CACHE_NAME);
+
+        final TestObj testObj = streamData(grid);
+
+        cache.destroy();
+        cache.close();
+
+        assert store.map.containsKey(testObj);
+
+        final IgniteCache<TestObj, TestObj> cache2 = grid.createCache(CACHE_NAME);
+
+        assert testObj.equals(cache2.get(testObj));
+        assert store.map.containsKey(testObj);
+    }
+
+    /**
+     * Simulate case where is called
+     * {@link org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry#clearInternal(
+     * GridCacheVersion, boolean, GridCacheObsoleteEntryExtras)}
+     *
+     * @throws Exception
+     */
+    public void testPartitionMove() throws Exception {
+        final Ignite grid = startGrid("binaryGrid1");
+
+        grid.createCache(CACHE_NAME);
+
+        final BinaryObjectBuilder builder = grid.binary().builder("custom_type");
+
+        final IgniteDataStreamer<BinaryObject, BinaryObject> streamer = grid.dataStreamer(CACHE_NAME);
+
+        streamer.keepBinary(true);
+
+        final int itemsNum = 10_000;
+
+        for (int i = 0; i < itemsNum; i++) {
+            final BinaryObject key = builder.setField("id", i).build();
+
+            streamer.addData(key, key);
+        }
+
+        streamer.close();
+
+        streamer.future().get();
+
+        assert store.map.size() == itemsNum;
+
+        startGrid("binaryGrid2");
+        startGrid("binaryGrid3");
+        startGrid("binaryGrid4");
+
+        Thread.sleep(10_000);
+
+        assert store.map.size() == 0; // tested method removes items from store
+    }
+
+    /**
+     * Check whether binary objects are stored without unmarshalling via stream API.
+     *
+     * @throws Exception
+     */
+    public void testBinaryStream() throws Exception {
+        final Ignite grid = startGrid("binaryGrid");
+
+        final IgniteCache<BinaryObject, BinaryObject> cache = grid.createCache(CACHE_NAME).withKeepBinary();
+
+        final BinaryObject key = streamBinaryData(grid);
+
+        cache.destroy();
+        cache.close();
+
+        assert store.map.containsKey(key);
+
+        final IgniteCache<BinaryObject, BinaryObject> cache2 = grid.createCache(CACHE_NAME).withKeepBinary();
+
+        final BinaryObject loaded = cache2.get(key);
+
+        assert loaded == key;
+        assert store.map.containsKey(key);
+    }
+
+    /**
+     * Create and add test data via Streamer API.
+     *
+     * @param grid to get streamer.
+     * @return test object (it is key and val).
+     */
+    private TestObj streamData(final Ignite grid) {
+        final IgniteDataStreamer<TestObj, TestObj> streamer = grid.dataStreamer(CACHE_NAME);
+
+        TestObj entity = null;
+
+        for (int i = 0; i < 1; i++) {
+            entity = new TestObj(i);
+
+            streamer.addData(entity, entity);
+        }
+
+        streamer.close();
+        streamer.future().get();
+
+        return entity;
+    }
+
+    /**
+     * Create and add binary data via Streamer API.
+     *
+     * @param grid to get streamer.
+     * @return test object (it is key and val).
+     */
+    private BinaryObject streamBinaryData(final Ignite grid) {
+        final IgniteDataStreamer<BinaryObject, BinaryObject> streamer = grid.dataStreamer(CACHE_NAME);
+
+        streamer.keepBinary(true);
+
+        final BinaryObjectBuilder builder = grid.binary().builder("custom_type");
+
+        BinaryObject entity = null;
+
+        for (int i = 0; i < 1; i++) {
+            builder.setField("id", i);
+
+            entity = builder.build();
+
+            streamer.addData(entity, entity);
+        }
+
+        streamer.close();
+        streamer.future().get();
+
+        return entity;
+    }
+
+    /**
+     * Local store mock.
+     *
+     * @param <K>
+     * @param <V>
+     */
+    @CacheLocalStore
+    protected static class GridCacheLocalTestStore<K, V> extends CacheStoreAdapter<K,
V> {
+        /** */
+        public final Map<K, V> map = new ConcurrentHashMap8<>();
+
+        /** {@inheritDoc} */
+        @Override public V load(final K key) throws CacheLoaderException {
+            return map.get(key);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void write(final Cache.Entry<? extends K, ? extends V> entry)
throws CacheWriterException {
+            map.put(entry.getKey(), entry.getValue());
+        }
+
+        /** {@inheritDoc} */
+        @Override public void delete(final Object key) throws CacheWriterException {
+            map.remove(key);
+        }
+    }
+
+    /**
+     * Test object.
+     */
+    static class TestObj implements Serializable {
+        /** */
+        Integer val;
+
+        /**
+         * Ctor.
+         */
+        public TestObj() {
+            // No-op.
+        }
+
+        /**
+         * Ctor.
+         *
+         * @param val Value.
+         */
+        public TestObj(final Integer val) {
+            this.val = val;
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(final Object o) {
+            if (this == o)
+                return true;
+
+            if (o == null || getClass() != o.getClass())
+                return false;
+
+            final TestObj testObj = (TestObj) o;
+
+            return val != null ? val.equals(testObj.val) : testObj.val == null;
+
+        }
+
+        /** {@inheritDoc} */
+        @Override public int hashCode() {
+            return val != null ? val.hashCode() : 0;
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/6d4dea76/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStreamLocalStoreTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStreamLocalStoreTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStreamLocalStoreTest.java
deleted file mode 100644
index 48c103b..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStreamLocalStoreTest.java
+++ /dev/null
@@ -1,341 +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.internal.processors.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.binary.BinaryObject;
-import org.apache.ignite.binary.BinaryObjectBuilder;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
-import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.cache.CacheWriteSynchronizationMode;
-import org.apache.ignite.cache.store.CacheStoreAdapter;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
-import org.apache.ignite.internal.processors.cache.extras.GridCacheObsoleteEntryExtras;
-import org.apache.ignite.internal.processors.cache.store.CacheLocalStore;
-import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
-import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
-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.junits.common.GridCommonAbstractTest;
-import org.jsr166.ConcurrentHashMap8;
-
-import javax.cache.Cache;
-import javax.cache.integration.CacheLoaderException;
-import javax.cache.integration.CacheWriterException;
-import java.io.Serializable;
-import java.util.Map;
-import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
-
-/**
- * Checks whether storing to local store doesn't cause binary objects unmarshalling,
- * and as a consequence {@link ClassNotFoundException} to be thrown.
- *
- * @see <a href="https://issues.apache.org/jira/browse/IGNITE-2753">
- *     https://issues.apache.org/jira/browse/IGNITE-2753
- *     </a>
- */
-public class GridCacheStreamLocalStoreTest extends GridCommonAbstractTest {
-    /** IP finder. */
-    protected static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
-
-    /** Cache store. */
-    protected static final GridCacheLocalTestStore store = new GridCacheLocalTestStore();
-
-    /** Test cache name. */
-    protected static final String CACHE_NAME = "cache_name";
-
-    /** Cache mode. */
-    protected CacheMode cacheMode() {
-        return CacheMode.PARTITIONED;
-    }
-
-    /** Cache write order mode. */
-    protected CacheAtomicWriteOrderMode cacheAtomicWriteOrderMode() {
-        return CacheAtomicWriteOrderMode.PRIMARY;
-    }
-
-    /** Cache synchronization mode. */
-    private CacheWriteSynchronizationMode cacheWriteSynchronizationMode() {
-        return CacheWriteSynchronizationMode.PRIMARY_SYNC;
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("unchecked")
-    @Override protected IgniteConfiguration getConfiguration(final String gridName) throws
Exception {
-        IgniteConfiguration c = super.getConfiguration(gridName);
-
-        if (gridName != null && gridName.toLowerCase().startsWith("binary"))
-            c.setMarshaller(new BinaryMarshaller());
-        else
-            c.setMarshaller(new OptimizedMarshaller());
-
-        TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
-        disco.setIpFinder(IP_FINDER);
-
-        c.setDiscoverySpi(disco);
-
-        c.setCacheConfiguration(cacheConfiguration());
-
-        return c;
-    }
-
-    /** Cache configuration */
-    protected CacheConfiguration cacheConfiguration() {
-        CacheConfiguration cc = defaultCacheConfiguration();
-
-        cc.setSwapEnabled(false);
-        cc.setRebalanceMode(SYNC);
-
-        cc.setCacheStoreFactory(singletonFactory(store));
-        cc.setReadThrough(true);
-        cc.setWriteThrough(true);
-        cc.setLoadPreviousValue(true);
-        cc.setStoreKeepBinary(true);
-
-        cc.setCacheMode(cacheMode());
-        cc.setAtomicWriteOrderMode(cacheAtomicWriteOrderMode());
-        cc.setWriteSynchronizationMode(cacheWriteSynchronizationMode());
-
-        cc.setBackups(0);
-
-        cc.setAtomicityMode(CacheAtomicityMode.ATOMIC);
-
-        return cc;
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        store.map.clear();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void afterTest() throws Exception {
-        stopAllGrids();
-    }
-
-    /**
-     * Check whether test objects are stored correctly via stream API.
-     *
-     * @throws Exception
-     */
-    public void testStream() throws Exception {
-        final Ignite grid = startGrid();
-
-        final IgniteCache<TestObj, TestObj> cache = grid.createCache(CACHE_NAME);
-
-        final TestObj testObj = streamData(grid);
-
-        cache.destroy();
-        cache.close();
-
-        assert store.map.containsKey(testObj);
-
-        final IgniteCache<TestObj, TestObj> cache2 = grid.createCache(CACHE_NAME);
-
-        assert testObj.equals(cache2.get(testObj));
-        assert store.map.containsKey(testObj);
-    }
-
-    /**
-     * Simulate case where is called
-     * {@link org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry#clearInternal(
-     * GridCacheVersion, boolean, GridCacheObsoleteEntryExtras)}
-     *
-     * @throws Exception
-     */
-    public void testPartitionMove() throws Exception {
-        final Ignite grid = startGrid("binaryGrid1");
-
-        grid.createCache(CACHE_NAME);
-
-        final BinaryObjectBuilder builder = grid.binary().builder("custom_type");
-
-        final IgniteDataStreamer<BinaryObject, BinaryObject> streamer = grid.dataStreamer(CACHE_NAME);
-
-        streamer.keepBinary(true);
-
-        final int itemsNum = 10_000;
-
-        for (int i = 0; i < itemsNum; i++) {
-            final BinaryObject key = builder.setField("id", i).build();
-
-            streamer.addData(key, key);
-        }
-
-        streamer.close();
-
-        streamer.future().get();
-
-        assert store.map.size() == itemsNum;
-
-        startGrid("binaryGrid2");
-        startGrid("binaryGrid3");
-        startGrid("binaryGrid4");
-
-        Thread.sleep(10_000);
-
-        assert store.map.size() == 0; // tested method removes items from store
-    }
-
-    /**
-     * Check whether binary objects are stored without unmarshalling via stream API.
-     *
-     * @throws Exception
-     */
-    public void testBinaryStream() throws Exception {
-        final Ignite grid = startGrid("binaryGrid");
-
-        final IgniteCache<BinaryObject, BinaryObject> cache = grid.createCache(CACHE_NAME).withKeepBinary();
-
-        final BinaryObject key = streamBinaryData(grid);
-
-        cache.destroy();
-        cache.close();
-
-        assert store.map.containsKey(key);
-
-        final IgniteCache<BinaryObject, BinaryObject> cache2 = grid.createCache(CACHE_NAME).withKeepBinary();
-
-        final BinaryObject loaded = cache2.get(key);
-
-        assert loaded == key;
-        assert store.map.containsKey(key);
-    }
-
-    /**
-     * Create and add test data via Streamer API.
-     *
-     * @param grid to get streamer.
-     * @return test object (it is key and val).
-     */
-    private TestObj streamData(final Ignite grid) {
-        final IgniteDataStreamer<TestObj, TestObj> streamer = grid.dataStreamer(CACHE_NAME);
-
-        TestObj entity = null;
-
-        for (int i = 0; i < 1; i++) {
-            entity = new TestObj(i);
-
-            streamer.addData(entity, entity);
-        }
-
-        streamer.close();
-        streamer.future().get();
-
-        return entity;
-    }
-
-    /**
-     * Create and add binary data via Streamer API.
-     *
-     * @param grid to get streamer.
-     * @return test object (it is key and val).
-     */
-    private BinaryObject streamBinaryData(final Ignite grid) {
-        final IgniteDataStreamer<BinaryObject, BinaryObject> streamer = grid.dataStreamer(CACHE_NAME);
-
-        streamer.keepBinary(true);
-
-        final BinaryObjectBuilder builder = grid.binary().builder("custom_type");
-
-        BinaryObject entity = null;
-
-        for (int i = 0; i < 1; i++) {
-            builder.setField("id", i);
-
-            entity = builder.build();
-
-            streamer.addData(entity, entity);
-        }
-
-        streamer.close();
-        streamer.future().get();
-
-        return entity;
-    }
-
-    /**
-     * Local store mock.
-     *
-     * @param <K>
-     * @param <V>
-     */
-    @CacheLocalStore
-    protected static class GridCacheLocalTestStore<K, V> extends CacheStoreAdapter<K,
V> {
-        /** */
-        public final Map<K, V> map = new ConcurrentHashMap8<>();
-
-        /** {@inheritDoc} */
-        @Override public V load(final K key) throws CacheLoaderException {
-            return map.get(key);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void write(final Cache.Entry<? extends K, ? extends V> entry)
throws CacheWriterException {
-            map.put(entry.getKey(), entry.getValue());
-        }
-
-        /** {@inheritDoc} */
-        @Override public void delete(final Object key) throws CacheWriterException {
-            map.remove(key);
-        }
-    }
-
-    /**
-     * Test object.
-     */
-    static class TestObj implements Serializable {
-        /** */
-        Integer val;
-
-        /** */
-        public TestObj() {
-        }
-
-        /** */
-        public TestObj(final Integer val) {
-            this.val = val;
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(final Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-
-            final TestObj testObj = (TestObj) o;
-
-            return val != null ? val.equals(testObj.val) : testObj.val == null;
-
-        }
-
-        /** {@inheritDoc} */
-        @Override public int hashCode() {
-            return val != null ? val.hashCode() : 0;
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/ignite/blob/6d4dea76/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridLocalCacheStreamLocalStoreTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridLocalCacheStreamLocalStoreTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridLocalCacheStreamLocalStoreTest.java
deleted file mode 100644
index 753b550..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridLocalCacheStreamLocalStoreTest.java
+++ /dev/null
@@ -1,102 +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.internal.processors.cache;
-
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.binary.BinaryObject;
-import org.apache.ignite.binary.BinaryObjectBuilder;
-import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
-
-import javax.cache.expiry.ExpiryPolicy;
-import java.util.UUID;
-
-/**
- * Checks whether storing to local store doesn't cause binary objects unmarshalling,
- * and as a consequence {@link ClassNotFoundException} to be thrown.
- *
- * @see <a href="https://issues.apache.org/jira/browse/IGNITE-2753">
- *     https://issues.apache.org/jira/browse/IGNITE-2753
- *     </a>
- */
-public class GridLocalCacheStreamLocalStoreTest extends GridCacheStreamLocalStoreTest {
-    /** {@inheritDoc} */
-    @Override protected CacheMode cacheMode() {
-        return CacheMode.LOCAL;
-    }
-
-    /**
-     * Checks no additional unmarshalling happens in calling
-     * {@link GridCacheMapEntry#innerUpdateLocal(GridCacheVersion, GridCacheOperation, Object,
Object[],
-     * boolean, boolean, boolean, boolean, ExpiryPolicy, boolean, boolean, CacheEntryPredicate[],
-     * boolean, UUID, String)}.
-     *
-     * @throws Exception
-     */
-    public void testUpdate() throws Exception {
-        // Goal is to check correct saving to store (no exception must be thrown)
-
-        final Ignite grid = startGrid();
-
-        final IgniteCache<TestObj, TestObj> cache = grid.createCache(CACHE_NAME);
-
-        final TestObj testObj = new TestObj(0);
-
-        cache.put(testObj, testObj);
-
-        assert testObj.equals(cache.get(testObj));
-        assert store.map.containsKey(testObj);
-
-        cache.remove(testObj);
-
-        assert cache.get(testObj) == null;
-        assert !store.map.containsKey(testObj);
-    }
-
-    /**
-     * Checks no additional unmarshalling happens in calling
-     * {@link GridCacheMapEntry#innerUpdateLocal(GridCacheVersion, GridCacheOperation, Object,
Object[],
-     * boolean, boolean, boolean, boolean, ExpiryPolicy, boolean, boolean, CacheEntryPredicate[],
-     * boolean, UUID, String)} for binary objects.
-     *
-     * @throws Exception
-     */
-    public void testBinaryUpdate() throws Exception {
-        // Goal is to check correct saving to store (no exception must be thrown)
-
-        final Ignite grid = startGrid("binaryGrid");
-
-        final IgniteCache<BinaryObject, BinaryObject> cache = grid.createCache(CACHE_NAME).withKeepBinary();
-
-        final BinaryObjectBuilder builder = grid.binary().builder("custom_type");
-
-        final BinaryObject entity = builder.setField("id", 0).build();
-
-        cache.put(entity, entity);
-
-        assert entity.equals(cache.get(entity));
-        assert store.map.containsKey(entity);
-
-        cache.remove(entity);
-
-        assert cache.get(entity) == null;
-        assert !store.map.containsKey(entity);
-    }
-}

http://git-wip-us.apache.org/repos/asf/ignite/blob/6d4dea76/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/LocalCacheStoreManagerSerializationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/LocalCacheStoreManagerSerializationTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/LocalCacheStoreManagerSerializationTest.java
new file mode 100644
index 0000000..209d76d
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/LocalCacheStoreManagerSerializationTest.java
@@ -0,0 +1,100 @@
+/*
+ * 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;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.binary.BinaryObjectBuilder;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+
+import javax.cache.expiry.ExpiryPolicy;
+import java.util.UUID;
+
+/**
+ * Checks whether storing to local store doesn't cause binary objects unmarshalling,
+ * and as a consequence {@link ClassNotFoundException} to be thrown.
+ *
+ * @see <a href="https://issues.apache.org/jira/browse/IGNITE-2753">
+ *     https://issues.apache.org/jira/browse/IGNITE-2753
+ *     </a>
+ */
+public class LocalCacheStoreManagerSerializationTest extends CacheStoreManagerSerializationTest
{
+    /** {@inheritDoc} */
+    @Override protected CacheMode cacheMode() {
+        return CacheMode.LOCAL;
+    }
+
+    /**
+     * Checks no additional unmarshalling happens in calling
+     * {@link GridCacheMapEntry#innerUpdateLocal(GridCacheVersion, GridCacheOperation, Object,
Object[],
+     * boolean, boolean, boolean, boolean, ExpiryPolicy, boolean, boolean, CacheEntryPredicate[],
+     * boolean, UUID, String)}.
+     *
+     * @throws Exception
+     */
+    public void testUpdate() throws Exception {
+        // Goal is to check correct saving to store (no exception must be thrown)
+        final Ignite grid = startGrid();
+
+        final IgniteCache<TestObj, TestObj> cache = grid.createCache(CACHE_NAME);
+
+        final TestObj testObj = new TestObj(0);
+
+        cache.put(testObj, testObj);
+
+        assert testObj.equals(cache.get(testObj));
+        assert store.map.containsKey(testObj);
+
+        cache.remove(testObj);
+
+        assert cache.get(testObj) == null;
+        assert !store.map.containsKey(testObj);
+    }
+
+    /**
+     * Checks no additional unmarshalling happens in calling
+     * {@link GridCacheMapEntry#innerUpdateLocal(GridCacheVersion, GridCacheOperation, Object,
Object[],
+     * boolean, boolean, boolean, boolean, ExpiryPolicy, boolean, boolean, CacheEntryPredicate[],
+     * boolean, UUID, String)} for binary objects.
+     *
+     * @throws Exception
+     */
+    public void testBinaryUpdate() throws Exception {
+        // Goal is to check correct saving to store (no exception must be thrown)
+        final Ignite grid = startGrid("binaryGrid");
+
+        final IgniteCache<BinaryObject, BinaryObject> cache = grid.createCache(CACHE_NAME).withKeepBinary();
+
+        final BinaryObjectBuilder builder = grid.binary().builder("custom_type");
+
+        final BinaryObject entity = builder.setField("id", 0).build();
+
+        cache.put(entity, entity);
+
+        assert entity.equals(cache.get(entity));
+        assert store.map.containsKey(entity);
+
+        cache.remove(entity);
+
+        assert cache.get(entity) == null;
+        assert !store.map.containsKey(entity);
+    }
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/6d4dea76/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
index cadeab9..608fef2 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
@@ -202,8 +202,8 @@ public class IgniteCacheTestSuite4 extends TestSuite {
         suite.addTestSuite(CacheStoreUsageMultinodeDynamicStartAtomicTest.class);
         suite.addTestSuite(CacheStoreUsageMultinodeDynamicStartTxTest.class);
 
-        suite.addTestSuite(GridCacheStreamLocalStoreTest.class);
-        suite.addTestSuite(GridLocalCacheStreamLocalStoreTest.class);
+        suite.addTestSuite(CacheStoreManagerSerializationTest.class);
+        suite.addTestSuite(LocalCacheStoreManagerSerializationTest.class);
 
         suite.addTestSuite(IgniteStartCacheInTransactionSelfTest.class);
         suite.addTestSuite(IgniteStartCacheInTransactionAtomicSelfTest.class);


Mime
View raw message