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 2017/06/07 19:41:17 UTC
lucene-solr:branch_6x: SOLR-10174: fix @Ignore in
TestMultipleAdditiveTreesModel
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 792a87991 -> 972cdef6d
SOLR-10174: fix @Ignore in TestMultipleAdditiveTreesModel
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/972cdef6
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/972cdef6
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/972cdef6
Branch: refs/heads/branch_6x
Commit: 972cdef6d9d75fdcb3f66f60901530edbf4ebad0
Parents: 792a879
Author: Christine Poerschke <cp...@apache.org>
Authored: Wed Jun 7 19:38:17 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Wed Jun 7 20:33:40 2017 +0100
----------------------------------------------------------------------
.../ltr/model/TestMultipleAdditiveTreesModel.java | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/972cdef6/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 3c817d2..edc0e24 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
@@ -22,7 +22,6 @@ import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.ltr.TestRerankBase;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
public class TestMultipleAdditiveTreesModel extends TestRerankBase {
@@ -47,10 +46,16 @@ public class TestMultipleAdditiveTreesModel extends TestRerankBase {
@Test
- public void testMultipleAdditiveTreesScoringWithAndWithoutEfiFeatureMatches() throws Exception {
+ public void testMultipleAdditiveTrees() throws Exception {
loadFeatures("multipleadditivetreesmodel_features.json");
loadModels("multipleadditivetreesmodel.json");
+ doTestMultipleAdditiveTreesScoringWithAndWithoutEfiFeatureMatches();
+ doTestMultipleAdditiveTreesExplain();
+ }
+
+ private void doTestMultipleAdditiveTreesScoringWithAndWithoutEfiFeatureMatches() throws Exception {
+
final SolrQuery query = new SolrQuery();
query.setQuery("*:*");
query.add("rows", "3");
@@ -79,9 +84,8 @@ public class TestMultipleAdditiveTreesModel extends TestRerankBase {
assertJQ("/query" + query.toQueryString(), "/response/docs/[2]/score==-120.0");
}
- @Ignore
- @Test
- public void multipleAdditiveTreesTestExplain() throws Exception {
+ private void doTestMultipleAdditiveTreesExplain() throws Exception {
+
final SolrQuery query = new SolrQuery();
query.setQuery("*:*");
query.add("fl", "*,score,[fv]");
@@ -103,7 +107,7 @@ public class TestMultipleAdditiveTreesModel extends TestRerankBase {
qryResult = qryResult.substring(qryResult.indexOf("explain"));
assertThat(qryResult, containsString("multipleadditivetreesmodel"));
- assertThat(qryResult, containsString(MultipleAdditiveTreesModel.class.getCanonicalName()));
+ assertThat(qryResult, containsString(MultipleAdditiveTreesModel.class.getSimpleName()));
assertThat(qryResult, containsString("-100.0 = tree 0"));
assertThat(qryResult, containsString("50.0 = tree 0"));
@@ -113,7 +117,6 @@ public class TestMultipleAdditiveTreesModel extends TestRerankBase {
assertThat(qryResult, containsString(" Go Right "));
assertThat(qryResult, containsString(" Go Left "));
- assertThat(qryResult, containsString("'this_feature_doesnt_exist' does not exist in FV"));
}
@Test