lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r1582559 - in /lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core: ResourceLoaderTest.java TestCoreContainer.java
Date Fri, 28 Mar 2014 00:13:07 GMT
Author: uschindler
Date: Fri Mar 28 00:13:06 2014
New Revision: 1582559

URL: http://svn.apache.org/r1582559
Log:
LUCENE-5514: Remove one more Java 6 hack

Modified:
    lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
    lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java

Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java?rev=1582559&r1=1582558&r2=1582559&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
(original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
Fri Mar 28 00:13:06 2014
@@ -19,7 +19,6 @@ package org.apache.solr.core;
 
 import junit.framework.Assert;
 
-import org.apache.lucene.util.Constants;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.core.KeywordTokenizerFactory;
 import org.apache.lucene.analysis.ngram.NGramFilterFactory;
@@ -171,7 +170,6 @@ public class ResourceLoaderTest extends 
   }
 
   public void testClassLoaderLibs() throws Exception {
-    assumeTrue("needs URLClassLoader.close() support", Constants.WINDOWS == false || Constants.JRE_IS_MINIMUM_JAVA7);
     File tmpRoot = TestUtil.getTempDir("testClassLoaderLibs");
 
     File lib = new File(tmpRoot, "lib");

Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java?rev=1582559&r1=1582558&r2=1582559&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
(original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
Fri Mar 28 00:13:06 2014
@@ -40,7 +40,6 @@ import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
 
-import org.apache.lucene.util.Constants;
 
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
@@ -240,7 +239,7 @@ public class TestCoreContainer extends S
 
   @Test
   public void testSharedLib() throws Exception {
-    assumeTrue("needs URLClassLoader.close() support", Constants.WINDOWS == false || Constants.JRE_IS_MINIMUM_JAVA7);
+
     File tmpRoot = TestUtil.getTempDir("testSharedLib");
 
     File lib = new File(tmpRoot, "lib");



Mime
View raw message