Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EE17517698 for ; Mon, 27 Apr 2015 15:39:52 +0000 (UTC) Received: (qmail 96101 invoked by uid 500); 27 Apr 2015 15:39:52 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 96071 invoked by uid 500); 27 Apr 2015 15:39:52 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 96025 invoked by uid 99); 27 Apr 2015 15:39:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Apr 2015 15:39:52 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Apr 2015 15:39:48 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id A9B3F273CB for ; Mon, 27 Apr 2015 15:39:27 +0000 (UTC) Received: (qmail 94466 invoked by uid 99); 27 Apr 2015 15:39:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Apr 2015 15:39:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 62491E30F4; Mon, 27 Apr 2015 15:39:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 27 Apr 2015 15:39:34 -0000 Message-Id: <0a0ee64d07a446f8a737d720b9dc858c@git.apache.org> In-Reply-To: <8c3e68ab378b4a5fac821f459347aec2@git.apache.org> References: <8c3e68ab378b4a5fac821f459347aec2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/15] incubator-ignite git commit: ignite-695: _test-s X-Virus-Checked: Checked by ClamAV on apache.org ignite-695: _test-s Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a1047712 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a1047712 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a1047712 Branch: refs/heads/ignite-779 Commit: a104771227892c13d843362b278889b74fe43656 Parents: cde25ab Author: Artem Shutak Authored: Mon Apr 27 13:26:48 2015 +0300 Committer: Artem Shutak Committed: Mon Apr 27 13:26:48 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 | 36 +++++++++++--------- 14 files changed, 82 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1047712/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 c41bdaf..4c27d50 100644 --- a/modules/core/src/test/java/org/apache/ignite/GridSuppressedExceptionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/GridSuppressedExceptionSelfTest.java @@ -93,7 +93,9 @@ public class GridSuppressedExceptionSelfTest extends TestCase { * * @throws Exception If failed. */ - public void _testStackTrace() throws Exception { + public void testStackTrace() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-818"); + IgniteCheckedException me = new IgniteCheckedException("Test message."); for (int i = 5; i < 20; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1047712/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 d69f7fa..34e11fe 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,7 +89,9 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void _testOnHeapReplicatedPerformance() throws Exception { + public void testOnHeapReplicatedPerformance() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-817"); + mode = REPLICATED; onheap = 0; startSize = 18 * 1024 * 1024; @@ -100,7 +102,9 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void _testOnHeapPartitionedPerformance() throws Exception { + public void testOnHeapPartitionedPerformance() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-817"); + mode = PARTITIONED; onheap = 0; startSize = 18 * 1024 * 1024; @@ -111,7 +115,9 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void _testOffHeapReplicatedPerformance() throws Exception { + public void testOffHeapReplicatedPerformance() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-817"); + mode = REPLICATED; onheap = 1024 * 1024; startSize = onheap; @@ -122,7 +128,9 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void _testOffHeapPartitionedPerformance() throws Exception { + public void testOffHeapPartitionedPerformance() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-817"); + mode = PARTITIONED; onheap = 4 * 1024 * 1024; @@ -132,7 +140,9 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void _testOnHeapReplicatedPerformanceMultithreaded() throws Exception { + public void testOnHeapReplicatedPerformanceMultithreaded() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-817"); + mode = REPLICATED; onheap = 0; startSize = 18 * 1024 * 1024; @@ -143,7 +153,9 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void _testOnHeapPartitionedPerformanceMultithreaded() throws Exception { + public void testOnHeapPartitionedPerformanceMultithreaded() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-817"); + mode = PARTITIONED; onheap = 0; startSize = 18 * 1024 * 1024; @@ -165,7 +177,9 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void _testOffHeapPartitionedPerformanceMultithreaded() throws Exception { + public void testOffHeapPartitionedPerformanceMultithreaded() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-817"); + mode = PARTITIONED; onheap = 4 * 1024 * 1024; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1047712/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 17bbead..fd04f4f 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,7 +75,9 @@ public class GridCachePartitionedNearDisabledMetricsSelfTest extends GridCacheAb /** * @throws Exception If failed. */ - public void _testGettingRemovedKey() throws Exception { + public void testGettingRemovedKey() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-819"); + IgniteCache cache = grid(0).cache(null); cache.put(0, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1047712/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 6847c67..ea926ee 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,7 +184,9 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ - public void _testPartitionedMixed() throws Exception { + public void testPartitionedMixed() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-820"); + mode = PARTITIONED; nearEnabled = false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1047712/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 1e937ea..04305c0 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,10 +759,11 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs } /** - * TODO IGNITE-518 * @throws Exception If failed. */ - public void _testNearCreateUpdate() throws Exception { + public void testNearCreateUpdate() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-518"); + if (cacheMode() != PARTITIONED) return; @@ -883,10 +884,11 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs } /** - * TODO IGNITE-518 * @throws Exception If failed. */ - public void _testNearAccess() throws Exception { + public void testNearAccess() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-518"); + if (cacheMode() != PARTITIONED) return; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1047712/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 3dec1a0..2dcb0c2 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,7 +137,9 @@ public abstract class IgniteCacheExpiryPolicyWithStoreAbstractTest extends Ignit /** * @throws Exception If failed. */ - public void _testReadThrough() throws Exception { + public void testReadThrough() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-821"); + IgniteCache cache = jcache(0); final Integer key = primaryKeys(cache, 1, 100_000).get(0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1047712/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 3c90af2..5b80044 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,7 +471,9 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { * * @throws Exception If failed. */ - public void _testPropagationDualAsync() throws Exception { + public void testPropagationDualAsync() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-822"); + mode = DUAL_ASYNC; checkPropagation(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1047712/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 00f89f9..51199e6 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,7 +257,9 @@ public class GridUnsafeMemorySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void _testGuardedOpsPerformance() throws Exception { + public void testGuardedOpsPerformance() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-823"); + final GridUnsafeGuard guard = new GridUnsafeGuard(); final AtomicInteger i = new AtomicInteger(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1047712/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 d31e5bc..0dc4879 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,7 +56,9 @@ public class GridRandomSelfTest extends TestCase { /** * Test performance difference. */ - public void _testPerformance() { + public void testPerformance() { + fail("https://issues.apache.org/jira/browse/IGNITE-824"); + Random rnd = new GridRandom(); // new Random(); long start = System.nanoTime(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1047712/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 d11cabb..ebf645f 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,7 +1052,9 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA } /** @throws Exception If failed. */ - public void _testRenameDirectoryIfDstPathExists() throws Exception { + public void testRenameDirectoryIfDstPathExists() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-825"); + 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/a1047712/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 5b1b6a8..f28bfd9 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,7 +32,9 @@ import java.util.concurrent.*; */ public class HadoopHashMapSelfTest extends HadoopAbstractMapTest { - public void _testAllocation() throws Exception { + public void testAllocation() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-826"); + final GridUnsafeMemory mem = new GridUnsafeMemory(0); long size = 3L * 1024 * 1024 * 1024; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1047712/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 4e9bf31..bc45d1e 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,7 +115,9 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void _testTwoStep() throws Exception { + public void testTwoStep() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-827"); + String cache = "partitioned"; GridQueryProcessor qryProc = ((IgniteKernal) ignite).context().query(); @@ -249,7 +251,9 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { // return 10 * 60 * 1000; // } - public void _testLoop() throws Exception { + public void testLoop() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-827"); + final IgniteCache c = ignite.cache("partitioned"); X.println("___ GET READY"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1047712/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 d52e173..37b2ba1 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,7 +403,9 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract } } - public void _testResultReuse() throws Exception { + public void testResultReuse() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-828"); + final IgniteH2Indexing spi = getIndexing(); multithreaded(new Callable() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1047712/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 a715e6f..c570ddb 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 @@ -38,13 +38,13 @@ import java.util.concurrent.*; public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest { /** Org count. */ public static final int ORG_CNT = 30; - + /** Address count. */ public static final int ADDR_CNT = 10; - + /** Person count. */ public static final int PERS_CNT = 50; - + /** Product count. */ public static final int PROD_CNT = 100; @@ -87,7 +87,7 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest { insertInDb(org); } - + // Adresses. List
addreses = new ArrayList<>(); @@ -143,7 +143,7 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest { int id = idGen++; Person person = persons.get(i % persons.size()); - + Purchase purchase = new Purchase(id, products.get(i % products.size()), person.orgId, person); pCache.put(purchase.key(), purchase); @@ -199,10 +199,10 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest { // compareQueryRes0("select * from table0('aaa', 100) x left join table0('bbb', 100) y where x.b = 'bbb'"); final String addStreet = "Addr" + ORG_CNT + 1; - + List> res = compareQueryRes0("select avg(old) from \"part\".Person left join \"repl\".Address " + " on Person.addrId = Address.id where lower(Address.street) = lower(?)", addStreet); - + assertNotSame(0, res); compareQueryRes0("select avg(old) from \"part\".Person join \"repl\".Address on Person.addrId = Address.id " + @@ -216,14 +216,14 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest { compareQueryRes0("select firstName, date from \"part\".Person"); compareQueryRes0("select distinct firstName, date from \"part\".Person"); - + final String star = " _key, _val, id, firstName, lastName, orgId, salary, addrId, old, date "; - + compareQueryRes0("select " + star + " from \"part\".Person p"); compareQueryRes0("select " + star + " from \"part\".Person"); compareQueryRes0("select distinct " + star + " from \"part\".Person"); compareQueryRes0("select p.firstName, date from \"part\".Person p"); - + compareQueryRes0("select p._key, p._val, p.id, p.firstName, p.lastName, p.orgId, p.salary, p.addrId, p.old, " + " p.date, a._key, a._val, a.id, a.street" + " from \"part\".Person p, \"repl\".Address a"); @@ -421,7 +421,9 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest { /** * @throws Exception If failed. */ - public void _testCrossCache() throws Exception { + public void testCrossCache() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-829"); + //TODO Investigate (should be 20 results instead of 0). compareQueryRes0("select firstName, lastName" + " from \"part\".Person, \"part\".Purchase" + @@ -443,7 +445,7 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest { /** {@inheritDoc} */ @Override protected Statement initializeH2Schema() throws SQLException { Statement st = super.initializeH2Schema(); - + st.execute("create table \"part\".ORGANIZATION" + " (_key int not null," + " _val other not null," + @@ -484,10 +486,10 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest { " street varchar(255))"); conn.commit(); - + return st; } - + /** * Insert {@link Organization} at h2 database. * @@ -568,7 +570,7 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest { st.executeUpdate(); } } - + /** * Insert {@link Address} at h2 database. * @@ -675,7 +677,7 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest { ", lastName=" + lastName + ", id=" + id + ", orgId=" + orgId + - ", salary=" + salary + + ", salary=" + salary + ", addrId=" + addrId + ']'; } } @@ -781,7 +783,7 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest { /** Person ID. */ @QuerySqlField private int personId; - + /** Organization id. */ @QuerySqlField private int organizationId;