Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-5514: Remove outdated constants 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1576729 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2014-03-12 13:17:47 +00:00
parent 4aea56f421
commit 38c37e70fc
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lucene/core/src/java/org/apache/lucene/util/Constants.java
View File

@ -53,11 +53,6 @@ public final class Constants {
public static final String OS_VERSION = System.getProperty("os.version"); public static final String OS_VERSION = System.getProperty("os.version");
public static final String JAVA_VENDOR = System.getProperty("java.vendor"); public static final String JAVA_VENDOR = System.getProperty("java.vendor");
/** @deprecated With Lucene 5.0, we are always on Java 7 */
@Deprecated
public static final boolean JRE_IS_MINIMUM_JAVA7 =
new Boolean(true).booleanValue(); // prevent inlining in foreign class files
public static final boolean JRE_IS_MINIMUM_JAVA8; public static final boolean JRE_IS_MINIMUM_JAVA8;
/** True iff running on a 64bit JVM */ /** True iff running on a 64bit JVM */

16
lucene/core/src/test/org/apache/lucene/util/TestIOUtils.java
View File

@ -59,12 +59,10 @@ public class TestIOUtils extends LuceneTestCase {
System.out.println("TestIOUtils.testSuppressedExceptions: Thrown Exception stack trace:"); System.out.println("TestIOUtils.testSuppressedExceptions: Thrown Exception stack trace:");
System.out.println(trace); System.out.println(trace);
} }
if (Constants.JRE_IS_MINIMUM_JAVA7) { assertTrue("Stack trace does not contain first suppressed Exception: " + trace,
assertTrue("Stack trace does not contain first suppressed Exception: " + trace, trace.contains("java.io.IOException: TEST-IO-EXCEPTION-1"));
trace.contains("java.io.IOException: TEST-IO-EXCEPTION-1")); assertTrue("Stack trace does not contain second suppressed Exception: " + trace,
assertTrue("Stack trace does not contain second suppressed Exception: " + trace, trace.contains("java.io.IOException: TEST-IO-EXCEPTION-2"));
trace.contains("java.io.IOException: TEST-IO-EXCEPTION-2"));
}
} catch (IOException e2) { } catch (IOException e2) {
fail("IOException should not be thrown here"); fail("IOException should not be thrown here");
} }
@ -85,10 +83,8 @@ public class TestIOUtils extends LuceneTestCase {
System.out.println("TestIOUtils.testSuppressedExceptions: Thrown Exception stack trace:"); System.out.println("TestIOUtils.testSuppressedExceptions: Thrown Exception stack trace:");
System.out.println(trace); System.out.println(trace);
} }
if (Constants.JRE_IS_MINIMUM_JAVA7) { assertTrue("Stack trace does not contain suppressed Exception: " + trace,
assertTrue("Stack trace does not contain suppressed Exception: " + trace, trace.contains("java.io.IOException: TEST-IO-EXCEPTION-2"));
trace.contains("java.io.IOException: TEST-IO-EXCEPTION-2"));
}
} }
} }