Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 13D51200CEC for ; Mon, 31 Jul 2017 13:59:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1269D16519C; Mon, 31 Jul 2017 11:59:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id ED5E61651A1 for ; Mon, 31 Jul 2017 13:59:09 +0200 (CEST) Received: (qmail 30756 invoked by uid 500); 31 Jul 2017 11:59:09 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 30568 invoked by uid 99); 31 Jul 2017 11:59:09 -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; Mon, 31 Jul 2017 11:59:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B103FF32C8; Mon, 31 Jul 2017 11:59:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chesnay@apache.org To: commits@flink.apache.org Date: Mon, 31 Jul 2017 11:59:15 -0000 Message-Id: In-Reply-To: <891a54118414493b80dab5c3dd4fc106@git.apache.org> References: <891a54118414493b80dab5c3dd4fc106@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/12] flink git commit: [FLINK-7253] [tests] Remove CommonTestUtils#assumeJava8 archived-at: Mon, 31 Jul 2017 11:59:11 -0000 [FLINK-7253] [tests] Remove CommonTestUtils#assumeJava8 This closes #4400. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/a4a4e0b9 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/a4a4e0b9 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/a4a4e0b9 Branch: refs/heads/master Commit: a4a4e0b9e5eff3d578fde7e2fca3e84661d84b40 Parents: 82c8e18 Author: zentol Authored: Mon Jul 24 13:24:30 2017 +0200 Committer: zentol Committed: Mon Jul 31 12:12:09 2017 +0200 ---------------------------------------------------------------------- .../cassandra/CassandraConnectorITCase.java | 3 -- .../runtime/util/BlockingShutdownTest.java | 3 -- .../runtime/util/JvmExitOnFatalErrorTest.java | 3 -- .../flink/core/testutils/CommonTestUtils.java | 30 -------------------- 4 files changed, 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/a4a4e0b9/flink-connectors/flink-connector-cassandra/src/test/java/org/apache/flink/streaming/connectors/cassandra/CassandraConnectorITCase.java ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-cassandra/src/test/java/org/apache/flink/streaming/connectors/cassandra/CassandraConnectorITCase.java b/flink-connectors/flink-connector-cassandra/src/test/java/org/apache/flink/streaming/connectors/cassandra/CassandraConnectorITCase.java index fe538a8..bc5d1a8 100644 --- a/flink-connectors/flink-connector-cassandra/src/test/java/org/apache/flink/streaming/connectors/cassandra/CassandraConnectorITCase.java +++ b/flink-connectors/flink-connector-cassandra/src/test/java/org/apache/flink/streaming/connectors/cassandra/CassandraConnectorITCase.java @@ -131,9 +131,6 @@ public class CassandraConnectorITCase extends WriteAheadSinkTestBase= 1.8 - org.apache.flink.core.testutils.CommonTestUtils.assumeJava8(); - // generate temporary files tmpDir = CommonTestUtils.createTempDirectory(); ClassLoader classLoader = CassandraConnectorITCase.class.getClassLoader(); http://git-wip-us.apache.org/repos/asf/flink/blob/a4a4e0b9/flink-runtime/src/test/java/org/apache/flink/runtime/util/BlockingShutdownTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/util/BlockingShutdownTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/util/BlockingShutdownTest.java index f22f42f..1fdb4f2 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/util/BlockingShutdownTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/util/BlockingShutdownTest.java @@ -46,9 +46,6 @@ public class BlockingShutdownTest { // this test works only on linux assumeTrue(OperatingSystem.isLinux()); - // this test leaves remaining processes if not executed with Java 8 - CommonTestUtils.assumeJava8(); - final File markerFile = new File( EnvironmentInformation.getTemporaryFileDirectory(), UUID.randomUUID() + ".marker"); http://git-wip-us.apache.org/repos/asf/flink/blob/a4a4e0b9/flink-runtime/src/test/java/org/apache/flink/runtime/util/JvmExitOnFatalErrorTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/util/JvmExitOnFatalErrorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/util/JvmExitOnFatalErrorTest.java index c78a3d5..8031b22 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/util/JvmExitOnFatalErrorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/util/JvmExitOnFatalErrorTest.java @@ -83,9 +83,6 @@ public class JvmExitOnFatalErrorTest { // this test works only on linux assumeTrue(OperatingSystem.isLinux()); - // this test leaves remaining processes if not executed with Java 8 - CommonTestUtils.assumeJava8(); - // to check what went wrong (when the test hangs) uncomment this line // ProcessEntryPoint.main(new String[0]); http://git-wip-us.apache.org/repos/asf/flink/blob/a4a4e0b9/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/core/testutils/CommonTestUtils.java ---------------------------------------------------------------------- diff --git a/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/core/testutils/CommonTestUtils.java b/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/core/testutils/CommonTestUtils.java index f0abf40..ecaed1a 100644 --- a/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/core/testutils/CommonTestUtils.java +++ b/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/core/testutils/CommonTestUtils.java @@ -18,9 +18,6 @@ package org.apache.flink.core.testutils; -import org.junit.Assume; -import org.junit.internal.AssumptionViolatedException; - import java.io.BufferedWriter; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -37,8 +34,6 @@ import java.security.ProtectionDomain; import java.security.cert.Certificate; import java.util.Map; -import static org.junit.Assert.fail; - /** * This class contains reusable utility methods for unit tests. */ @@ -119,31 +114,6 @@ public class CommonTestUtils { } // ------------------------------------------------------------------------ - // Preconditions on the test environment - // ------------------------------------------------------------------------ - - /** - * Checks whether this code runs in a Java 8 (Java 1.8) JVM. If not, this throws a - * {@link AssumptionViolatedException}, which causes JUnit to skip the test that - * called this method. - */ - public static void assumeJava8() { - try { - String javaVersionString = System.getProperty("java.runtime.version").substring(0, 3); - float javaVersion = Float.parseFloat(javaVersionString); - Assume.assumeTrue(javaVersion >= 1.8f); - } - catch (AssumptionViolatedException e) { - System.out.println("Skipping CassandraConnectorITCase, because the JDK is < Java 8+"); - throw e; - } - catch (Exception e) { - e.printStackTrace(); - fail("Cannot determine Java version: " + e.getMessage()); - } - } - - // ------------------------------------------------------------------------ // Manipulation of environment // ------------------------------------------------------------------------