You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/09/28 13:05:28 UTC
[09/15] ignite git commit: IGNITE-3990: Moved failing Spring tests to
"ignore" module.
IGNITE-3990: Moved failing Spring tests to "ignore" module.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d5953457
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d5953457
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d5953457
Branch: refs/heads/ignite-3601p
Commit: d595345765db2151ff432beecd478ce056393593
Parents: b9105df
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 28 15:08:38 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 28 15:08:38 2016 +0300
----------------------------------------------------------------------
.../apache/ignite/testframework/IgniteTestSuite.java | 12 ++++--------
modules/ignored-tests/pom.xml | 7 +++++++
.../ignite/testsuites/IgniteIgnoredTestSuite.java | 3 +++
.../ignite/p2p/GridP2PUserVersionChangeSelfTest.java | 7 ++-----
.../testsuites/IgniteResourceSelfTestSuite.java | 11 ++++++-----
.../ignite/testsuites/IgniteSpringTestSuite.java | 15 ++++++++-------
6 files changed, 30 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5953457/modules/core/src/test/java/org/apache/ignite/testframework/IgniteTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/IgniteTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testframework/IgniteTestSuite.java
index 6fc7917..6dad032 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/IgniteTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/IgniteTestSuite.java
@@ -101,16 +101,12 @@ public class IgniteTestSuite extends TestSuite {
setName(name);
}
- /**
- * Adds a test to the suite.
- */
- @Override public void addTest(Test test) {
- super.addTest(test);
- }
-
/** {@inheritDoc} */
@Override public void addTestSuite(Class<? extends TestCase> testClass) {
- addTest(new IgniteTestSuite(testClass, ignoredOnly));
+ IgniteTestSuite suite = new IgniteTestSuite(testClass, ignoredOnly);
+
+ if (suite.testCount() > 0)
+ addTest(suite);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5953457/modules/ignored-tests/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ignored-tests/pom.xml b/modules/ignored-tests/pom.xml
index 661e237..336485c 100644
--- a/modules/ignored-tests/pom.xml
+++ b/modules/ignored-tests/pom.xml
@@ -102,6 +102,13 @@
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring</artifactId>
<version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-spring</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5953457/modules/ignored-tests/src/test/java/org/apache/ignite/testsuites/IgniteIgnoredTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/ignored-tests/src/test/java/org/apache/ignite/testsuites/IgniteIgnoredTestSuite.java b/modules/ignored-tests/src/test/java/org/apache/ignite/testsuites/IgniteIgnoredTestSuite.java
index 97f65c5..2188cd6 100644
--- a/modules/ignored-tests/src/test/java/org/apache/ignite/testsuites/IgniteIgnoredTestSuite.java
+++ b/modules/ignored-tests/src/test/java/org/apache/ignite/testsuites/IgniteIgnoredTestSuite.java
@@ -43,6 +43,9 @@ public class IgniteIgnoredTestSuite extends TestSuite {
/* --- JTA --- */
suite.addTest(IgniteJtaTestSuite.suite());
+ /* --- Spring --- */
+ suite.addTest(IgniteSpringTestSuite.suite());
+
/* --- WEB SESSIONS --- */
suite.addTest(IgniteWebSessionSelfTestSuite.suite());
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5953457/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java
index 8efa440..0b32b04 100644
--- a/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java
@@ -41,6 +41,7 @@ import org.apache.ignite.testframework.GridTestExternalClassLoader;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.config.GridTestProperties;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testsuites.IgniteIgnore;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
@@ -282,14 +283,10 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest {
}
/**
- * TODO: IGNITE-604.
- *
* @throws Exception If failed.
*/
+ @IgniteIgnore(value = "https://issues.apache.org/jira/browse/IGNITE-604", forceFailure = true)
public void testCacheRedeployVersionChangeContinuousMode() throws Exception {
- // Build execution timeout if try to run test on TC.
- fail("https://issues.apache.org/jira/browse/IGNITE-604");
-
depMode = DeploymentMode.CONTINUOUS;
try {
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5953457/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java
index 742190b..e120aaa 100644
--- a/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java
+++ b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java
@@ -22,6 +22,7 @@ import org.apache.ignite.internal.processors.resource.GridLoggerInjectionSelfTes
import org.apache.ignite.internal.processors.resource.GridResourceProcessorSelfTest;
import org.apache.ignite.internal.processors.resource.GridServiceInjectionSelfTest;
import org.apache.ignite.internal.processors.resource.GridSpringResourceInjectionSelfTest;
+import org.apache.ignite.testframework.IgniteTestSuite;
/**
* Ignite resource injection test Suite.
@@ -33,12 +34,12 @@ public class IgniteResourceSelfTestSuite extends TestSuite {
* @throws Exception If failed.
*/
public static TestSuite suite() throws Exception {
- TestSuite suite = new TestSuite("Ignite Resource Injection Test Suite");
+ TestSuite suite = new IgniteTestSuite("Ignite Resource Injection Test Suite");
- suite.addTest(new TestSuite(GridResourceProcessorSelfTest.class));
- suite.addTest(new TestSuite(GridLoggerInjectionSelfTest.class));
- suite.addTest(new TestSuite(GridServiceInjectionSelfTest.class));
- suite.addTest(new TestSuite(GridSpringResourceInjectionSelfTest.class));
+ suite.addTestSuite(GridResourceProcessorSelfTest.class);
+ suite.addTestSuite(GridLoggerInjectionSelfTest.class);
+ suite.addTestSuite(GridServiceInjectionSelfTest.class);
+ suite.addTestSuite(GridSpringResourceInjectionSelfTest.class);
return suite;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5953457/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
index c4a4b75..fff8108 100644
--- a/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
+++ b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
@@ -33,6 +33,7 @@ import org.apache.ignite.p2p.GridP2PUserVersionChangeSelfTest;
import org.apache.ignite.spring.IgniteExcludeInConfigurationTest;
import org.apache.ignite.spring.IgniteStartFromStreamConfigurationTest;
import org.apache.ignite.spring.injection.GridServiceInjectionSpringResourceTest;
+import org.apache.ignite.testframework.IgniteTestSuite;
import org.apache.ignite.transactions.spring.GridSpringTransactionManagerSelfTest;
import org.apache.ignite.transactions.spring.SpringTransactionManagerContextInjectionTest;
@@ -45,23 +46,23 @@ public class IgniteSpringTestSuite extends TestSuite {
* @throws Exception Thrown in case of the failure.
*/
public static TestSuite suite() throws Exception {
- TestSuite suite = new TestSuite("Spring Test Suite");
+ TestSuite suite = new IgniteTestSuite("Spring Test Suite");
suite.addTestSuite(GridSpringBeanSerializationSelfTest.class);
suite.addTestSuite(GridFactorySelfTest.class);
suite.addTest(IgniteResourceSelfTestSuite.suite());
- suite.addTest(new TestSuite(IgniteExcludeInConfigurationTest.class));
+ suite.addTestSuite(IgniteExcludeInConfigurationTest.class);
// Tests moved to this suite since they require Spring functionality.
- suite.addTest(new TestSuite(GridP2PUserVersionChangeSelfTest.class));
+ suite.addTestSuite(GridP2PUserVersionChangeSelfTest.class);
- suite.addTest(new TestSuite(GridSpringCacheManagerSelfTest.class));
+ suite.addTestSuite(GridSpringCacheManagerSelfTest.class);
- suite.addTest(new TestSuite(IgniteDynamicCacheConfigTest.class));
+ suite.addTestSuite(IgniteDynamicCacheConfigTest.class);
- suite.addTest(new TestSuite(IgniteStartFromStreamConfigurationTest.class));
+ suite.addTestSuite(IgniteStartFromStreamConfigurationTest.class);
suite.addTestSuite(CacheSpringStoreSessionListenerSelfTest.class);
@@ -70,7 +71,7 @@ public class IgniteSpringTestSuite extends TestSuite {
suite.addTestSuite(CachePojoStoreXmlSelfTest.class);
suite.addTestSuite(CachePojoStoreXmlWithSqlEscapeSelfTest.class);
- suite.addTest(new TestSuite(GridSpringTransactionManagerSelfTest.class));
+ suite.addTestSuite(GridSpringTransactionManagerSelfTest.class);
suite.addTestSuite(GridServiceInjectionSpringResourceTest.class);