svn commit: r1464802 - in /lucene/dev/trunk/solr/core/src: test-files/solr/collection1/conf/schema12.xml test/org/apache/solr/search/TestPseudoReturnFields.java

[ho...@apache.org]

Author: hossman
Date: Fri Apr  5 00:55:34 2013
New Revision: 1464802

URL: http://svn.apache.org/r1464802
Log:
SOLR-4128: test proving this works now (apperas to have been fixed in SOLR-4036)

Modified:
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema12.xml
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema12.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema12.xml?rev=1464802&r1=1464801&r2=1464802&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema12.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema12.xml Fri Apr  5 00:55:34 2013
@@ -596,6 +596,11 @@
    <dynamicField name="bar_copydest_*" type="ignored" multiValued="true"/>
    <dynamicField name="*_es"  type="text"    indexed="true"  stored="true"/>
 
+   <!-- for testing if score psuedofield is erroneously treated as multivalued
+        when a matching dynamic field exists 
+   -->
+   <dynamicField name="*core" type="ignored" multiValued="true" />
+
  </fields>
 
  <defaultSearchField>text</defaultSearchField>

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java?rev=1464802&r1=1464801&r2=1464802&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java Fri Apr  5 00:55:34 2013
@@ -18,6 +18,7 @@
 package org.apache.solr.search;
 
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.schema.SchemaField;
 
 import org.apache.commons.lang.StringUtils;
 
@@ -66,6 +67,20 @@ public class TestPseudoReturnFields exte
     // a multi valued field (the field value is copied first, then
     // if the type lookup is done again later, we get the wrong thing). SOLR-4036
 
+    // score as psuedo field - precondition checks
+    for (String name : new String[] {"score", "val_ss"}) {
+      SchemaField sf = h.getCore().getSchema().getFieldOrNull(name);
+      assertNotNull("Test depends on a (dynamic) field mtching '"+name+
+                    "', schema was changed out from under us!",sf);
+      assertTrue("Test depends on a multivalued dynamic field matching '"+name+
+                 "', schema was changed out from under us!", sf.multiValued());
+    }
+
+    // score as psuedo field
+    assertJQ(req("q","*:*", "fq", "id:42", "fl","id,score")
+             ,"/response/docs==[{'id':'42','score':1.0}]");
+    
+    // single value int using alias that matches multivalued dynamic field
     assertJQ(req("q","id:42", "fl","val_ss:val_i, val2_ss:10")
         ,"/response/docs==[{'val2_ss':10,'val_ss':1}]"
     );