Repository: incubator-ignite Updated Branches: refs/heads/ignite-1108 64e111777 -> 03dd16bc9
IGNITE-1108 Fixed 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/03dd16bc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/03dd16bc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/03dd16bc Branch: refs/heads/ignite-1108 Commit: 03dd16bc940d9907fdc460f55cdd99d5237baa75 Parents: 64e1117 Author: nikolay_tikhonov <[email protected]> Authored: Tue Jul 14 15:20:55 2015 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Tue Jul 14 15:20:55 2015 +0300 ---------------------------------------------------------------------- .../internal/IgnitePluginLifecycleSelfTest.java | 4 +- .../internal/util/TestPluginProvider.java | 39 +++++++++++++------- 2 files changed, 29 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03dd16bc/modules/core/src/test/java/org/apache/ignite/internal/IgnitePluginLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgnitePluginLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgnitePluginLifecycleSelfTest.java index 610ffd1..de9b377 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgnitePluginLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgnitePluginLifecycleSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.internal.util.*; import org.apache.ignite.testframework.junits.common.*; /** - * + * Testing with {@link TestPluginProvider}. */ @GridCommonTest(group = "Kernal Self") public class IgnitePluginLifecycleSelfTest extends GridCommonAbstractTest { @@ -40,6 +40,8 @@ public class IgnitePluginLifecycleSelfTest extends GridCommonAbstractTest { */ public void testStopGrid() throws Exception { try { + TestPluginProvider.resetState(); + TestPluginProvider.enableAssert = true; startGrid("testGrid"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03dd16bc/modules/core/src/test/java/org/apache/ignite/internal/util/TestPluginProvider.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/TestPluginProvider.java b/modules/core/src/test/java/org/apache/ignite/internal/util/TestPluginProvider.java index 3d72198..3e15a88 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/TestPluginProvider.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/TestPluginProvider.java @@ -51,56 +51,62 @@ public class TestPluginProvider extends PluginProviderAdapter<TestPluginProvider /** {@inheritDoc} */ @Override public void onBeforeStart() throws IgniteCheckedException { - bfStart = true; + if (enableAssert) { + bfStart = true; - if (enableAssert) assertFalse(start || afStart || bfStop || stop || afStop); + } } /** {@inheritDoc} */ @Override public void start(PluginContext ctx) throws IgniteCheckedException { - ignite = (IgniteKernal)ctx.grid(); + if (enableAssert) { + ignite = (IgniteKernal)ctx.grid(); - start = true; + start = true; - if (enableAssert) assertFalse(afStart || bfStop || stop || afStop); + } } /** {@inheritDoc} */ @Override public void onAfterStart() throws IgniteCheckedException { - afStart = true; + if (enableAssert) { + afStart = true; - if (enableAssert) assertFalse(bfStop || stop || afStop); + } } /** {@inheritDoc} */ @Override public void onBeforeStop(boolean cancel) { - bfStop = true; + if (enableAssert) { + bfStop = true; - if (enableAssert) assertFalse(stop || afStop); + } } /** {@inheritDoc} */ @Override public void stop(boolean cancel) throws IgniteCheckedException { - stop = true; + if (enableAssert) { + stop = true; - if (enableAssert) assertFalse(afStop); + } } /** {@inheritDoc} */ @Override public void onAfterStop(boolean cancel) { - if (enableAssert) + if (enableAssert) { GridTestUtils.assertThrows(null, new Callable<Object>() { @Override public Object call() throws Exception { return ignite.cache(null); } }, IllegalStateException.class, null); - afStop = true; + afStop = true; + } } /** {@inheritDoc} */ @@ -108,6 +114,13 @@ public class TestPluginProvider extends PluginProviderAdapter<TestPluginProvider return "0.0.1"; } + /** + * Reset state. + */ + public static void resetState() { + bfStart = start = afStart = bfStop = stop = afStop = false; + } + /** */ public static class TestPluginCfg implements PluginConfiguration { // No-op.
