From 454de6a8f21a5dceb6bca2fd8201a247c8af6a9d Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Mon, 30 May 2016 21:27:38 -0700 Subject: [PATCH] Tests: Remove unnecessary evil jarhell tests We have 3 evil tests for jarhell. They have been failing in java 9 because of how evil they are. The first checks the leniency we add for jarhell in the jdk itself. This is unecessary, since if the leniency wasn't there, we would already be failing all jarhell checks. The second is checking the compile version is compatible with the jdk. This is simpler since we don't need to fake the java version: we know 1.7 should be compatibile with both java 8 and 9, so we can use that as a constant. Finally the last test checks if the java version system property is broken. This is simply something we should not check, we have to trust that java specifies it correctly, and again, if it was broken, all jarhell checks would be broken. --- .../elasticsearch/bootstrap/JarHellTests.java | 11 ++ .../bootstrap/EvilJarHellTests.java | 100 ------------------ 2 files changed, 11 insertions(+), 100 deletions(-) delete mode 100644 qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/EvilJarHellTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java b/core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java index 984b9846b15..bb3ef29176e 100644 --- a/core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java +++ b/core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java @@ -182,6 +182,17 @@ public class JarHellTests extends ESTestCase { } } + public void testRequiredJDKVersionIsOK() throws Exception { + Path dir = createTempDir(); + Manifest manifest = new Manifest(); + Attributes attributes = manifest.getMainAttributes(); + attributes.put(Attributes.Name.MANIFEST_VERSION, "1.0.0"); + attributes.put(new Attributes.Name("X-Compile-Target-JDK"), "1.7"); + URL[] jars = {makeJar(dir, "foo.jar", manifest, "Foo.class")}; + + JarHell.checkJarHell(jars); + } + /** make sure if a plugin is compiled against the same ES version, it works */ public void testGoodESVersionInJar() throws Exception { Path dir = createTempDir(); diff --git a/qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/EvilJarHellTests.java b/qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/EvilJarHellTests.java deleted file mode 100644 index 25bf3ac48f9..00000000000 --- a/qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/EvilJarHellTests.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch 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.elasticsearch.bootstrap; - -import org.elasticsearch.common.SuppressForbidden; -import org.elasticsearch.test.ESTestCase; - -import java.io.IOException; -import java.net.URL; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.util.jar.Attributes; -import java.util.jar.JarOutputStream; -import java.util.jar.Manifest; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -/** Tests for Jarhell that change very important system properties... very evil! */ -@SuppressForbidden(reason = "modifies system properties intentionally") -public class EvilJarHellTests extends ESTestCase { - - URL makeJar(Path dir, String name, Manifest manifest, String... files) throws IOException { - Path jarpath = dir.resolve(name); - ZipOutputStream out; - if (manifest == null) { - out = new JarOutputStream(Files.newOutputStream(jarpath, StandardOpenOption.CREATE)); - } else { - out = new JarOutputStream(Files.newOutputStream(jarpath, StandardOpenOption.CREATE), manifest); - } - for (String file : files) { - out.putNextEntry(new ZipEntry(file)); - } - out.close(); - return jarpath.toUri().toURL(); - } - - public void testBootclasspathLeniency() throws Exception { - Path dir = createTempDir(); - String previousJavaHome = System.getProperty("java.home"); - System.setProperty("java.home", dir.toString()); - URL[] jars = {makeJar(dir, "foo.jar", null, "DuplicateClass.class"), makeJar(dir, "bar.jar", null, "DuplicateClass.class")}; - try { - JarHell.checkJarHell(jars); - } finally { - System.setProperty("java.home", previousJavaHome); - } - } - - public void testRequiredJDKVersionIsOK() throws Exception { - Path dir = createTempDir(); - String previousJavaVersion = System.getProperty("java.specification.version"); - System.setProperty("java.specification.version", "1.7"); - - Manifest manifest = new Manifest(); - Attributes attributes = manifest.getMainAttributes(); - attributes.put(Attributes.Name.MANIFEST_VERSION, "1.0.0"); - attributes.put(new Attributes.Name("X-Compile-Target-JDK"), "1.7"); - URL[] jars = {makeJar(dir, "foo.jar", manifest, "Foo.class")}; - try { - JarHell.checkJarHell(jars); - } finally { - System.setProperty("java.specification.version", previousJavaVersion); - } - } - - public void testBadJDKVersionProperty() throws Exception { - Path dir = createTempDir(); - String previousJavaVersion = System.getProperty("java.specification.version"); - System.setProperty("java.specification.version", "bogus"); - - Manifest manifest = new Manifest(); - Attributes attributes = manifest.getMainAttributes(); - attributes.put(Attributes.Name.MANIFEST_VERSION, "1.0.0"); - attributes.put(new Attributes.Name("X-Compile-Target-JDK"), "1.7"); - URL[] jars = {makeJar(dir, "foo.jar", manifest, "Foo.class")}; - try { - JarHell.checkJarHell(jars); - } finally { - System.setProperty("java.specification.version", previousJavaVersion); - } - } -}