ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [10/25] incubator-ignite git commit: IGNITE-35 Fixed test
Date Thu, 22 Jan 2015 17:35:42 GMT
IGNITE-35 Fixed test


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fad02131
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fad02131
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fad02131

Branch: refs/heads/sprint-1
Commit: fad02131003d2aea4be0dd5033eed7cd21ece691
Parents: 80e8ba1
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Fri Dec 19 16:53:30 2014 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Fri Dec 19 16:53:30 2014 +0300

----------------------------------------------------------------------
 .../grid/p2p/GridP2PDifferentClassLoaderSelfTest.java   |  4 ++--
 .../grid/p2p/GridP2PJobClassLoaderSelfTest.java         |  1 -
 .../grid/p2p/GridP2PLocalDeploymentSelfTest.java        |  8 ++++----
 .../org/gridgain/grid/p2p/GridP2PNodeLeftSelfTest.java  |  4 ++--
 .../grid/p2p/GridP2PSameClassLoaderSelfTest.java        |  8 ++++----
 .../grid/p2p/GridP2PUserVersionChangeSelfTest.java      | 12 ++++++------
 6 files changed, 18 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fad02131/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDifferentClassLoaderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDifferentClassLoaderSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDifferentClassLoaderSelfTest.java
index 3533b3f..909c7ba 100644
--- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDifferentClassLoaderSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDifferentClassLoaderSelfTest.java
@@ -95,8 +95,8 @@ public class GridP2PDifferentClassLoaderSelfTest extends GridCommonAbstractTest
             }
 
             // Execute task1 and task2 from node1 on node2 and make sure that they reuse
same class loader on node2.
-            Integer res1 = ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
-            Integer res2 = ignite1.compute().execute(task2, ignite2.cluster().localNode().id());
+            Integer res1 = (Integer)ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
+            Integer res2 = (Integer)ignite1.compute().execute(task2, ignite2.cluster().localNode().id());
 
             if (expectEquals)
                 assert res1.equals(res2);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fad02131/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PJobClassLoaderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PJobClassLoaderSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PJobClassLoaderSelfTest.java
index 577b919..363459b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PJobClassLoaderSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PJobClassLoaderSelfTest.java
@@ -12,7 +12,6 @@ package org.gridgain.grid.p2p;
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.resources.*;
 import org.gridgain.testframework.junits.common.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fad02131/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PLocalDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PLocalDeploymentSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PLocalDeploymentSelfTest.java
index bf94b5c..2f149c6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PLocalDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PLocalDeploymentSelfTest.java
@@ -101,11 +101,11 @@ public class GridP2PLocalDeploymentSelfTest extends GridCommonAbstractTest
{
 
             taskCls = ldr2.loadClass("org.gridgain.grid.tests.p2p.GridP2PTestTaskExternalPath1");
 
-            Integer res1 = ignite2.compute().execute(taskCls, ignite1.cluster().localNode().id());
+            Integer res1 = (Integer)ignite2.compute().execute(taskCls, ignite1.cluster().localNode().id());
 
             taskCls = ldr3.loadClass("org.gridgain.grid.tests.p2p.GridP2PTestTaskExternalPath1");
 
-            Integer res2 = ignite3.compute().execute(taskCls, ignite1.cluster().localNode().id());
+            Integer res2 = (Integer)ignite3.compute().execute(taskCls, ignite1.cluster().localNode().id());
 
             assert !res1.equals(res2); // Resources are not same.
         }
@@ -137,9 +137,9 @@ public class GridP2PLocalDeploymentSelfTest extends GridCommonAbstractTest
{
             Class task1 = ldr1.loadClass("org.gridgain.grid.tests.p2p.GridP2PTestTaskExternalPath1");
             Class task2 = ldr2.loadClass("org.gridgain.grid.tests.p2p.GridP2PTestTaskExternalPath1");
 
-            Integer res1 = ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
+            Integer res1 = (Integer)ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
 
-            Integer res2 = ignite2.compute().execute(task2, ignite1.cluster().localNode().id());
+            Integer res2 = (Integer)ignite2.compute().execute(task2, ignite1.cluster().localNode().id());
 
             assert !res1.equals(res2); // Class loaders are not same.
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fad02131/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PNodeLeftSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PNodeLeftSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PNodeLeftSelfTest.java
index 1dbca52..bc4e4d5 100644
--- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PNodeLeftSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PNodeLeftSelfTest.java
@@ -68,14 +68,14 @@ public class GridP2PNodeLeftSelfTest extends GridCommonAbstractTest {
 
             Class task1 = urlClsLdr1.loadClass("org.gridgain.grid.tests.p2p.GridP2PTestTaskExternalPath1");
 
-            Integer res1 = ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
+            Integer res1 = (Integer)ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
 
             stopGrid(1);
 
             Thread.sleep(1000);
 
             // Task will be deployed after stop node1
-            Integer res2 = ignite3.compute().execute(task1, ignite2.cluster().localNode().id());
+            Integer res2 = (Integer)ignite3.compute().execute(task1, ignite2.cluster().localNode().id());
 
             if (isExpectUndeploy)
                 assert !res1.equals(res2);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fad02131/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PSameClassLoaderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PSameClassLoaderSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PSameClassLoaderSelfTest.java
index 1baf401..40fea6b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PSameClassLoaderSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PSameClassLoaderSelfTest.java
@@ -79,13 +79,13 @@ public class GridP2PSameClassLoaderSelfTest extends GridCommonAbstractTest
{
             Class task2 = CLASS_LOADER.loadClass(TEST_TASK2_NAME);
 
             // Execute task1 and task2 from node1 on node2 and make sure that they reuse
same class loader on node2.
-            Integer res1 = ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
-            Integer res2 = ignite1.compute().execute(task2, ignite2.cluster().localNode().id());
+            Integer res1 = (Integer)ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
+            Integer res2 = (Integer)ignite1.compute().execute(task2, ignite2.cluster().localNode().id());
 
             assert res1.equals(res2); // Class loaders are same
 
-            Integer res3 = ignite3.compute().execute(task1, ignite2.cluster().localNode().id());
-            Integer res4 = ignite3.compute().execute(task2, ignite2.cluster().localNode().id());
+            Integer res3 = (Integer)ignite3.compute().execute(task1, ignite2.cluster().localNode().id());
+            Integer res4 = (Integer)ignite3.compute().execute(task2, ignite2.cluster().localNode().id());
 
             assert res3.equals(res4);
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fad02131/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java
b/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java
index e26c85a..8eb3ae8 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java
@@ -141,7 +141,7 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest
{
                 }
             }, EVT_TASK_UNDEPLOYED);
 
-            Integer res1 = ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
+            Integer res1 = (Integer)ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
 
             stopGrid(1);
 
@@ -149,7 +149,7 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest
{
 
             ignite1 = startGrid(1);
 
-            Integer res2 = ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
+            Integer res2 = (Integer)ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
 
             assert !res1.equals(res2);
 
@@ -189,13 +189,13 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest
{
                 }
             }, EVT_TASK_UNDEPLOYED);
 
-            Integer res1 = ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
+            Integer res1 = (Integer)ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
 
             stopGrid(1);
 
             ignite1 = startGrid(1);
 
-            Integer res2 = ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
+            Integer res2 = (Integer)ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
 
             assert !undeployed.await(3000, MILLISECONDS);
 
@@ -245,7 +245,7 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest
{
                 }
             }, EVT_NODE_LEFT);
 
-            Integer res1 = ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
+            Integer res1 = (Integer)ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
 
             stopGrid(1);
 
@@ -255,7 +255,7 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest
{
 
             ignite1 = startGrid(1);
 
-            Integer res2 = ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
+            Integer res2 = (Integer)ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
 
             assert !res1.equals(res2);
         }


Mime
View raw message