IgniteCacheP2pUnmarshallingQueryErrorTest fixed
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ab8c0dd1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ab8c0dd1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ab8c0dd1 Branch: refs/heads/ignite-2801 Commit: ab8c0dd1990a80f3120be4b6db3aeab3f8aee35b Parents: 9b096ac Author: agura <[email protected]> Authored: Mon Jan 18 17:23:47 2016 +0300 Committer: agura <[email protected]> Committed: Thu Mar 17 16:49:17 2016 +0300 ---------------------------------------------------------------------- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ab8c0dd1/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 cae7f0c..c9544b9 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. @@ -76,22 +74,16 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest extends IgniteCacheP2pUnm private void readObject(ObjectInputStream is) throws IOException { throw new IOException(); } + + private void writeObject(ObjectOutputStream os) throws 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()); - } }
