You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/10/22 15:41:27 UTC
svn commit: r1710016 - in
/lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene:
bkdtree/TestBKDTree.java util/BaseGeoPointTestCase.java
Author: mikemccand
Date: Thu Oct 22 13:41:27 2015
New Revision: 1710016
URL: http://svn.apache.org/viewvc?rev=1710016&view=rev
Log:
disable virus checker for geo tests
Modified:
lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/bkdtree/TestBKDTree.java
lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/util/BaseGeoPointTestCase.java
Modified: lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/bkdtree/TestBKDTree.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/bkdtree/TestBKDTree.java?rev=1710016&r1=1710015&r2=1710016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/bkdtree/TestBKDTree.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/bkdtree/TestBKDTree.java Thu Oct 22 13:41:27 2015
@@ -198,14 +198,7 @@ public class TestBKDTree extends BaseGeo
return new BKDTreeDocValuesFormat(maxPointsInLeaf, maxPointsSortInHeap);
}
- private static Directory noVirusChecker(Directory dir) {
- if (dir instanceof MockDirectoryWrapper) {
- ((MockDirectoryWrapper) dir).setEnableVirusScanner(false);
- }
- return dir;
- }
-
- private static Directory getDirectory() {
+ private Directory getDirectory() {
return noVirusChecker(newDirectory());
}
}
Modified: lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/util/BaseGeoPointTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/util/BaseGeoPointTestCase.java?rev=1710016&r1=1710015&r2=1710016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/util/BaseGeoPointTestCase.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/util/BaseGeoPointTestCase.java Thu Oct 22 13:41:27 2015
@@ -45,6 +45,7 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SimpleCollector;
import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.MockDirectoryWrapper;
import org.junit.BeforeClass;
// TODO: cutover TestGeoUtils too?
@@ -562,6 +563,7 @@ public abstract class BaseGeoPointTestCa
} else {
dir = newDirectory();
}
+ noVirusChecker(dir);
Set<Integer> deleted = new HashSet<>();
// RandomIndexWriter is too slow here:
@@ -755,5 +757,12 @@ public abstract class BaseGeoPointTestCa
}
IOUtils.close(r, dir);
}
+
+ protected Directory noVirusChecker(Directory dir) {
+ if (dir instanceof MockDirectoryWrapper) {
+ ((MockDirectoryWrapper) dir).setEnableVirusScanner(false);
+ }
+ return dir;
+ }
}