You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2016/12/23 12:58:08 UTC
lucene-solr:master: SOLR-8542: reduce direct solrconfig-ltr.xml
references in solr/contrib/ltr tests
Repository: lucene-solr
Updated Branches:
refs/heads/master f7ea2ae85 -> ac3f1bb33
SOLR-8542: reduce direct solrconfig-ltr.xml references in solr/contrib/ltr tests
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ac3f1bb3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ac3f1bb3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ac3f1bb3
Branch: refs/heads/master
Commit: ac3f1bb339df530d6d4484f26c9ab2da17bd28df
Parents: f7ea2ae
Author: Christine Poerschke <cp...@apache.org>
Authored: Wed Dec 21 17:18:39 2016 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Dec 23 12:57:15 2016 +0000
----------------------------------------------------------------------
.../test/org/apache/solr/ltr/TestLTRQParserExplain.java | 2 +-
.../test/org/apache/solr/ltr/TestLTRQParserPlugin.java | 5 +----
.../src/test/org/apache/solr/ltr/TestLTRWithFacet.java | 2 +-
.../ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.java | 2 +-
.../ltr/src/test/org/apache/solr/ltr/TestRerankBase.java | 10 ++++------
.../org/apache/solr/ltr/TestSelectiveWeightCreation.java | 2 +-
.../apache/solr/ltr/feature/TestEdisMaxSolrFeature.java | 2 +-
.../org/apache/solr/ltr/feature/TestExternalFeatures.java | 2 +-
.../solr/ltr/feature/TestExternalValueFeatures.java | 2 +-
.../org/apache/solr/ltr/feature/TestFeatureLogging.java | 2 +-
.../solr/ltr/feature/TestFeatureLtrScoringModel.java | 2 +-
.../org/apache/solr/ltr/feature/TestFeatureStore.java | 2 +-
.../apache/solr/ltr/feature/TestFieldLengthFeature.java | 2 +-
.../apache/solr/ltr/feature/TestFieldValueFeature.java | 2 +-
.../apache/solr/ltr/feature/TestFilterSolrFeature.java | 2 +-
.../apache/solr/ltr/feature/TestNoMatchSolrFeature.java | 2 +-
.../apache/solr/ltr/feature/TestOriginalScoreFeature.java | 2 +-
.../org/apache/solr/ltr/feature/TestRankingFeature.java | 2 +-
.../apache/solr/ltr/feature/TestUserTermScoreWithQ.java | 2 +-
.../apache/solr/ltr/feature/TestUserTermScorerQuery.java | 2 +-
.../apache/solr/ltr/feature/TestUserTermScorereQDF.java | 2 +-
.../org/apache/solr/ltr/feature/TestValueFeature.java | 2 +-
.../test/org/apache/solr/ltr/model/TestLinearModel.java | 2 +-
.../solr/ltr/model/TestMultipleAdditiveTreesModel.java | 2 +-
.../org/apache/solr/ltr/store/rest/TestModelManager.java | 2 +-
.../solr/ltr/store/rest/TestModelManagerPersistence.java | 2 +-
26 files changed, 29 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserExplain.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserExplain.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserExplain.java
index 2f90df8..3d7d3e5 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserExplain.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserExplain.java
@@ -26,7 +26,7 @@ public class TestLTRQParserExplain extends TestRerankBase {
@BeforeClass
public static void setup() throws Exception {
- setuptest();
+ setuptest(true);
loadFeatures("features-store-test-model.json");
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.java
index b2b0a8d..d4457a0 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.java
@@ -26,9 +26,7 @@ public class TestLTRQParserPlugin extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema.xml");
- // store = getModelStore();
- bulkIndex();
+ setuptest(true);
loadFeatures("features-linear.json");
loadModels("linear-model.json");
@@ -37,7 +35,6 @@ public class TestLTRQParserPlugin extends TestRerankBase {
@AfterClass
public static void after() throws Exception {
aftertest();
- // store.clear();
}
@Test
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.java
index ab519ec..4026bbb 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.java
@@ -28,7 +28,7 @@ public class TestLTRWithFacet extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema.xml");
+ setuptest(false);
assertU(adoc("id", "1", "title", "a1", "description", "E", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.java
index 1fbe1d5..d120af1 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.java
@@ -28,7 +28,7 @@ public class TestLTRWithSort extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema.xml");
+ setuptest(false);
assertU(adoc("id", "1", "title", "a1", "description", "E", "popularity",
"1"));
assertU(adoc("id", "2", "title", "a1 b1", "description",
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
index 4914d28..792975a 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
@@ -75,14 +75,14 @@ public class TestRerankBase extends RestTestBase {
protected static File fstorefile = null;
protected static File mstorefile = null;
- public static void setuptest() throws Exception {
+ protected static void setuptest(boolean bulkIndex) throws Exception {
setuptest("solrconfig-ltr.xml", "schema.xml");
- bulkIndex();
+ if (bulkIndex) bulkIndex();
}
- public static void setupPersistenttest() throws Exception {
+ protected static void setupPersistenttest(boolean bulkIndex) throws Exception {
setupPersistentTest("solrconfig-ltr.xml", "schema.xml");
- bulkIndex();
+ if (bulkIndex) bulkIndex();
}
public static ManagedFeatureStore getManagedFeatureStore() {
@@ -178,8 +178,6 @@ public class TestRerankBase extends RestTestBase {
FileUtils.deleteDirectory(tmpSolrHome);
System.clearProperty("managed.schema.mutable");
// System.clearProperty("enable.update.log");
-
-
}
public static void makeRestTestHarnessNull() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java
index b9b3d63..e44d4ac 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java
@@ -104,7 +104,7 @@ public class TestSelectiveWeightCreation extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema.xml");
+ setuptest(false);
assertU(adoc("id", "1", "title", "w1 w3", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.java
index cd63b5c..96a1d28 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.java
@@ -27,7 +27,7 @@ public class TestEdisMaxSolrFeature extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema.xml");
+ setuptest(false);
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalFeatures.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalFeatures.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalFeatures.java
index 15b7633..e27844b 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalFeatures.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalFeatures.java
@@ -27,7 +27,7 @@ public class TestExternalFeatures extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema.xml");
+ setuptest(false);
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalValueFeatures.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalValueFeatures.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalValueFeatures.java
index fc0ade2..8a09bb3 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalValueFeatures.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalValueFeatures.java
@@ -27,7 +27,7 @@ public class TestExternalValueFeatures extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema.xml");
+ setuptest(false);
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLogging.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLogging.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLogging.java
index f18c6bf..ad431f5 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLogging.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLogging.java
@@ -29,7 +29,7 @@ public class TestFeatureLogging extends TestRerankBase {
@BeforeClass
public static void setup() throws Exception {
- setuptest();
+ setuptest(true);
}
@AfterClass
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLtrScoringModel.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLtrScoringModel.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLtrScoringModel.java
index 5fcebad..a50e75e 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLtrScoringModel.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLtrScoringModel.java
@@ -29,7 +29,7 @@ public class TestFeatureLtrScoringModel extends TestRerankBase {
@BeforeClass
public static void setup() throws Exception {
- setuptest();
+ setuptest(true);
store = getManagedFeatureStore();
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureStore.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureStore.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureStore.java
index 0ed0cda..ca58b7b 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureStore.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureStore.java
@@ -32,7 +32,7 @@ public class TestFeatureStore extends TestRerankBase {
@BeforeClass
public static void setup() throws Exception {
- setuptest();
+ setuptest(true);
fstore = getManagedFeatureStore();
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.java
index 4a0d449..2e1a14d 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.java
@@ -27,7 +27,7 @@ public class TestFieldLengthFeature extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema.xml");
+ setuptest(false);
assertU(adoc("id", "1", "title", "w1", "description", "w1"));
assertU(adoc("id", "2", "title", "w2 2asd asdd didid", "description",
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
index 8295403..e4a132a 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
@@ -30,7 +30,7 @@ public class TestFieldValueFeature extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema.xml");
+ setuptest(false);
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1","isTrendy","true"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.java
index a6a80bd..23b7a55 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.java
@@ -28,7 +28,7 @@ import org.junit.Test;
public class TestFilterSolrFeature extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema.xml");
+ setuptest(false);
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java
index 004e314..e6c287d3 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java
@@ -33,7 +33,7 @@ public class TestNoMatchSolrFeature extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema.xml");
+ setuptest(false);
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java
index 48662e6..d651224 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java
@@ -32,7 +32,7 @@ public class TestOriginalScoreFeature extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema.xml");
+ setuptest(false);
assertU(adoc("id", "1", "title", "w1"));
assertU(adoc("id", "2", "title", "w2"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.java
index 437e10d..31add41 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.java
@@ -28,7 +28,7 @@ public class TestRankingFeature extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema.xml");
+ setuptest(false);
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.java
index 754409a..b5c8e32 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.java
@@ -27,7 +27,7 @@ public class TestUserTermScoreWithQ extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema.xml");
+ setuptest(false);
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.java
index c79207c..c0f92d2 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.java
@@ -27,7 +27,7 @@ public class TestUserTermScorerQuery extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema.xml");
+ setuptest(false);
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.java
index f47a883..6b22cdf 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.java
@@ -27,7 +27,7 @@ public class TestUserTermScorereQDF extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema.xml");
+ setuptest(false);
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.java
index 084da4a..de0c923 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.java
@@ -27,7 +27,7 @@ public class TestValueFeature extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema.xml");
+ setuptest(false);
assertU(adoc("id", "1", "title", "w1"));
assertU(adoc("id", "2", "title", "w2"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestLinearModel.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestLinearModel.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestLinearModel.java
index e8ee224..067bd27 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestLinearModel.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestLinearModel.java
@@ -50,7 +50,7 @@ public class TestLinearModel extends TestRerankBase {
@BeforeClass
public static void setup() throws Exception {
- setuptest();
+ setuptest(true);
// loadFeatures("features-store-test-model.json");
store = getManagedModelStore();
fstore = getManagedFeatureStore().getFeatureStore("test");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java
index 5604370..1824eb4 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java
@@ -30,7 +30,7 @@ public class TestMultipleAdditiveTreesModel extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema.xml");
+ setuptest(false);
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity","1"));
assertU(adoc("id", "2", "title", "w2", "description", "w2", "popularity","2"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManager.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManager.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManager.java
index 8d11a90..5b43c60 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManager.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManager.java
@@ -34,7 +34,7 @@ public class TestModelManager extends TestRerankBase {
@BeforeClass
public static void init() throws Exception {
- setuptest();
+ setuptest(true);
}
@Before
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac3f1bb3/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.java
index 66c26fd..f707e55 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.java
@@ -31,7 +31,7 @@ public class TestModelManagerPersistence extends TestRerankBase {
@Before
public void init() throws Exception {
- setupPersistenttest();
+ setupPersistenttest(true);
}
// executed first