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/10/10 16:00:32 UTC
[05/34] ignite git commit: IGNITE-3989: Moved failing JTA tests to
ignore module.
IGNITE-3989: Moved failing JTA 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/b9105df7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b9105df7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b9105df7
Branch: refs/heads/ignite-comm-opts2
Commit: b9105df77cc70b532f94899c754fba47e3e05e9a
Parents: ccfaaf8
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 28 14:53:20 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 28 14:53:20 2016 +0300
----------------------------------------------------------------------
modules/ignored-tests/pom.xml | 75 +++++++++++++++++---
.../testsuites/IgniteIgnoredTestSuite.java | 3 +
...titionedCacheJtaLookupClassNameSelfTest.java | 4 +-
.../ignite/testsuites/IgniteJtaTestSuite.java | 3 +-
4 files changed, 74 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b9105df7/modules/ignored-tests/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ignored-tests/pom.xml b/modules/ignored-tests/pom.xml
index 9fdff2c..661e237 100644
--- a/modules/ignored-tests/pom.xml
+++ b/modules/ignored-tests/pom.xml
@@ -35,15 +35,16 @@
<url>http://ignite.apache.org</url>
<dependencies>
+ <!-- Ignite modules. -->
<dependency>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite-core</artifactId>
+ <artifactId>ignite-aws</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite-core</artifactId>
+ <artifactId>ignite-aws</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -51,26 +52,27 @@
<dependency>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite-log4j</artifactId>
+ <artifactId>ignite-cloud</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite-spring</artifactId>
+ <artifactId>ignite-cloud</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite-aws</artifactId>
+ <artifactId>ignite-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite-aws</artifactId>
+ <artifactId>ignite-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -78,13 +80,13 @@
<dependency>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite-cloud</artifactId>
+ <artifactId>ignite-jta</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite-cloud</artifactId>
+ <artifactId>ignite-jta</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -92,6 +94,19 @@
<dependency>
<groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-log4j</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-spring</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
<artifactId>ignite-web</artifactId>
<version>${project.version}</version>
</dependency>
@@ -104,6 +119,21 @@
<scope>test</scope>
</dependency>
+ <!-- 3-rd party dependencies. -->
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <version>1.5</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>6.0.43</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
@@ -117,5 +147,34 @@
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ow2.jotm</groupId>
+ <artifactId>jotm-core</artifactId>
+ <version>2.1.9</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/ignite/blob/b9105df7/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 3ab1d7f..97f65c5 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
@@ -40,6 +40,9 @@ public class IgniteIgnoredTestSuite extends TestSuite {
/* --- CLOUDS --- */
suite.addTest(IgniteCloudTestSuite.suite());
+ /* --- JTA --- */
+ suite.addTest(IgniteJtaTestSuite.suite());
+
/* --- WEB SESSIONS --- */
suite.addTest(IgniteWebSessionSelfTestSuite.suite());
http://git-wip-us.apache.org/repos/asf/ignite/blob/b9105df7/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridPartitionedCacheJtaLookupClassNameSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridPartitionedCacheJtaLookupClassNameSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridPartitionedCacheJtaLookupClassNameSelfTest.java
index 2e322f8..1efbda6 100644
--- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridPartitionedCacheJtaLookupClassNameSelfTest.java
+++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridPartitionedCacheJtaLookupClassNameSelfTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testsuites.IgniteIgnore;
/**
* Lookup class name based JTA integration test using PARTITIONED cache.
@@ -39,9 +40,8 @@ public class GridPartitionedCacheJtaLookupClassNameSelfTest extends AbstractCach
/**
*
*/
+ @IgniteIgnore(value = "https://issues.apache.org/jira/browse/IGNITE-1094", forceFailure = true)
public void testUncompatibleTmLookup() {
- fail("https://issues.apache.org/jira/browse/IGNITE-1094");
-
final IgniteEx ignite = grid(0);
final CacheConfiguration cacheCfg = new CacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/b9105df7/modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java b/modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java
index 60c20dd..4ae5df0 100644
--- a/modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java
+++ b/modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java
@@ -28,6 +28,7 @@ import org.apache.ignite.internal.processors.cache.GridReplicatedCacheJtaFactory
import org.apache.ignite.internal.processors.cache.GridReplicatedCacheJtaFactoryUseSyncSelfTest;
import org.apache.ignite.internal.processors.cache.GridReplicatedCacheJtaLookupClassNameSelfTest;
import org.apache.ignite.internal.processors.cache.GridJtaLifecycleAwareSelfTest;
+import org.apache.ignite.testframework.IgniteTestSuite;
/**
* JTA integration tests.
@@ -38,7 +39,7 @@ public class IgniteJtaTestSuite extends TestSuite {
* @throws Exception Thrown in case of the failure.
*/
public static TestSuite suite() throws Exception {
- TestSuite suite = new TestSuite("JTA Integration Test Suite");
+ TestSuite suite = new IgniteTestSuite("JTA Integration Test Suite");
suite.addTestSuite(GridPartitionedCacheJtaFactorySelfTest.class);
suite.addTestSuite(GridReplicatedCacheJtaFactorySelfTest.class);