ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject [26/38] ignite git commit: ignite-1923 Test fixed
Date Tue, 19 Jan 2016 10:59:17 GMT
ignite-1923 Test fixed


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

Branch: refs/heads/ignite-gg-10837
Commit: 130164605b2cd6142c7e01feb6aef6f3f9fac343
Parents: c160ed4
Author: agura <agura@gridgain.com>
Authored: Mon Jan 18 17:23:47 2016 +0300
Committer: agura <agura@gridgain.com>
Committed: Mon Jan 18 17:46:10 2016 +0300

----------------------------------------------------------------------
 ...IgniteCacheP2pUnmarshallingQueryErrorTest.java | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/13016460/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 eafbb7a..cb7e3ad 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
@@ -24,9 +24,7 @@ import javax.cache.CacheException;
 import org.apache.ignite.cache.query.ScanQuery;
 import org.apache.ignite.cache.query.SqlQuery;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.lang.IgniteBiPredicate;
-import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
 
 /**
  * Checks behavior on exception while unmarshalling key.
@@ -80,24 +78,14 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest extends IgniteCacheP2pUnm
                 }
 
                 private void writeObject(ObjectOutputStream os) throws IOException {
-                    throw new IOException();
+                    // No-op.
                 }
             })).getAll();
 
-            assertTrue("Request unmarshalling failed, but error response was not sent.",
binaryMarshaller());
+            fail();
         }
         catch (Exception e) {
-            assertFalse("Unexpected exception: " + e, binaryMarshaller());
+            // No-op.
         }
     }
-
-    /**
-     * @return {@code True} if binary marshaller is configured.
-     */
-    private boolean binaryMarshaller() {
-        IgniteEx kernal = (IgniteEx)ignite(0);
-
-        return !OptimizedMarshaller.class.getSimpleName().equals(kernal.context().config().getMarshaller().getClass()
-            .getSimpleName());
-    }
 }


Mime
View raw message