IGNITE-3661: Done.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/df2f8a87 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/df2f8a87 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/df2f8a87 Branch: refs/heads/ignite-3661 Commit: df2f8a874b4e16665eedc5a44ada9b3302fab048 Parents: e23aba4 Author: vozerov-gridgain <[email protected]> Authored: Tue Aug 9 15:36:22 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Tue Aug 9 15:36:22 2016 +0300 ---------------------------------------------------------------------- .../ignite/testframework/IgniteTestSuite.java | 77 ++++++++-------- .../testsuites/IgniteIgnoredTestSuite.java | 63 ------------- modules/ignored-tests/README.txt | 4 + modules/ignored-tests/pom.xml | 93 ++++++++++++++++++++ .../testsuites/IgniteIgnoredTestSuite.java | 50 +++++++++++ .../apache/ignite/testsuites/package-info.java | 22 +++++ .../IgniteWebSessionSelfTestSuite.java | 68 +------------- .../WebSessionReplicatedSelfTest.java | 28 ++++++ .../WebSessionReplicatedV1SelfTest.java | 28 ++++++ .../internal/websession/WebSessionSelfTest.java | 2 + .../WebSessionTransactionalSelfTest.java | 48 ++++++++++ .../WebSessionTransactionalV1SelfTest.java | 28 ++++++ .../websession/WebSessionV1SelfTest.java | 28 ++++++ pom.xml | 1 + 14 files changed, 373 insertions(+), 167 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/df2f8a87/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 2828065..e2802aa 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 @@ -94,16 +94,6 @@ public class IgniteTestSuite extends TestSuite { /** {@inheritDoc} */ @Override public void addTestSuite(Class<? extends TestCase> testClass) { - addTestSuite(testClass, false); - } - - /** - * Add test class to the suite. - * - * @param testClass Test class. - * @param ignoredOnly Ignore only flag. - */ - public void addTestSuite(Class<? extends TestCase> testClass, boolean ignoredOnly) { addTest(new IgniteTestSuite(testClass, ignoredOnly)); } @@ -147,45 +137,56 @@ public class IgniteTestSuite extends TestSuite { } /** - * @param method test method - * @param names test name list - * @param theClass test class + * Add test method. + * + * @param m Test method. + * @param names Test name list. + * @param theClass Test class. + * @return Whether test method was added. */ - private boolean addTestMethod(Method method, List<String> names, Class<?> theClass) { - String name = method.getName(); + private boolean addTestMethod(Method m, List<String> names, Class<?> theClass) { + String name = m.getName(); - if(!names.contains(name) && canAddMethod(method)) { - if(!Modifier.isPublic(method.getModifiers())) - addTest(warning("Test method isn\'t public: " + method.getName() + "(" + - theClass.getCanonicalName() + ")")); - else { - names.add(name); + if (names.contains(name)) + return false; - addTest(createTest(theClass, name)); + if (!isPublicTestMethod(m)) { + if (isTestMethod(m)) + addTest(warning("Test method isn't public: " + m.getName() + "(" + theClass.getCanonicalName() + ")")); - return true; - } + return false; } + + names.add(name); + + if (m.isAnnotationPresent(IgniteIgnore.class) == ignoredOnly) { + addTest(createTest(theClass, name)); + + return true; + } + return false; } /** - * Check whether method should be ignored. + * Check whether this is a test method. * - * @param method Method. - * @return {@code True} if it should be ignored. + * @param m Method. + * @return {@code True} if this is a test method. */ - protected boolean canAddMethod(Method method) { - boolean res = method.getParameterTypes().length == 0 && method.getName().startsWith("test") - && method.getReturnType().equals(Void.TYPE); - - if (res) { - // If method signature and name matches check if it is ignored or not. - boolean hasIgnore = method.isAnnotationPresent(IgniteIgnore.class); - - res = hasIgnore == ignoredOnly; - } + private static boolean isTestMethod(Method m) { + return m.getParameterTypes().length == 0 && + m.getName().startsWith("test") && + m.getReturnType().equals(Void.TYPE); + } - return res; + /** + * Check whether this is a public test method. + * + * @param m Method. + * @return {@code True} if this is a public test method. + */ + private static boolean isPublicTestMethod(Method m) { + return isTestMethod(m) && Modifier.isPublic(m.getModifiers()); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/df2f8a87/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgnoredTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgnoredTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgnoredTestSuite.java deleted file mode 100644 index c3ec5e4..0000000 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgnoredTestSuite.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.testsuites; - -import junit.framework.TestSuite; -import org.apache.ignite.testframework.IgniteTestSuite; -import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; - -/** - * Special test suite with ignored tests. - */ -public class IgniteIgnoredTestSuite extends TestSuite { - /** - * @return IgniteCache test suite. - * @throws Exception Thrown in case of the failure. - */ - public static TestSuite suite() throws Exception { - IgniteTestSuite suite = new IgniteTestSuite("Ignite Ignored Test Suite"); - - suite.addTestSuite(SampleTestClass.class, true); - - return suite; - } - - /** - * Sample test class. To be removed once the very first really ignored test class is there. - */ - public static class SampleTestClass extends GridCommonAbstractTest { - /** - * Test 1. - * - * @throws Exception If failed. - */ - public void testMethod1() throws Exception { - System.out.println("Normal test method called."); - } - - /** - * Test 2. - * - * @throws Exception If failed. - */ - @IgniteIgnore - public void testMethod2() throws Exception { - System.out.println("Ignored method called."); - } - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/df2f8a87/modules/ignored-tests/README.txt ---------------------------------------------------------------------- diff --git a/modules/ignored-tests/README.txt b/modules/ignored-tests/README.txt new file mode 100644 index 0000000..70f728d --- /dev/null +++ b/modules/ignored-tests/README.txt @@ -0,0 +1,4 @@ +Apache Ignite Ignored Tests +------------------------ + +Special module containing ignored and flaky tests grouped in a single test suite. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/df2f8a87/modules/ignored-tests/pom.xml ---------------------------------------------------------------------- diff --git a/modules/ignored-tests/pom.xml b/modules/ignored-tests/pom.xml new file mode 100644 index 0000000..bb0188f --- /dev/null +++ b/modules/ignored-tests/pom.xml @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- + POM file. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-parent</artifactId> + <version>1</version> + <relativePath>../../parent</relativePath> + </parent> + + <artifactId>ignite-ignored-tests</artifactId> + <version>1.6.4</version> + <url>http://ignite.apache.org</url> + + <dependencies> + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + <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> + + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-web</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <version>${jetty.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + <version>${jetty.version}</version> + <scope>test</scope> + </dependency> + </dependencies> +</project> http://git-wip-us.apache.org/repos/asf/ignite/blob/df2f8a87/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 new file mode 100644 index 0000000..b0dc545 --- /dev/null +++ b/modules/ignored-tests/src/test/java/org/apache/ignite/testsuites/IgniteIgnoredTestSuite.java @@ -0,0 +1,50 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.testsuites; + +import junit.framework.TestSuite; +import org.apache.ignite.internal.websession.WebSessionReplicatedSelfTest; +import org.apache.ignite.internal.websession.WebSessionReplicatedV1SelfTest; +import org.apache.ignite.internal.websession.WebSessionSelfTest; +import org.apache.ignite.internal.websession.WebSessionTransactionalSelfTest; +import org.apache.ignite.internal.websession.WebSessionTransactionalV1SelfTest; +import org.apache.ignite.internal.websession.WebSessionV1SelfTest; +import org.apache.ignite.testframework.IgniteTestSuite; + +/** + * Special test suite with ignored tests. + */ +public class IgniteIgnoredTestSuite extends TestSuite { + /** + * @return IgniteCache test suite. + * @throws Exception Thrown in case of the failure. + */ + public static TestSuite suite() throws Exception { + IgniteTestSuite suite = new IgniteTestSuite(null, "Ignite Ignored Test Suite", true); + + /** --- WEB SESSIONS --- */ + suite.addTestSuite(WebSessionSelfTest.class); + suite.addTestSuite(WebSessionTransactionalSelfTest.class); + suite.addTestSuite(WebSessionReplicatedSelfTest.class); + suite.addTestSuite(WebSessionV1SelfTest.class); + suite.addTestSuite(WebSessionTransactionalV1SelfTest.class); + suite.addTestSuite(WebSessionReplicatedV1SelfTest.class); + + return suite; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/df2f8a87/modules/ignored-tests/src/test/java/org/apache/ignite/testsuites/package-info.java ---------------------------------------------------------------------- diff --git a/modules/ignored-tests/src/test/java/org/apache/ignite/testsuites/package-info.java b/modules/ignored-tests/src/test/java/org/apache/ignite/testsuites/package-info.java new file mode 100644 index 0000000..cb71478 --- /dev/null +++ b/modules/ignored-tests/src/test/java/org/apache/ignite/testsuites/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * <!-- Package description. --> + * Contains internal tests or test related classes and interfaces. + */ +package org.apache.ignite.testsuites; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/df2f8a87/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 1d15127..e1d5c3b 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 @@ -19,6 +19,7 @@ package org.apache.ignite.internal.websession; import junit.framework.TestSuite; import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.IgniteTestSuite; import static org.apache.ignite.IgniteSystemProperties.IGNITE_OVERRIDE_MCAST_GRP; @@ -32,7 +33,7 @@ public class IgniteWebSessionSelfTestSuite extends TestSuite { * @throws Exception Thrown in case of the failure. */ public static TestSuite suite() throws Exception { - TestSuite suite = new TestSuite("Ignite Web Sessions Test Suite"); + TestSuite suite = new IgniteTestSuite("Ignite Web Sessions Test Suite"); suite.addTestSuite(WebSessionSelfTest.class); suite.addTestSuite(WebSessionTransactionalSelfTest.class); @@ -48,69 +49,4 @@ public class IgniteWebSessionSelfTestSuite extends TestSuite { return suite; } - - /** - * Tests web sessions with TRANSACTIONAL cache. - */ - public static class WebSessionTransactionalSelfTest extends WebSessionSelfTest { - /** {@inheritDoc} */ - @Override protected String getCacheName() { - return "partitioned_tx"; - } - - /** {@inheritDoc} */ - @Override public void testRestarts() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-810";); - } - - /** {@inheritDoc} */ - @Override public void testInvalidatedSession() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-810";); - } - - /** {@inheritDoc} */ - @Override public void testClientReconnectRequest() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-810";); - } - } - - /** - * Tests web sessions with REPLICATED cache. - */ - public static class WebSessionReplicatedSelfTest extends WebSessionSelfTest { - /** {@inheritDoc} */ - @Override protected String getCacheName() { - return "replicated"; - } - } - - /** - * Old version test. - */ - public static class WebSessionV1SelfTest extends WebSessionSelfTest { - /** {@inheritDoc} */ - @Override protected boolean keepBinary() { - return false; - } - } - - /** - * Tests web sessions with TRANSACTIONAL cache in compatibility mode. - */ - public static class WebSessionTransactionalV1SelfTest extends WebSessionTransactionalSelfTest { - /** {@inheritDoc} */ - @Override protected boolean keepBinary() { - return false; - } - } - - /** - * Tests web sessions with REPLICATED cache in compatibility mode. - */ - public static class WebSessionReplicatedV1SelfTest extends WebSessionReplicatedSelfTest { - /** {@inheritDoc} */ - @Override protected boolean keepBinary() { - return false; - } - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/df2f8a87/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionReplicatedSelfTest.java b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionReplicatedSelfTest.java new file mode 100644 index 0000000..638fdcc --- /dev/null +++ b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionReplicatedSelfTest.java @@ -0,0 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.websession; + +/** + * Tests web sessions with REPLICATED cache. + */ +public class WebSessionReplicatedSelfTest extends WebSessionSelfTest { + /** {@inheritDoc} */ + @Override protected String getCacheName() { + return "replicated"; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/df2f8a87/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionReplicatedV1SelfTest.java ---------------------------------------------------------------------- diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionReplicatedV1SelfTest.java b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionReplicatedV1SelfTest.java new file mode 100644 index 0000000..ba69d13 --- /dev/null +++ b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionReplicatedV1SelfTest.java @@ -0,0 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.websession; + +/** + * Tests web sessions with REPLICATED cache in compatibility mode. + */ +public class WebSessionReplicatedV1SelfTest extends WebSessionReplicatedSelfTest { + /** {@inheritDoc} */ + @Override protected boolean keepBinary() { + return false; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/df2f8a87/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java index 0ab1130..5138e3a 100644 --- a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java +++ b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java @@ -46,6 +46,7 @@ import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.apache.ignite.testsuites.IgniteIgnore; import org.eclipse.jetty.security.HashLoginService; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletHolder; @@ -88,6 +89,7 @@ public class WebSessionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @IgniteIgnore("https://issues.apache.org/jira/browse/IGNITE-3663";) public void testSessionRenewalDuringLogin() throws Exception { testSessionRenewalDuringLogin("/modules/core/src/test/config/websession/example-cache.xml"); } http://git-wip-us.apache.org/repos/asf/ignite/blob/df2f8a87/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionTransactionalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionTransactionalSelfTest.java b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionTransactionalSelfTest.java new file mode 100644 index 0000000..7a9179b --- /dev/null +++ b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionTransactionalSelfTest.java @@ -0,0 +1,48 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.websession; + +import org.apache.ignite.testsuites.IgniteIgnore; + +/** + * Tests web sessions with TRANSACTIONAL cache. + */ +public class WebSessionTransactionalSelfTest extends WebSessionSelfTest { + /** {@inheritDoc} */ + @Override protected String getCacheName() { + return "partitioned_tx"; + } + + /** {@inheritDoc} */ + @IgniteIgnore("https://issues.apache.org/jira/browse/IGNITE-810";) + @Override public void testRestarts() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-810";); + } + + /** {@inheritDoc} */ + @IgniteIgnore("https://issues.apache.org/jira/browse/IGNITE-810";) + @Override public void testInvalidatedSession() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-810";); + } + + /** {@inheritDoc} */ + @IgniteIgnore("https://issues.apache.org/jira/browse/IGNITE-810";) + @Override public void testClientReconnectRequest() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-810";); + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/df2f8a87/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionTransactionalV1SelfTest.java ---------------------------------------------------------------------- diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionTransactionalV1SelfTest.java b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionTransactionalV1SelfTest.java new file mode 100644 index 0000000..6f94471 --- /dev/null +++ b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionTransactionalV1SelfTest.java @@ -0,0 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.websession; + +/** + * Tests web sessions with TRANSACTIONAL cache in compatibility mode. + */ +public class WebSessionTransactionalV1SelfTest extends WebSessionTransactionalSelfTest { + /** {@inheritDoc} */ + @Override protected boolean keepBinary() { + return false; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/df2f8a87/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionV1SelfTest.java ---------------------------------------------------------------------- diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionV1SelfTest.java b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionV1SelfTest.java new file mode 100644 index 0000000..791bec0 --- /dev/null +++ b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionV1SelfTest.java @@ -0,0 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.websession; + +/** + * Tests the correctness of web sessions caching functionality in compatibility mode. + */ +public class WebSessionV1SelfTest extends WebSessionSelfTest { + /** {@inheritDoc} */ + @Override protected boolean keepBinary() { + return false; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/df2f8a87/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8f8e041..1638460 100644 --- a/pom.xml +++ b/pom.xml @@ -88,6 +88,7 @@ <module>modules/web/ignite-websphere-test</module> <module>modules/cassandra</module> <module>modules/flink</module> + <module>modules/ignored-tests</module> </modules> <profiles>
