IGNITE-2450 - Fixed tests
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a3c03119 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a3c03119 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a3c03119 Branch: refs/heads/ignite-2450 Commit: a3c03119c1a1ac518dd2d959dd60ace4406c89dd Parents: 7e93613 Author: Valentin Kulichenko <[email protected]> Authored: Wed Feb 3 16:47:41 2016 -0800 Committer: Valentin Kulichenko <[email protected]> Committed: Wed Feb 3 16:47:41 2016 -0800 ---------------------------------------------------------------------- ...ynamicProxySerializationMultiJvmSelfTest.java | 19 ++++++++++++++----- .../junits/multijvm/IgniteNodeRunner.java | 16 +++++++++------- .../junits/multijvm/IgniteProcessProxy.java | 19 +++++++++++-------- .../ignite/testsuites/IgniteBasicTestSuite.java | 2 +- .../testsuites/IgniteBinaryBasicTestSuite.java | 2 ++ 5 files changed, 37 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a3c03119/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java index c5bd892..d22aeac 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java @@ -20,8 +20,10 @@ package org.apache.ignite.marshaller; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import java.util.concurrent.Callable; import org.apache.ignite.Ignite; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.lang.IgniteCallable; import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; @@ -31,7 +33,7 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; */ public class DynamicProxySerializationMultiJvmSelfTest extends GridCommonAbstractTest { /** */ - private static boolean optMarsh; + private static Callable<Marshaller> marshFactory; /** {@inheritDoc} */ @Override protected boolean isMultiJvm() { @@ -42,8 +44,7 @@ public class DynamicProxySerializationMultiJvmSelfTest extends GridCommonAbstrac @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - if (optMarsh) - cfg.setMarshaller(new OptimizedMarshaller(false)); + cfg.setMarshaller(marshFactory.call()); return cfg; } @@ -52,7 +53,11 @@ public class DynamicProxySerializationMultiJvmSelfTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testOptimized() throws Exception { - optMarsh = true; + marshFactory = new Callable<Marshaller>() { + @Override public Marshaller call() throws Exception { + return new OptimizedMarshaller(false); + } + }; doTest(); } @@ -61,7 +66,11 @@ public class DynamicProxySerializationMultiJvmSelfTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testBinary() throws Exception { - optMarsh = false; + marshFactory = new Callable<Marshaller>() { + @Override public Marshaller call() throws Exception { + return new BinaryMarshaller(); + } + }; doTest(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/a3c03119/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java index 0597eda..7d1a37d 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java @@ -17,7 +17,6 @@ package org.apache.ignite.testframework.junits.multijvm; -import com.thoughtworks.xstream.XStream; import java.io.BufferedOutputStream; import java.io.BufferedReader; import java.io.File; @@ -29,6 +28,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Set; +import com.thoughtworks.xstream.XStream; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.Ignition; @@ -100,12 +100,14 @@ public class IgniteNodeRunner { String fileName = IGNITE_CONFIGURATION_FILE + cfg.getNodeId(); try(OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName))) { - cfg.setMBeanServer(null); - cfg.setMarshaller(null); - cfg.setDiscoverySpi(null); - cfg.setGridLogger(null); + IgniteConfiguration cfg0 = new IgniteConfiguration(cfg); + + cfg0.setMBeanServer(null); + cfg0.setMarshaller(null); + cfg0.setDiscoverySpi(null); + cfg0.setGridLogger(null); - new XStream().toXML(cfg, out); + new XStream().toXML(cfg0, out); } return fileName; @@ -176,4 +178,4 @@ public class IgniteNodeRunner { return res; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/a3c03119/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java index fed42e1..a2e0d5a 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java @@ -19,7 +19,6 @@ package org.apache.ignite.testframework.junits.multijvm; import java.util.ArrayList; import java.util.Collection; -import java.util.List; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -31,10 +30,10 @@ import org.apache.ignite.IgniteAtomicLong; import org.apache.ignite.IgniteAtomicReference; import org.apache.ignite.IgniteAtomicSequence; import org.apache.ignite.IgniteAtomicStamped; +import org.apache.ignite.IgniteBinary; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteCompute; import org.apache.ignite.IgniteCountDownLatch; -import org.apache.ignite.IgniteSemaphore; import org.apache.ignite.IgniteDataStreamer; import org.apache.ignite.IgniteEvents; import org.apache.ignite.IgniteException; @@ -42,9 +41,9 @@ import org.apache.ignite.IgniteFileSystem; import org.apache.ignite.IgniteIllegalStateException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.IgniteMessaging; -import org.apache.ignite.IgniteBinary; import org.apache.ignite.IgniteQueue; import org.apache.ignite.IgniteScheduler; +import org.apache.ignite.IgniteSemaphore; import org.apache.ignite.IgniteServices; import org.apache.ignite.IgniteSet; import org.apache.ignite.IgniteTransactions; @@ -76,6 +75,7 @@ import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.lang.IgniteProductVersion; import org.apache.ignite.lang.IgniteRunnable; +import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.plugin.IgnitePlugin; import org.apache.ignite.plugin.PluginNotFoundException; import org.apache.ignite.resources.IgniteInstanceResource; @@ -121,14 +121,17 @@ public class IgniteProcessProxy implements IgniteEx { String cfgFileName = IgniteNodeRunner.storeToFile(cfg.setNodeId(id)); - List<String> jvmArgs = U.jvmArgs(); - Collection<String> filteredJvmArgs = new ArrayList<>(); - for (String arg : jvmArgs) { - if(arg.startsWith("-Xmx") || arg.startsWith("-Xms") || + Marshaller marsh = cfg.getMarshaller(); + + if (marsh != null) + filteredJvmArgs.add("-D" + IgniteTestResources.MARSH_CLASS_NAME + "=" + marsh.getClass().getName()); + + for (String arg : U.jvmArgs()) { + if (arg.startsWith("-Xmx") || arg.startsWith("-Xms") || arg.startsWith("-cp") || arg.startsWith("-classpath") || - arg.startsWith("-D" + IgniteTestResources.MARSH_CLASS_NAME)) + (marsh != null && arg.startsWith("-D" + IgniteTestResources.MARSH_CLASS_NAME))) filteredJvmArgs.add(arg); } http://git-wip-us.apache.org/repos/asf/ignite/blob/a3c03119/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 e26c5dd..c904ef4 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 @@ -117,7 +117,7 @@ public class IgniteBasicTestSuite extends TestSuite { suite.addTestSuite(IgniteExceptionInNioWorkerSelfTest.class); - suite.addTestSuite(DynamicProxySerializationMultiJvmSelfTest.class); + GridTestUtils.addTestIfNeeded(suite, DynamicProxySerializationMultiJvmSelfTest.class, ignoredTests); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/a3c03119/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryBasicTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryBasicTestSuite.java index cbb87fa..e0c06dc 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryBasicTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryBasicTestSuite.java @@ -35,6 +35,7 @@ import org.apache.ignite.internal.util.IgniteUtilsSelfTest; import org.apache.ignite.internal.util.io.GridUnsafeDataOutputArraySizingSelfTest; import org.apache.ignite.internal.util.nio.GridNioSelfTest; import org.apache.ignite.internal.util.nio.GridNioSslSelfTest; +import org.apache.ignite.marshaller.DynamicProxySerializationMultiJvmSelfTest; import org.apache.ignite.marshaller.jdk.GridJdkMarshallerSelfTest; import org.apache.ignite.marshaller.optimized.OptimizedMarshallerEnumSelfTest; import org.apache.ignite.marshaller.optimized.OptimizedMarshallerNodeFailoverTest; @@ -84,6 +85,7 @@ public class IgniteBinaryBasicTestSuite extends TestSuite { ignoredTests.add(GridMessagingSelfTest.class); ignoredTests.add(GridVersionSelfTest.class); ignoredTests.add(GridDeploymentMessageCountSelfTest.class); + ignoredTests.add(DynamicProxySerializationMultiJvmSelfTest.class); // TODO: check and delete if pass. ignoredTests.add(IgniteDaemonNodeMarshallerCacheTest.class);
