IGNITE-141 - Fixing tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/caebf623 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/caebf623 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/caebf623 Branch: refs/heads/ignite-329 Commit: caebf623e132b053be33b9657e7a6dd4d645a558 Parents: ebf8efc Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Thu Mar 5 21:19:02 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Thu Mar 5 21:19:02 2015 -0800 ---------------------------------------------------------------------- .../ignite/messaging/GridMessagingSelfTest.java | 3 + .../ignite/testsuites/IgniteBasicTestSuite.java | 72 +++++++++++--------- 2 files changed, 43 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/caebf623/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java index e1c7091..75bd864 100644 --- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java @@ -167,6 +167,9 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { stopAllGrids(); + + ignite1 = null; + ignite2 = null; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/caebf623/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 ece8098..6091338 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 @@ -18,7 +18,15 @@ package org.apache.ignite.testsuites; import junit.framework.*; +import org.apache.ignite.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.affinity.*; +import org.apache.ignite.internal.processors.closure.*; +import org.apache.ignite.internal.processors.continuous.*; +import org.apache.ignite.internal.product.*; +import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.messaging.*; +import org.apache.ignite.spi.*; /** * Basic test suite. @@ -31,39 +39,39 @@ public class IgniteBasicTestSuite extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("Ignite Basic Test Suite"); -// suite.addTest(IgniteLangSelfTestSuite.suite()); -// suite.addTest(IgniteUtilSelfTestSuite.suite()); -// suite.addTest(IgniteMarshallerSelfTestSuite.suite()); -// suite.addTest(IgniteKernalSelfTestSuite.suite()); -// suite.addTest(IgniteStartUpTestSuite.suite()); -// suite.addTest(IgniteExternalizableSelfTestSuite.suite()); -// suite.addTest(IgniteP2PSelfTestSuite.suite()); -// -// suite.addTest(new TestSuite(GridSelfTest.class)); -// suite.addTest(new TestSuite(GridProjectionSelfTest.class)); -// suite.addTest(new TestSuite(GridMessagingSelfTest.class)); -// suite.addTest(new TestSuite(GridMessagingNoPeerClassLoadingSelfTest.class)); -// -// if (U.isLinux() || U.isMacOs()) -// suite.addTest(IgniteIpcSharedMemorySelfTestSuite.suite()); -// -// suite.addTestSuite(GridReleaseTypeSelfTest.class); -// suite.addTestSuite(GridProductVersionSelfTest.class); + suite.addTest(IgniteLangSelfTestSuite.suite()); + suite.addTest(IgniteUtilSelfTestSuite.suite()); + suite.addTest(IgniteMarshallerSelfTestSuite.suite()); + suite.addTest(IgniteKernalSelfTestSuite.suite()); + suite.addTest(IgniteStartUpTestSuite.suite()); + suite.addTest(IgniteExternalizableSelfTestSuite.suite()); + suite.addTest(IgniteP2PSelfTestSuite.suite()); + + suite.addTest(new TestSuite(GridSelfTest.class)); + suite.addTest(new TestSuite(GridProjectionSelfTest.class)); + suite.addTest(new TestSuite(GridMessagingSelfTest.class)); + suite.addTest(new TestSuite(GridMessagingNoPeerClassLoadingSelfTest.class)); + + if (U.isLinux() || U.isMacOs()) + suite.addTest(IgniteIpcSharedMemorySelfTestSuite.suite()); + + suite.addTestSuite(GridReleaseTypeSelfTest.class); + suite.addTestSuite(GridProductVersionSelfTest.class); suite.addTestSuite(GridAffinityProcessorRendezvousSelfTest.class); -// suite.addTestSuite(GridClosureProcessorSelfTest.class); -// suite.addTestSuite(GridStartStopSelfTest.class); -// suite.addTestSuite(GridProjectionForCachesSelfTest.class); -// suite.addTestSuite(GridSpiLocalHostInjectionTest.class); -// suite.addTestSuite(GridLifecycleBeanSelfTest.class); -// suite.addTestSuite(GridStopWithCancelSelfTest.class); -// suite.addTestSuite(GridReduceSelfTest.class); -// suite.addTestSuite(GridEventConsumeSelfTest.class); -// suite.addTestSuite(GridSuppressedExceptionSelfTest.class); -// suite.addTestSuite(GridLifecycleAwareSelfTest.class); -// suite.addTestSuite(GridMessageListenSelfTest.class); -// -// // Streamer. -// suite.addTest(IgniteStreamerSelfTestSuite.suite()); + suite.addTestSuite(GridClosureProcessorSelfTest.class); + suite.addTestSuite(GridStartStopSelfTest.class); + suite.addTestSuite(GridProjectionForCachesSelfTest.class); + suite.addTestSuite(GridSpiLocalHostInjectionTest.class); + suite.addTestSuite(GridLifecycleBeanSelfTest.class); + suite.addTestSuite(GridStopWithCancelSelfTest.class); + suite.addTestSuite(GridReduceSelfTest.class); + suite.addTestSuite(GridEventConsumeSelfTest.class); + suite.addTestSuite(GridSuppressedExceptionSelfTest.class); + suite.addTestSuite(GridLifecycleAwareSelfTest.class); + suite.addTestSuite(GridMessageListenSelfTest.class); + + // Streamer. + suite.addTest(IgniteStreamerSelfTestSuite.suite()); return suite; }
