ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [43/50] [abbrv] incubator-ignite git commit: # IGNITE-439 Fixed multicast for tests.
Date Wed, 11 Mar 2015 06:22:21 GMT
# IGNITE-439 Fixed multicast for tests.


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

Branch: refs/heads/ignite-329
Commit: f2dbede4804288187af40087ac71aaf9f3f4c58a
Parents: 3d9895b
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Tue Mar 10 16:53:02 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Tue Mar 10 16:53:02 2015 +0700

----------------------------------------------------------------------
 .../java/org/apache/ignite/testframework/GridTestUtils.java  | 4 ++--
 modules/scalar/pom.xml                                       | 8 ++++++++
 .../ignite/scalar/testsuites/ScalarSelfTestSuite.scala       | 6 ++++++
 .../internal/websession/IgniteWebSessionSelfTestSuite.java   | 6 ++++++
 4 files changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2dbede4/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
index 6175a2f..ed13e83 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
@@ -55,7 +55,7 @@ public final class GridTestUtils {
     public static final long DFLT_BUSYWAIT_SLEEP_INTERVAL = 200;
 
     /** */
-    private static final Map<Class<? extends Test>, String> addrs = new HashMap<>();
+    private static final Map<Class<?>, String> addrs = new HashMap<>();
 
     /** */
     private static final Map<Class<? extends Test>, Integer> mcastPorts = new
HashMap<>();
@@ -401,7 +401,7 @@ public final class GridTestUtils {
      * @param cls Class.
      * @return Next multicast group.
      */
-    public static synchronized String getNextMulticastGroup(Class<? extends Test> cls)
{
+    public static synchronized String getNextMulticastGroup(Class<?> cls) {
         String addrStr = addrs.get(cls);
 
         if (addrStr != null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2dbede4/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index b0d9b3d..aa1844e 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -50,6 +50,14 @@
 
         <dependency>
             <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ignite</groupId>
             <artifactId>ignite-spring</artifactId>
             <version>${ignite.version}</version>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2dbede4/modules/scalar/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarSelfTestSuite.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarSelfTestSuite.scala
b/modules/scalar/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarSelfTestSuite.scala
index f17e542..e9ebbd0 100644
--- a/modules/scalar/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarSelfTestSuite.scala
+++ b/modules/scalar/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarSelfTestSuite.scala
@@ -17,8 +17,12 @@
 
 package org.apache.ignite.scalar.testsuites
 
+import org.apache.ignite.IgniteSystemProperties._
 import org.apache.ignite.scalar.tests._
+import org.apache.ignite.testframework.GridTestUtils
+
 import org.junit.runner.RunWith
+
 import org.scalatest._
 import org.scalatest.junit.JUnitRunner
 
@@ -35,4 +39,6 @@ class ScalarSelfTestSuite extends Suites(
     new ScalarReturnableSpec,
     new ScalarSpec
 ) {
+    System.setProperty(IGNITE_OVERRIDE_MCAST_GRP,
+        GridTestUtils.getNextMulticastGroup(classOf[ScalarSelfTestSuite]))
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2dbede4/modules/web/src/test/java/org/apache/ignite/internal/websession/IgniteWebSessionSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/IgniteWebSessionSelfTestSuite.java
b/modules/web/src/test/java/org/apache/ignite/internal/websession/IgniteWebSessionSelfTestSuite.java
index c0ca0b0..8f8b9ee 100644
--- a/modules/web/src/test/java/org/apache/ignite/internal/websession/IgniteWebSessionSelfTestSuite.java
+++ b/modules/web/src/test/java/org/apache/ignite/internal/websession/IgniteWebSessionSelfTestSuite.java
@@ -18,6 +18,9 @@
 package org.apache.ignite.internal.websession;
 
 import junit.framework.*;
+import org.apache.ignite.testframework.*;
+
+import static org.apache.ignite.IgniteSystemProperties.*;
 
 /**
  * Test suite for web sessions caching functionality.
@@ -35,6 +38,9 @@ public class IgniteWebSessionSelfTestSuite extends TestSuite {
         suite.addTestSuite(WebSessionTransactionalSelfTest.class);
         suite.addTestSuite(WebSessionReplicatedSelfTest.class);
 
+        System.setProperty(IGNITE_OVERRIDE_MCAST_GRP,
+            GridTestUtils.getNextMulticastGroup(IgniteWebSessionSelfTestSuite.class));
+
         return suite;
     }
 


Mime
View raw message