Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1A99118D30 for ; Fri, 27 Nov 2015 08:03:04 +0000 (UTC) Received: (qmail 52384 invoked by uid 500); 27 Nov 2015 08:03:03 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 52263 invoked by uid 500); 27 Nov 2015 08:03:03 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 52012 invoked by uid 99); 27 Nov 2015 08:03:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Nov 2015 08:03:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EE5F7E17F8; Fri, 27 Nov 2015 08:03:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Fri, 27 Nov 2015 08:03:11 -0000 Message-Id: <7bf8f069e83941ea910481c7d7118a8c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/18] ignite git commit: Ssl suite Ssl suite Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a0e414eb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a0e414eb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a0e414eb Branch: refs/heads/ignite-1956 Commit: a0e414eb1695e2c43d6f4f782ba4bee64682789c Parents: ec81696 Author: Anton Vinogradov Authored: Thu Nov 26 19:01:14 2015 +0300 Committer: Anton Vinogradov Committed: Thu Nov 26 19:01:14 2015 +0300 ---------------------------------------------------------------------- .../IgniteCacheFailoverTestSuite3.java | 6 --- .../IgniteCacheFailoverTestSuiteSsl.java | 41 ++++++++++++++++++++ 2 files changed, 41 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a0e414eb/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java index 1f94f9e..4b04c05 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java @@ -21,8 +21,6 @@ import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryTransactionalSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest; -import org.apache.ignite.internal.util.IgniteUtils; -import org.apache.ignite.spi.communication.tcp.IgniteCacheSslStartStopSelfTest; /** * Test suite. @@ -39,10 +37,6 @@ public class IgniteCacheFailoverTestSuite3 extends TestSuite { suite.addTestSuite(IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.class); suite.addTestSuite(IgniteCachePutRetryTransactionalSelfTest.class); - // Disable SSL test with old JDK because of https://bugs.openjdk.java.net/browse/JDK-8013809. - if (!IgniteUtils.isHotSpot() || IgniteUtils.isJavaVersionAtLeast("1.7.0_65")) - suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class); - return suite; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/a0e414eb/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuiteSsl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuiteSsl.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuiteSsl.java new file mode 100644 index 0000000..99a1463 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuiteSsl.java @@ -0,0 +1,41 @@ +/* + * 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.util.IgniteUtils; +import org.apache.ignite.spi.communication.tcp.IgniteCacheSslStartStopSelfTest; + +/** + * Test suite. + */ +public class IgniteCacheFailoverTestSuiteSsl extends TestSuite { + /** + * @return Ignite Cache Failover test suite. + * @throws Exception Thrown in case of the failure. + */ + public static TestSuite suite() throws Exception { + TestSuite suite = new TestSuite("Cache Failover Test Suite SSL"); + + // Disable SSL test with old JDK because of https://bugs.openjdk.java.net/browse/JDK-8013809. + if (!IgniteUtils.isHotSpot() || IgniteUtils.isJavaVersionAtLeast("1.7.0_65")) + suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class); + + return suite; + } +}