You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/07/03 09:37:36 UTC
[56/59] [abbrv] lucene-solr:jira/solr-10878: SOLR-6671: More generic
fix to assert Solr's dataHome
SOLR-6671: More generic fix to assert Solr's dataHome
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/20dcb56d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/20dcb56d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/20dcb56d
Branch: refs/heads/jira/solr-10878
Commit: 20dcb56da85accabd8e32b41afaca71707797ade
Parents: eaf1d45
Author: Uwe Schindler <us...@apache.org>
Authored: Mon Jul 3 08:15:54 2017 +0200
Committer: Uwe Schindler <us...@apache.org>
Committed: Mon Jul 3 08:15:54 2017 +0200
----------------------------------------------------------------------
.../src/test/org/apache/solr/core/DirectoryFactoryTest.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/20dcb56d/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 2c2ddd9..aa00342 100755
--- a/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.nio.file.Paths;
import java.util.Properties;
-import org.apache.lucene.util.Constants;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.handler.admin.CoreAdminHandler;
@@ -74,11 +73,7 @@ public class DirectoryFactoryTest extends LuceneTestCase {
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 (Constants.WINDOWS) {
- // TODO: find a less-hacky way to assert this!
- dataHome = dataHome.replaceFirst("^[A-Z]:", "").replace("\\", "/");
- }
- assertEquals(expected, dataHome);
+ assertEquals(Paths.get(expected).toAbsolutePath(), Paths.get(dataHome).toAbsolutePath());
}