ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [08/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ingite-9655-merge
Date Sat, 31 Jan 2015 03:55:08 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38121645/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index d92ad4d,4f55e2f..66bde26
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@@ -461,19 -461,20 +461,26 @@@ public abstract class GridCacheAbstract
      public void testGetAll() throws Exception {
          IgniteTx tx = txEnabled() ? cache().txStart() : null;
  
 -        cache().put("key1", 1);
 -        cache().put("key2", 2);
 +        try {
 +            cache().put("key1", 1);
 +            cache().put("key2", 2);
  
 -        if (tx != null)
 -            tx.commit();
 +            if (tx != null)
 +                tx.commit();
 +        }
 +        finally {
 +            if (tx != null)
 +                tx.close();
 +        }
  
-         assert cache().getAll(null).isEmpty();
+         GridTestUtils.assertThrows(log, new Callable<Void>() {
+             @Override public Void call() throws Exception {
+                 cache().getAll(null).isEmpty();
+ 
+                 return null;
+             }
+         }, NullPointerException.class, null);
+ 
          assert cache().getAll(Collections.<String>emptyList()).isEmpty();
  
          Map<String, Integer> map1 = cache().getAll(F.asList("key1", "key2", "key9999"));
@@@ -500,36 -501,29 +507,35 @@@
          if (txEnabled()) {
              tx = cache().txStart();
  
 -            assert cache().getAll(Collections.<String>emptyList()).isEmpty();
 +            try {
-                 assert cache().getAll(null).isEmpty();
 +                assert cache().getAll(Collections.<String>emptyList()).isEmpty();
  
 -            map1 = cache().getAll(F.asList("key1", "key2", "key9999"));
 +                map1 = cache().getAll(F.asList("key1", "key2", "key9999"));
  
 -            info("Retrieved map1: " + map1);
 +                info("Retrieved map1: " + map1);
  
 -            assert 2 == map1.size() : "Invalid map: " + map1;
 +                assert 2 == map1.size() : "Invalid map: " + map1;
  
 -            assertEquals(1, (int)map1.get("key1"));
 -            assertEquals(2, (int)map1.get("key2"));
 -            assertNull(map1.get("key9999"));
 +                assertEquals(1, (int)map1.get("key1"));
 +                assertEquals(2, (int)map1.get("key2"));
 +                assertNull(map1.get("key9999"));
  
 -            map2 = cache().getAll(F.asList("key1", "key2", "key9999"));
 +                map2 = cache().getAll(F.asList("key1", "key2", "key9999"));
  
 -            info("Retrieved map2: " + map2);
 +                info("Retrieved map2: " + map2);
  
 -            assert 2 == map2.size() : "Invalid map: " + map2;
 +                assert 2 == map2.size() : "Invalid map: " + map2;
  
 -            assertEquals(1, (int)map2.get("key1"));
 -            assertEquals(2, (int)map2.get("key2"));
 -            assertNull(map2.get("key9999"));
 +                assertEquals(1, (int)map2.get("key1"));
 +                assertEquals(2, (int)map2.get("key2"));
 +                assertNull(map2.get("key9999"));
  
 -            tx.commit();
 +                tx.commit();
 +            }
 +            finally {
 +                if (tx != null)
 +                    tx.close();
 +            }
          }
      }
  
@@@ -1643,31 -1630,25 +1662,31 @@@
      public void testPutxAsync() throws Exception {
          IgniteTx tx = txEnabled() ? cache().txStart() : null;
  
 -        cache().put("key2", 1);
 +        try {
 +            cache().put("key2", 1);
  
-             IgniteFuture<Boolean> fut1 = cache().putxAsync("key1", 10);
-             IgniteFuture<Boolean> fut2 = cache().putxAsync("key2", 11);
 -        IgniteInternalFuture<Boolean> fut1 = cache().putxAsync("key1", 10);
 -        IgniteInternalFuture<Boolean> fut2 = cache().putxAsync("key2", 11);
++            IgniteInternalFuture<Boolean> fut1 = cache().putxAsync("key1", 10);
++            IgniteInternalFuture<Boolean> fut2 = cache().putxAsync("key2", 11);
  
-             IgniteFuture<IgniteTx> f = null;
 -        IgniteInternalFuture<IgniteTx> f = null;
++            IgniteInternalFuture<IgniteTx> f = null;
  
 -        if (tx != null) {
 -            tx = (IgniteTx)tx.withAsync();
 +            if (tx != null) {
-                 tx = (IgniteTx)tx.enableAsync();
++                tx = (IgniteTx)tx.withAsync();
  
 -            tx.commit();
 +                tx.commit();
  
 -            f = tx.future();
 -        }
 +                f = tx.future();
 +            }
  
 -        assert fut1.get();
 -        assert fut2.get();
 +            assert fut1.get();
 +            assert fut2.get();
  
 -        assert f == null || f.get().state() == COMMITTED;
 +            assert f == null || f.get().state() == COMMITTED;
 +        }
 +        finally {
 +            if (tx != null)
 +                tx.close();
 +        }
  
          checkSize(F.asSet("key1", "key2"));
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38121645/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38121645/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38121645/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
index 46dc326,3605705..e25bcfc
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
@@@ -164,12 -164,14 +164,12 @@@ public abstract class IgniteTxPessimist
          }
  
          info("Starting tx [values=" + map + ", topVer=" +
-             ((GridKernal)grid(1)).context().discovery().topologyVersion() + ']');
+             ((IgniteKernal)grid(1)).context().discovery().topologyVersion() + ']');
  
          if (fullFailure)
 -            ignoreMessages(ignoreMessageClasses(), allNodeIds());
 -        else
              ignoreMessages(ignoreMessageClasses(), F.asList(grid(1).localNode().id()));
  
-         final GridEx originatingNodeGrid = grid(originatingNode());
+         final IgniteEx originatingNodeGrid = grid(originatingNode());
  
          GridTestUtils.runAsync(new Callable<Void>() {
              @Override public Void call() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38121645/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38121645/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------


Mime
View raw message