[4/4] lucene-solr:branch_6x: SOLR-8181: Remove flaky and redundant TestArbitraryIndexDir

[ro...@apache.org]

SOLR-8181: Remove flaky and redundant TestArbitraryIndexDir


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b4a22a72
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b4a22a72
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b4a22a72

Branch: refs/heads/branch_6x
Commit: b4a22a72c31c9c9fadb60a7e45b2ef3ed4e09e05
Parents: 5b0bf4a
Author: Alan Woodward <ro...@apache.org>
Authored: Wed Sep 7 09:19:09 2016 +0100
Committer: Alan Woodward <ro...@apache.org>
Committed: Wed Sep 7 09:19:21 2016 +0100

----------------------------------------------------------------------
 .../apache/solr/core/TestArbitraryIndexDir.java | 113 -------------------
 1 file changed, 113 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b4a22a72/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java b/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
deleted file mode 100644
index a975849..0000000
--- a/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.core;
-
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.nio.charset.StandardCharsets;
-import java.util.Properties;
-
-import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.IOUtils;
-import org.apache.solr.common.SolrException;
-import org.apache.solr.handler.IndexFetcher;
-import org.apache.solr.util.AbstractSolrTestCase;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.xml.sax.SAXException;
-
-/**
- *
- */
-public class TestArbitraryIndexDir extends AbstractSolrTestCase {
-
-  @Rule
-  public TestRule testRules = new SystemPropertiesRestoreRule();
-
-  // TODO: fix this test to not require FSDirectory
-
-  @BeforeClass
-  public static void beforeClass() {
-    // this test wants to start solr, and then open a separate indexwriter of its own on the same dir.
-    System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_
-    System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockFSDirectoryFactory");
-  }
-
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-    initCore("solrconfig.xml", "schema12.xml");
-  }
-
-  @Test
-  public void testLoadNewIndexDir() throws IOException, ParserConfigurationException, SAXException {
-    //add a doc in original index dir
-    assertU(adoc("id", String.valueOf(1),
-        "name", "name"+String.valueOf(1)));
-    //create a new index dir and index.properties file
-    File idxprops = new File(h.getCore().getDataDir() + IndexFetcher.INDEX_PROPERTIES);
-    Properties p = new Properties();
-    File newDir = new File(h.getCore().getDataDir() + "index_temp");
-    newDir.mkdirs();
-    p.put("index", newDir.getName());
-    Writer os = null;
-    try {
-      os = new OutputStreamWriter(new FileOutputStream(idxprops), StandardCharsets.UTF_8);
-      p.store(os, "index properties");
-    } catch (Exception e) {
-      throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
-          "Unable to write " + IndexFetcher.INDEX_PROPERTIES, e);
-    } finally {
-      IOUtils.closeWhileHandlingException(os);
-    }
-
-    //add a doc in the new index dir
-    Directory dir = newFSDirectory(newDir.toPath());
-    IndexWriter iw = new IndexWriter(
-        dir,
-        new IndexWriterConfig(new StandardAnalyzer())
-    );
-    Document doc = new Document();
-    doc.add(new TextField("id", "2", Field.Store.YES));
-    doc.add(new TextField("name", "name2", Field.Store.YES));
-    iw.addDocument(doc);
-    iw.commit();
-    iw.close();
-
-    //commit will cause searcher to open with the new index dir
-    assertU(commit());h.getCoreContainer().reload(h.getCore().getName());
-    //new index dir contains just 1 doc.
-    assertQ("return doc with id 2",
-        req("id:2"),
-        "*[count(//doc)=1]"
-    );
-    dir.close();
-  }
-}