revert ignite-695
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cf553930 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cf553930 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cf553930 Branch: refs/heads/ignite-gg-9830 Commit: cf55393077fbadcc800d357675f929c142307755 Parents: a104771 Author: Artem Shutak <ashu...@gridgain.com> Authored: Mon Apr 27 13:59:14 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Mon Apr 27 13:59:14 2015 +0300 ---------------------------------------------------------------------- .../ignite/GridSuppressedExceptionSelfTest.java | 4 +-- .../processors/cache/GridCacheOffHeapTest.java | 28 +++++--------------- ...ePartitionedNearDisabledMetricsSelfTest.java | 4 +-- .../GridCacheEvictionFilterSelfTest.java | 4 +-- .../IgniteCacheExpiryPolicyAbstractTest.java | 10 +++---- ...eCacheExpiryPolicyWithStoreAbstractTest.java | 4 +-- .../processors/igfs/IgfsModesSelfTest.java | 4 +-- .../unsafe/GridUnsafeMemorySelfTest.java | 4 +-- .../apache/ignite/util/GridRandomSelfTest.java | 4 +-- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 4 +-- .../collections/HadoopHashMapSelfTest.java | 4 +-- .../cache/GridCacheCrossCacheQuerySelfTest.java | 8 ++---- .../h2/GridIndexingSpiAbstractSelfTest.java | 4 +-- .../query/h2/sql/BaseH2CompareQueryTest.java | 4 +-- 14 files changed, 24 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf553930/modules/core/src/test/java/org/apache/ignite/GridSuppressedExceptionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/GridSuppressedExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/GridSuppressedExceptionSelfTest.java index 4c27d50..c41bdaf 100644 --- a/modules/core/src/test/java/org/apache/ignite/GridSuppressedExceptionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/GridSuppressedExceptionSelfTest.java @@ -93,9 +93,7 @@ public class GridSuppressedExceptionSelfTest extends TestCase { * * @throws Exception If failed. */ - public void testStackTrace() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-818";); - + public void _testStackTrace() throws Exception { IgniteCheckedException me = new IgniteCheckedException("Test message."); for (int i = 5; i < 20; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf553930/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java index 34e11fe..d69f7fa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java @@ -89,9 +89,7 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void testOnHeapReplicatedPerformance() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-817";); - + public void _testOnHeapReplicatedPerformance() throws Exception { mode = REPLICATED; onheap = 0; startSize = 18 * 1024 * 1024; @@ -102,9 +100,7 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void testOnHeapPartitionedPerformance() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-817";); - + public void _testOnHeapPartitionedPerformance() throws Exception { mode = PARTITIONED; onheap = 0; startSize = 18 * 1024 * 1024; @@ -115,9 +111,7 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void testOffHeapReplicatedPerformance() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-817";); - + public void _testOffHeapReplicatedPerformance() throws Exception { mode = REPLICATED; onheap = 1024 * 1024; startSize = onheap; @@ -128,9 +122,7 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void testOffHeapPartitionedPerformance() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-817";); - + public void _testOffHeapPartitionedPerformance() throws Exception { mode = PARTITIONED; onheap = 4 * 1024 * 1024; @@ -140,9 +132,7 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void testOnHeapReplicatedPerformanceMultithreaded() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-817";); - + public void _testOnHeapReplicatedPerformanceMultithreaded() throws Exception { mode = REPLICATED; onheap = 0; startSize = 18 * 1024 * 1024; @@ -153,9 +143,7 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void testOnHeapPartitionedPerformanceMultithreaded() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-817";); - + public void _testOnHeapPartitionedPerformanceMultithreaded() throws Exception { mode = PARTITIONED; onheap = 0; startSize = 18 * 1024 * 1024; @@ -177,9 +165,7 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void testOffHeapPartitionedPerformanceMultithreaded() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-817";); - + public void _testOffHeapPartitionedPerformanceMultithreaded() throws Exception { mode = PARTITIONED; onheap = 4 * 1024 * 1024; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf553930/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java index fd04f4f..17bbead 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java @@ -75,9 +75,7 @@ public class GridCachePartitionedNearDisabledMetricsSelfTest extends GridCacheAb /** * @throws Exception If failed. */ - public void testGettingRemovedKey() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-819";); - + public void _testGettingRemovedKey() throws Exception { IgniteCache<Integer, Integer> cache = grid(0).cache(null); cache.put(0, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf553930/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java index ea926ee..6847c67 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java @@ -184,9 +184,7 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ - public void testPartitionedMixed() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-820";); - + public void _testPartitionedMixed() throws Exception { mode = PARTITIONED; nearEnabled = false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf553930/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java index 04305c0..1e937ea 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java @@ -759,11 +759,10 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs } /** + * TODO IGNITE-518 * @throws Exception If failed. */ - public void testNearCreateUpdate() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-518";); - + public void _testNearCreateUpdate() throws Exception { if (cacheMode() != PARTITIONED) return; @@ -884,11 +883,10 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs } /** + * TODO IGNITE-518 * @throws Exception If failed. */ - public void testNearAccess() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-518";); - + public void _testNearAccess() throws Exception { if (cacheMode() != PARTITIONED) return; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf553930/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java index 2dcb0c2..3dec1a0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java @@ -137,9 +137,7 @@ public abstract class IgniteCacheExpiryPolicyWithStoreAbstractTest extends Ignit /** * @throws Exception If failed. */ - public void testReadThrough() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-821";); - + public void _testReadThrough() throws Exception { IgniteCache<Integer, Integer> cache = jcache(0); final Integer key = primaryKeys(cache, 1, 100_000).get(0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf553930/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java index 5b80044..3c90af2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java @@ -471,9 +471,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { * * @throws Exception If failed. */ - public void testPropagationDualAsync() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-822";); - + public void _testPropagationDualAsync() throws Exception { mode = DUAL_ASYNC; checkPropagation(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf553930/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemorySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemorySelfTest.java index 51199e6..00f89f9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemorySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemorySelfTest.java @@ -257,9 +257,7 @@ public class GridUnsafeMemorySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void testGuardedOpsPerformance() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-823";); - + public void _testGuardedOpsPerformance() throws Exception { final GridUnsafeGuard guard = new GridUnsafeGuard(); final AtomicInteger i = new AtomicInteger(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf553930/modules/core/src/test/java/org/apache/ignite/util/GridRandomSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridRandomSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridRandomSelfTest.java index 0dc4879..d31e5bc 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/GridRandomSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/GridRandomSelfTest.java @@ -56,9 +56,7 @@ public class GridRandomSelfTest extends TestCase { /** * Test performance difference. */ - public void testPerformance() { - fail("https://issues.apache.org/jira/browse/IGNITE-824";); - + public void _testPerformance() { Random rnd = new GridRandom(); // new Random(); long start = System.nanoTime(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf553930/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java index ebf645f..d11cabb 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java @@ -1052,9 +1052,7 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA } /** @throws Exception If failed. */ - public void testRenameDirectoryIfDstPathExists() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-825";); - + public void _testRenameDirectoryIfDstPathExists() throws Exception { Path fsHome = new Path(primaryFsUri); Path srcDir = new Path(fsHome, "/tmp/"); Path dstDir = new Path(fsHome, "/tmpNew/"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf553930/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopHashMapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopHashMapSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopHashMapSelfTest.java index f28bfd9..5b1b6a8 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopHashMapSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopHashMapSelfTest.java @@ -32,9 +32,7 @@ import java.util.concurrent.*; */ public class HadoopHashMapSelfTest extends HadoopAbstractMapTest { - public void testAllocation() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-826";); - + public void _testAllocation() throws Exception { final GridUnsafeMemory mem = new GridUnsafeMemory(0); long size = 3L * 1024 * 1024 * 1024; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf553930/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java index bc45d1e..4e9bf31 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java @@ -115,9 +115,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void testTwoStep() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-827";); - + public void _testTwoStep() throws Exception { String cache = "partitioned"; GridQueryProcessor qryProc = ((IgniteKernal) ignite).context().query(); @@ -251,9 +249,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { // return 10 * 60 * 1000; // } - public void testLoop() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-827";); - + public void _testLoop() throws Exception { final IgniteCache<Object,Object> c = ignite.cache("partitioned"); X.println("___ GET READY"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf553930/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java index 37b2ba1..d52e173 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java @@ -403,9 +403,7 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract } } - public void testResultReuse() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-828";); - + public void _testResultReuse() throws Exception { final IgniteH2Indexing spi = getIndexing(); multithreaded(new Callable<Object>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf553930/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java index c570ddb..7cdf0bc 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java @@ -421,9 +421,7 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest { /** * @throws Exception If failed. */ - public void testCrossCache() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-829";); - + public void _testCrossCache() throws Exception { //TODO Investigate (should be 20 results instead of 0). compareQueryRes0("select firstName, lastName" + " from \"part\".Person, \"part\".Purchase" +
