ignite-646
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/45c6e09b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/45c6e09b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/45c6e09b Branch: refs/heads/ignite-157 Commit: 45c6e09b8d4c79683336687724d441c1cfad659e Parents: 7814b53 Author: avinogradov <avinogra...@gridgain.com> Authored: Mon Apr 27 18:19:14 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Mon Apr 27 18:19:14 2015 +0300 ---------------------------------------------------------------------- .../IgniteCacheP2pUnmarshallingErrorTest.java | 2 +- ...gniteCacheP2pUnmarshallingNearErrorTest.java | 2 +- ...CacheP2pUnmarshallingRebalanceErrorTest.java | 15 ++++++- .../IgniteCacheP2pUnmarshallingTxErrorTest.java | 2 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + ...gniteCacheP2pUnmarshallingErrorTestSuit.java | 41 ++++++++++++++++++++ ...niteCacheP2pUnmarshallingQueryErrorTest.java | 2 +- .../IgniteCacheQuerySelfTestSuite.java | 3 ++ 8 files changed, 62 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45c6e09b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java index 2a3f08a..5aa0ac8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java @@ -27,7 +27,7 @@ import java.io.*; import java.util.concurrent.atomic.*; /** - * Check behavior on exception while unmarshalling key. + * Checks behavior on exception while unmarshalling key. */ public class IgniteCacheP2pUnmarshallingErrorTest extends IgniteCacheAbstractTest { /** Allows to change behavior of readExternal method. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45c6e09b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java index 0b9226f..453812b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.eviction.fifo.*; import org.apache.ignite.configuration.*; /** - * Check behavior on exception while unmarshalling key. + * Checks behavior on exception while unmarshalling key. */ public class IgniteCacheP2pUnmarshallingNearErrorTest extends IgniteCacheP2pUnmarshallingErrorTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45c6e09b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java index 95d38e1..49f58f9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java @@ -18,9 +18,13 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.internal.util.typedef.*; + +import javax.cache.*; +import java.io.*; /** - * Check behavior on exception while unmarshalling key. + * Checks behavior on exception while unmarshalling key. */ public class IgniteCacheP2pUnmarshallingRebalanceErrorTest extends IgniteCacheP2pUnmarshallingErrorTest { /** {@inheritDoc} */ @@ -64,6 +68,13 @@ public class IgniteCacheP2pUnmarshallingRebalanceErrorTest extends IgniteCacheP2 readCnt.set(1); - jcache(3).get(new TestKey(String.valueOf(key))); + try { + jcache(3).get(new TestKey(String.valueOf(key))); + assert false : "p2p marshalling failed, but error response was not sent"; + } + catch (CacheException e) { + assert X.hasCause(e, IOException.class); + } + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45c6e09b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingTxErrorTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingTxErrorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingTxErrorTest.java index ca48507..a4e2753 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingTxErrorTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingTxErrorTest.java @@ -27,7 +27,7 @@ import javax.cache.*; import java.io.*; /** - * Check behavior on exception while unmarshalling key. + * Checks behavior on exception while unmarshalling key. */ public class IgniteCacheP2pUnmarshallingTxErrorTest extends IgniteCacheP2pUnmarshallingErrorTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45c6e09b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java index 5d53129..c4a5fd5 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java @@ -46,6 +46,7 @@ public class IgniteBasicTestSuite extends TestSuite { suite.addTest(IgniteStartUpTestSuite.suite()); suite.addTest(IgniteExternalizableSelfTestSuite.suite()); suite.addTest(IgniteP2PSelfTestSuite.suite()); + suite.addTest(IgniteCacheP2pUnmarshallingErrorTestSuit.suite()); suite.addTest(new TestSuite(GridSelfTest.class)); suite.addTest(new TestSuite(GridProjectionSelfTest.class)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45c6e09b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheP2pUnmarshallingErrorTestSuit.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheP2pUnmarshallingErrorTestSuit.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheP2pUnmarshallingErrorTestSuit.java new file mode 100644 index 0000000..9b40280 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheP2pUnmarshallingErrorTestSuit.java @@ -0,0 +1,41 @@ +/* + * 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.testsuites; + +import junit.framework.*; +import org.apache.ignite.internal.processors.cache.*; + +/** + * Checks behavior on exception while unmarshalling key. + */ +public class IgniteCacheP2pUnmarshallingErrorTestSuit extends TestSuite { + /** + * @return Suite. + * @throws Exception If failed. + */ + public static TestSuite suite() throws Exception { + TestSuite suite = new TestSuite("P2p Unmarshalling Test Suite"); + + suite.addTestSuite(IgniteCacheP2pUnmarshallingErrorTest.class); + suite.addTestSuite(IgniteCacheP2pUnmarshallingNearErrorTest.class); + suite.addTestSuite(IgniteCacheP2pUnmarshallingRebalanceErrorTest.class); + suite.addTestSuite(IgniteCacheP2pUnmarshallingTxErrorTest.class); + + return suite; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45c6e09b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java index afb96be..c5f9632 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.configuration.*; import javax.cache.*; /** - * Check behavior on exception while unmarshalling key. + * Checks behavior on exception while unmarshalling key. */ public class IgniteCacheP2pUnmarshallingQueryErrorTest extends IgniteCacheP2pUnmarshallingErrorTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45c6e09b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java index ce05980..69d7548 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java @@ -111,6 +111,9 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite { suite.addTestSuite(GridCacheQueryMetricsSelfTest.class); + //Unmarshallig query test. + suite.addTestSuite(IgniteCacheP2pUnmarshallingQueryErrorTest.class); + return suite; } }
