Repository: ignite Updated Branches: refs/heads/ignite-1272 13fb3f2a6 -> 73e63b77d
ignite-1272: added additional deployment self tests for portable marshaller Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/73e63b77 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/73e63b77 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/73e63b77 Branch: refs/heads/ignite-1272 Commit: 73e63b77dc146e3b2871a9cff2ab1474fc73c71a Parents: 13fb3f2 Author: Denis Magda <[email protected]> Authored: Mon Oct 12 16:23:02 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Mon Oct 12 16:23:02 2015 +0300 ---------------------------------------------------------------------- .../GridCacheDeploymentOffHeapSelfTest.java | 2 +- .../cache/GridCacheDeploymentSelfTest.java | 26 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/73e63b77/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java index c51d72b..ea3c34d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java @@ -53,4 +53,4 @@ public class GridCacheDeploymentOffHeapSelfTest extends GridCacheDeploymentSelfT @Override public void testDeployment7() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-1618";); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/73e63b77/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java index 5965852..e18520d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java @@ -48,28 +48,28 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest { private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Name for grid without cache. */ - private static final String GRID_NAME = "grid-no-cache"; + protected static final String GRID_NAME = "grid-no-cache"; /** First test task name. */ - private static final String TEST_TASK_1 = "org.apache.ignite.tests.p2p.CacheDeploymentTestTask1"; + protected static final String TEST_TASK_1 = "org.apache.ignite.tests.p2p.CacheDeploymentTestTask1"; /** Second test task name. */ - private static final String TEST_TASK_2 = "org.apache.ignite.tests.p2p.CacheDeploymentTestTask2"; + protected static final String TEST_TASK_2 = "org.apache.ignite.tests.p2p.CacheDeploymentTestTask2"; /** Third test task name. */ - private static final String TEST_TASK_3 = "org.apache.ignite.tests.p2p.CacheDeploymentTestTask3"; + protected static final String TEST_TASK_3 = "org.apache.ignite.tests.p2p.CacheDeploymentTestTask3"; /** Test value 1. */ - private static final String TEST_KEY = "org.apache.ignite.tests.p2p.CacheDeploymentTestKey"; + protected static final String TEST_KEY = "org.apache.ignite.tests.p2p.CacheDeploymentTestKey"; /** Test value 1. */ - private static final String TEST_VALUE_1 = "org.apache.ignite.tests.p2p.CacheDeploymentTestValue"; + protected static final String TEST_VALUE_1 = "org.apache.ignite.tests.p2p.CacheDeploymentTestValue"; /** Test value 2. */ - private static final String TEST_VALUE_2 = "org.apache.ignite.tests.p2p.CacheDeploymentTestValue2"; + protected static final String TEST_VALUE_2 = "org.apache.ignite.tests.p2p.CacheDeploymentTestValue2"; /** */ - private DeploymentMode depMode; + protected DeploymentMode depMode; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -249,11 +249,11 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest { stopGrid(GRID_NAME); - assert g1.cache(null).localSize(CachePeekMode.ALL) == 1; - assert g1.cache(null).localSize(CachePeekMode.ALL) == 1; + assertEquals(1, g1.cache(null).localSize(CachePeekMode.ALL)); + assertEquals(1, g1.cache(null).localSize(CachePeekMode.ALL)); - assert g2.cache(null).localSize(CachePeekMode.ALL) == 1; - assert g2.cache(null).localSize(CachePeekMode.ALL) == 1; + assertEquals(1, g2.cache(null).localSize(CachePeekMode.ALL)); + assertEquals(1, g2.cache(null).localSize(CachePeekMode.ALL)); startGrid(3); } @@ -436,4 +436,4 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest { throw new IllegalStateException("Unable to find matching key [start=" + start + ", primary=" + primary.id() + ", backup=" + backup.id() + ']'); } -} \ No newline at end of file +}
