This is an automated email from the ASF dual-hosted git repository. dgovorukhin pushed a commit to branch ignite-10809-dg in repository https://gitbox.apache.org/repos/asf/ignite.git
commit b8ee25cf53c0ac06dc5b0eb34f8d43569405be33 Author: Dmitriy Govorukhin <[email protected]> AuthorDate: Tue Dec 25 14:01:50 2018 +0300 IGNITE-10809 test refactoring --- .../cache/IgniteClusterActivateDeactivateTest.java | 7 +++++++ ...teClusterActivateDeactivateTestWithPersistence.java | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java index 21290b9..df0ac1a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java @@ -1266,6 +1266,13 @@ public class IgniteClusterActivateDeactivateTest extends GridCommonAbstractTest ignite(4).cluster().active(true); + doFinalChecks(); + } + + /** + * Verifies correctness of cache operations when working in in-memory mode. + */ + protected void doFinalChecks() throws Exception { for (int i = 0; i < 4; i++) startGrid(i); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java index 70d0034..8aa5ade 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java @@ -40,6 +40,7 @@ import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.CU; +import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.MvccFeatureChecker; import org.junit.Assert; @@ -47,6 +48,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import static org.apache.ignite.testframework.GridTestUtils.assertThrowsAnyCause; + /** * */ @@ -248,6 +251,21 @@ public class IgniteClusterActivateDeactivateTestWithPersistence extends IgniteCl } /** + * Verifies correctness of BaselineTopology checks when working in persistent mode. + */ + @Override protected void doFinalChecks() { + for (int i = 0; i < 4; i++) { + int j = i; + + assertThrowsAnyCause(log, () -> { + startGrid(j); + + return null; + }, IgniteSpiException.class, "not compatible"); + } + } + + /** * @see <a href="https://issues.apache.org/jira/browse/IGNITE-7330">IGNITE-7330</a> for more information about context of the test */ @Test
