http://git-wip-us.apache.org/repos/asf/ignite/blob/75961eee/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java index 0a7845b..662cee3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java @@ -231,4 +231,4 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT return cfg; } -} \ No newline at end of file +}
http://git-wip-us.apache.org/repos/asf/ignite/blob/75961eee/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java index b4e1ae6..2247acf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java @@ -33,6 +33,7 @@ import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; +import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.GridCacheContext; @@ -233,8 +234,20 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { List<KeyCacheObject> cacheKeys = F.asList(ctx.toCacheKeyObject(1), ctx.toCacheKeyObject(2)); - ((IgniteKernal)g1).internalCache(null).preloader().request(cacheKeys, new AffinityTopologyVersion(2)).get(); - ((IgniteKernal)g2).internalCache(null).preloader().request(cacheKeys, new AffinityTopologyVersion(2)).get(); + IgniteInternalFuture<Object> f1 = ((IgniteKernal)g1).internalCache(null).preloader().request( + cacheKeys, + new AffinityTopologyVersion(2)); + + if (f1 != null) + f1.get(); + + + IgniteInternalFuture<Object> f2 = ((IgniteKernal)g2).internalCache(null).preloader().request( + cacheKeys, + new AffinityTopologyVersion(2)); + + if (f2 != null) + f2.get(); IgniteCache<Integer, String> cache1 = g1.cache(null); IgniteCache<Integer, String> cache2 = g2.cache(null); @@ -602,4 +615,4 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { lock1.unlock(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/75961eee/modules/core/src/test/java/org/apache/ignite/lang/GridTupleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/lang/GridTupleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/lang/GridTupleSelfTest.java index a21ed30..5865cad 100644 --- a/modules/core/src/test/java/org/apache/ignite/lang/GridTupleSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/lang/GridTupleSelfTest.java @@ -20,10 +20,12 @@ package org.apache.ignite.lang; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.NoSuchElementException; import org.apache.ignite.internal.util.lang.GridTuple; import org.apache.ignite.internal.util.lang.GridTuple3; import org.apache.ignite.internal.util.lang.GridTupleV; +import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.common.GridCommonTest; @@ -102,6 +104,44 @@ public class GridTupleSelfTest extends GridCommonAbstractTest { /** * JUnit. */ + public void testGridTuple2AsMap() { + String str1 = "A test string 1"; + String str2 = "A test string 2"; + + IgniteBiTuple<String, String> tpl = new IgniteBiTuple<>(); + + tpl.put(str1, str2); + + assertEquals(str2, tpl.get(str1)); + assertEquals(1, tpl.size()); + + assert tpl.containsKey(str1); + assert tpl.containsValue(str2); + + Iterator<Map.Entry<String, String>> it = tpl.entrySet().iterator(); + + assert it.hasNext(); + + Map.Entry<String, String> next = it.next(); + + assertEquals(str1, next.getKey()); + assertEquals(str2, next.getValue()); + + assert !it.hasNext(); + + next = F.firstEntry(tpl); + + assertEquals(str1, next.getKey()); + assertEquals(str2, next.getValue()); + + tpl = new IgniteBiTuple<>(); + + assert !tpl.entrySet().iterator().hasNext(); + } + + /** + * JUnit. + */ public void testGridTuple3AsIterable() { String str1 = "A test string 1"; String str2 = "A test string 2"; @@ -166,4 +206,4 @@ public class GridTupleSelfTest extends GridCommonAbstractTest { info("Caught expected exception: " + e); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/75961eee/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 53eefdd..437a30b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -780,6 +780,7 @@ <exclude>**/NOTICE*</exclude> <exclude>**/LICENSE*</exclude> <exclude>src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java</exclude><!--BSD license--> + <exclude>src/main/java/org/apache/ignite/internal/util/nio/SelectedSelectionKeySet.java</exclude><!-- Apache 2.0 license --> <exclude>src/main/java/org/apache/ignite/internal/util/snaptree/*.java</exclude><!--BSD license--> <exclude>src/main/java/org/jsr166/*.java</exclude> <exclude>src/test/java/org/apache/ignite/p2p/p2p.properties</exclude><!--test depends on file content-->
