diff --git a/spring-core/src/test/java/org/springframework/tests/JavaVersion.java b/spring-core/src/test/java/org/springframework/tests/JavaVersion.java deleted file mode 100644 index ac4e78adea..0000000000 --- a/spring-core/src/test/java/org/springframework/tests/JavaVersion.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright 2002-2015 the original author or authors. - * - * Licensed 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.springframework.tests; - -/** - * Enumeration of known JDK versions. - * - * @author Phillip Webb - * @see #runningVersion() - */ -public enum JavaVersion { - - /** - * Java 1.6 - */ - JAVA_16("1.6", 16), - - /** - * Java 1.7 - */ - JAVA_17("1.7", 17), - - /** - * Java 1.8 - */ - JAVA_18("1.8", 18), - - /** - * Java 1.9 - */ - JAVA_19("1.9", 19); - - - private static final JavaVersion runningVersion = findRunningVersion(); - - private static JavaVersion findRunningVersion() { - String version = System.getProperty("java.version"); - for (JavaVersion candidate : values()) { - if (version.startsWith(candidate.version)) { - return candidate; - } - } - return JavaVersion.JAVA_16; - } - - - private String version; - - private int value; - - - private JavaVersion(String version, int value) { - this.version = version; - this.value = value; - } - - - @Override - public String toString() { - return version; - } - - /** - * Determines if the specified version is the same as or greater than this version. - * @param version the version to check - * @return {@code true} if the specified version is at least this version - */ - public boolean isAtLeast(JavaVersion version) { - return (this.value >= version.value); - } - - /** - * Returns the current running JDK version. If the current version cannot be - * determined {@link #JAVA_16} will be returned. - * @return the JDK version - */ - public static JavaVersion runningVersion() { - return runningVersion; - } - -} diff --git a/spring-core/src/test/java/org/springframework/tests/TestGroup.java b/spring-core/src/test/java/org/springframework/tests/TestGroup.java index f7b8525bc6..9a10ce1209 100644 --- a/spring-core/src/test/java/org/springframework/tests/TestGroup.java +++ b/spring-core/src/test/java/org/springframework/tests/TestGroup.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,14 +58,7 @@ public enum TestGroup { /** * Tests that should only be run on the continuous integration server. */ - CI, - - /** - * Tests that require custom compilation beyond that of the standard JDK. This helps to - * allow running tests that will otherwise fail when using JDK > 1.8 b88. See - * SPR-10558 - */ - CUSTOM_COMPILATION; + CI; /** diff --git a/spring-core/src/test/java/org/springframework/tests/TestGroupTests.java b/spring-core/src/test/java/org/springframework/tests/TestGroupTests.java index f756bb3176..291fba3abf 100644 --- a/spring-core/src/test/java/org/springframework/tests/TestGroupTests.java +++ b/spring-core/src/test/java/org/springframework/tests/TestGroupTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,6 +38,7 @@ public class TestGroupTests { @Rule public ExpectedException thrown = ExpectedException.none(); + @Test public void parseNull() throws Exception { assertThat(TestGroup.parse(null), equalTo(Collections. emptySet())); @@ -65,7 +66,7 @@ public class TestGroupTests { thrown.expect(IllegalArgumentException.class); thrown.expectMessage("Unable to find test group 'missing' when parsing " + "testGroups value: 'performance, missing'. Available groups include: " + - "[LONG_RUNNING,PERFORMANCE,JMXMP,CI,CUSTOM_COMPILATION]"); + "[LONG_RUNNING,PERFORMANCE,JMXMP,CI]"); TestGroup.parse("performance, missing"); } @@ -77,9 +78,8 @@ public class TestGroupTests { @Test public void parseAllExcept() throws Exception { Set expected = new HashSet(EnumSet.allOf(TestGroup.class)); - expected.remove(TestGroup.CUSTOM_COMPILATION); expected.remove(TestGroup.PERFORMANCE); - assertThat(TestGroup.parse("all-custom_compilation,performance"), equalTo(expected)); + assertThat(TestGroup.parse("all-performance"), equalTo(expected)); } } diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java index 3102f11fde..e9a26ecc1e 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,13 +20,9 @@ import java.io.StringWriter; import javax.xml.transform.stream.StreamResult; import org.custommonkey.xmlunit.XMLUnit; - -import org.junit.BeforeClass; import org.junit.Test; import org.springframework.oxm.AbstractMarshallerTests; -import org.springframework.tests.Assume; -import org.springframework.tests.TestGroup; import static org.custommonkey.xmlunit.XMLAssert.*; import static org.junit.Assert.assertFalse; @@ -41,11 +37,6 @@ import static org.junit.Assert.assertTrue; */ public class JibxMarshallerTests extends AbstractMarshallerTests { - @BeforeClass - public static void compilerAssumptions() { - Assume.group(TestGroup.CUSTOM_COMPILATION); - } - @Override protected JibxMarshaller createMarshaller() throws Exception { JibxMarshaller marshaller = new JibxMarshaller(); @@ -63,6 +54,7 @@ public class JibxMarshallerTests extends AbstractMarshallerTests return flights; } + @Test(expected = IllegalArgumentException.class) public void afterPropertiesSetNoContextPath() throws Exception { JibxMarshaller marshaller = new JibxMarshaller(); diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java index c6e8c553d0..1363f80998 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,12 +19,11 @@ package org.springframework.oxm.jibx; import java.io.ByteArrayInputStream; import javax.xml.transform.stream.StreamSource; +import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.oxm.AbstractUnmarshallerTests; -import org.springframework.tests.Assume; -import org.springframework.tests.TestGroup; import static org.junit.Assert.*; @@ -41,11 +40,6 @@ public class JibxUnmarshallerTests extends AbstractUnmarshallerTests" + "Air Libert\u00e942"; - @BeforeClass - public static void compilerAssumptions() { - Assume.group(TestGroup.CUSTOM_COMPILATION); - } - @Override protected JibxMarshaller createUnmarshaller() throws Exception { @@ -70,6 +64,7 @@ public class JibxUnmarshallerTests extends AbstractUnmarshallerTests - + - +