You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/07/04 01:23:57 UTC
[37/53] [abbrv] lucene-solr:feature/autoscaling: SOLR-6671: Fix tests
on Windows
SOLR-6671: Fix tests on Windows
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8000b25c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8000b25c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8000b25c
Branch: refs/heads/feature/autoscaling
Commit: 8000b25cabef69bc31e64dee2c3ef619b77f84f7
Parents: 5b48480
Author: Jan Høydahl <ja...@apache.org>
Authored: Sun Jul 2 01:36:09 2017 +0200
Committer: Jan Høydahl <ja...@apache.org>
Committed: Sun Jul 2 01:36:09 2017 +0200
----------------------------------------------------------------------
.../apache/solr/core/DirectoryFactoryTest.java | 21 +++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8000b25c/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java b/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java
index 35198b7..35bb09b 100755
--- a/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java
@@ -20,16 +20,19 @@ import java.io.IOException;
import java.nio.file.Paths;
import java.util.Properties;
+import org.apache.commons.exec.OS;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.handler.admin.CoreAdminHandler;
import org.apache.solr.handler.component.HttpShardHandlerFactory;
+import org.apache.solr.util.MockCoreContainer;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
public class DirectoryFactoryTest extends LuceneTestCase {
+ private static boolean IS_WINDOWS = (OS.isFamilyDOS() || OS.isFamilyWin9x() || OS.isFamilyWindows());
public void testLockTypesUnchanged() throws Exception {
assertEquals("simple", DirectoryFactory.LOCK_TYPE_SIMPLE);
assertEquals("native", DirectoryFactory.LOCK_TYPE_NATIVE);
@@ -55,20 +58,28 @@ public class DirectoryFactoryTest extends LuceneTestCase {
rdf.init(new NamedList());
// No solr.data.home property set. Absolute instanceDir
- assertEquals("/tmp/inst1/data", rdf.getDataHome(new CoreDescriptor("core_name", Paths.get("/tmp/inst1"), cp, zkAware)));
+ assertDataHome("/tmp/inst1/data", "/tmp/inst1", rdf, cc);
// Simulate solr.data.home set in solrconfig.xml <directoryFactory> tag
NamedList args = new NamedList();
args.add("solr.data.home", "/solrdata/");
rdf.init(args);
- assertEquals("/solrdata/inst_dir/data", rdf.getDataHome(new CoreDescriptor("core_name", Paths.get("inst_dir"), cp, zkAware)));
-
+ assertDataHome("/solrdata/inst_dir/data", "inst_dir", rdf, cc);
+
// solr.data.home set with System property, and relative path
System.setProperty("solr.data.home", "solrdata");
rdf.init(new NamedList());
- assertEquals("/solr/home/solrdata/inst_dir/data", rdf.getDataHome(new CoreDescriptor("core_name", Paths.get("inst_dir"), cp, zkAware)));
+ assertDataHome("/solr/home/solrdata/inst_dir/data", "inst_dir", rdf, cc);
// Test parsing last component of instanceDir, and using custom dataDir
- assertEquals("/solr/home/solrdata/myinst/mydata", rdf.getDataHome(new CoreDescriptor("core_name", Paths.get("/path/to/myinst"), cp, zkAware, "dataDir", "mydata")));
+ assertDataHome("/solr/home/solrdata/myinst/mydata", "/path/to/myinst", rdf, cc, "dataDir", "mydata");
+ }
+
+ private void assertDataHome(String expected, String instanceDir, RAMDirectoryFactory rdf, MockCoreContainer cc, String... properties) throws IOException {
+ String dataHome = rdf.getDataHome(new CoreDescriptor("core_name", Paths.get(instanceDir), cc.containerProperties, cc.isZooKeeperAware(), properties));
+ if (IS_WINDOWS) {
+ dataHome = dataHome.replaceFirst("^C:", "").replaceAll("\\\\","/");
+ }
+ assertEquals(expected, dataHome);
}