Browse Source
Certain cryptographic algorithms are only supported on JDK8+. This causes failures in JDK 7. This commit adds a JUnit assumption on tests that leverage JDK8 specific cryptographic algorithms. Issue: gh-5323pull/5366/head
3 changed files with 160 additions and 0 deletions
@ -0,0 +1,36 @@
@@ -0,0 +1,36 @@
|
||||
/* |
||||
* |
||||
* * Copyright 2002-2018 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.security.crypto.junit; |
||||
|
||||
import org.junit.Assume; |
||||
|
||||
/** |
||||
* @author Rob Winch |
||||
* @since 4.2.7 |
||||
*/ |
||||
public final class Assumptions { |
||||
|
||||
public static void assumeMinimumJdk8() { |
||||
int majorVersion = JdkVersion.getMajorJavaVersion(); |
||||
Assume.assumeTrue(majorVersion >= 8); |
||||
} |
||||
|
||||
private Assumptions() {} |
||||
} |
||||
@ -0,0 +1,121 @@
@@ -0,0 +1,121 @@
|
||||
/* |
||||
* |
||||
* * Copyright 2002-2018 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.security.crypto.junit; |
||||
|
||||
/** |
||||
* Internal helper class used to find the Java/JVM version that Spring is |
||||
* operating on, to allow for automatically adapting to the present platform's |
||||
* capabilities. |
||||
* |
||||
* <p>Note that Spring requires JVM 1.6 or higher, as of Spring 4.0. |
||||
* |
||||
* @author Rod Johnson |
||||
* @author Juergen Hoeller |
||||
* @author Rick Evans |
||||
* @author Sam Brannen |
||||
* @deprecated as of Spring 4.2.1, in favor of direct checks for the desired |
||||
* JDK API variants via reflection |
||||
*/ |
||||
public abstract class JdkVersion { |
||||
|
||||
/** |
||||
* Constant identifying the 1.3.x JVM (JDK 1.3). |
||||
*/ |
||||
public static final int JAVA_13 = 0; |
||||
|
||||
/** |
||||
* Constant identifying the 1.4.x JVM (J2SE 1.4). |
||||
*/ |
||||
public static final int JAVA_14 = 1; |
||||
|
||||
/** |
||||
* Constant identifying the 1.5 JVM (Java 5). |
||||
*/ |
||||
public static final int JAVA_15 = 2; |
||||
|
||||
/** |
||||
* Constant identifying the 1.6 JVM (Java 6). |
||||
*/ |
||||
public static final int JAVA_16 = 3; |
||||
|
||||
/** |
||||
* Constant identifying the 1.7 JVM (Java 7). |
||||
*/ |
||||
public static final int JAVA_17 = 4; |
||||
|
||||
/** |
||||
* Constant identifying the 1.8 JVM (Java 8). |
||||
*/ |
||||
public static final int JAVA_18 = 5; |
||||
|
||||
/** |
||||
* Constant identifying the 1.9 JVM (Java 9). |
||||
*/ |
||||
public static final int JAVA_19 = 6; |
||||
|
||||
|
||||
private static final String javaVersion; |
||||
|
||||
private static final int majorJavaVersion; |
||||
|
||||
static { |
||||
javaVersion = System.getProperty("java.version"); |
||||
// version String should look like "1.4.2_10"
|
||||
if (javaVersion.contains("1.9.")) { |
||||
majorJavaVersion = JAVA_19; |
||||
} |
||||
else if (javaVersion.contains("1.8.")) { |
||||
majorJavaVersion = JAVA_18; |
||||
} |
||||
else if (javaVersion.contains("1.7.")) { |
||||
majorJavaVersion = JAVA_17; |
||||
} |
||||
else { |
||||
// else leave 1.6 as default (it's either 1.6 or unknown)
|
||||
majorJavaVersion = JAVA_16; |
||||
} |
||||
} |
||||
|
||||
|
||||
/** |
||||
* Return the full Java version string, as returned by |
||||
* {@code System.getProperty("java.version")}. |
||||
* @return the full Java version string |
||||
* @see System#getProperty(String) |
||||
*/ |
||||
public static String getJavaVersion() { |
||||
return javaVersion; |
||||
} |
||||
|
||||
/** |
||||
* Get the major version code. This means we can do things like |
||||
* {@code if (getMajorJavaVersion() >= JAVA_17)}. |
||||
* @return a code comparable to the {@code JAVA_XX} codes in this class
|
||||
* @see #JAVA_16 |
||||
* @see #JAVA_17 |
||||
* @see #JAVA_18 |
||||
* @see #JAVA_19 |
||||
*/ |
||||
public static int getMajorJavaVersion() { |
||||
return majorJavaVersion; |
||||
} |
||||
|
||||
} |
||||
|
||||
Loading…
Reference in new issue