Repository: ignite Updated Branches: refs/heads/ignite-1.5 717dab259 -> ed27fbdab
Fix to GridBinaryWildcardsSelfTest. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6d96bb6a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6d96bb6a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6d96bb6a Branch: refs/heads/ignite-1.5 Commit: 6d96bb6a3219255b62af826e6806b1aa564bb005 Parents: 6c61598 Author: vozerov-gridgain <[email protected]> Authored: Mon Dec 14 10:08:00 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Mon Dec 14 10:08:00 2015 +0300 ---------------------------------------------------------------------- .../binary/GridBinaryWildcardsSelfTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6d96bb6a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java index dc70f4d..2887afa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java @@ -213,7 +213,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode())); assertTrue(typeIds.containsKey("innerclass".hashCode())); - assertFalse(typeIds.containsKey("gridbinarytestclass2".hashCode())); + assertFalse(typeIds.containsKey(100)); Map<String, BinaryIdMapper> typeMappers = U.field(ctx, "typeMappers"); @@ -225,7 +225,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { */ public void testClassNamesJar() throws Exception { BinaryMarshaller marsh = binaryMarshaller(Arrays.asList( - new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"), + new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"), new BinaryTypeConfiguration("unknown.*") )); @@ -258,7 +258,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { return 0; } }, Arrays.asList( - new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"), + new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"), new BinaryTypeConfiguration("unknown.*") )); @@ -277,7 +277,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { */ public void testTypeConfigurationsJar() throws Exception { BinaryMarshaller marsh = binaryMarshaller(Arrays.asList( - new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"), + new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"), new BinaryTypeConfiguration("unknown.*") )); @@ -310,7 +310,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { return 0; } }, Arrays.asList( - new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"), + new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"), new BinaryTypeConfiguration("unknown.*") )); @@ -343,7 +343,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { return 0; } }, Arrays.asList( - new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"), + new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"), new BinaryTypeConfiguration("unknown.*") )); @@ -362,7 +362,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { */ public void testOverrideJar() throws Exception { BinaryTypeConfiguration typeCfg = new BinaryTypeConfiguration( - "org.apache.ignite.binary.testjar.GridBinaryTestClass2"); + "org.apache.ignite.internal.binary.test.GridBinaryTestClass2"); typeCfg.setIdMapper(new BinaryIdMapper() { @Override public int typeId(String clsName) { @@ -375,7 +375,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { }); BinaryMarshaller marsh = binaryMarshaller(Arrays.asList( - new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"), + new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"), typeCfg)); BinaryContext ctx = binaryContext(marsh);
