You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/01/01 14:31:02 UTC
svn commit: r1427399 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
core/src/test/org/apache/solr/schema/SynonymTokenizerTest.java
Author: rmuir
Date: Tue Jan 1 13:31:02 2013
New Revision: 1427399
URL: http://svn.apache.org/viewvc?rev=1427399&view=rev
Log:
SOLR-4251: commit test
Added:
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml (with props)
lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/SynonymTokenizerTest.java (with props)
Modified:
lucene/dev/trunk/solr/CHANGES.txt
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1427399&r1=1427398&r2=1427399&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Jan 1 13:31:02 2013
@@ -423,6 +423,9 @@ Bug Fixes
* SOLR-4238: Fix jetty example requestLog config (jm via hossman)
+* SOLR-4251: Fix SynonymFilterFactory when an optional tokenizerFactory is supplied.
+ (Chris Bleakley via rmuir)
+
Other Changes
----------------------
Added: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml?rev=1427399&view=auto
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml (added)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml Tue Jan 1 13:31:02 2013
@@ -0,0 +1,43 @@
+<!--
+ 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.
+ -->
+
+<!-- Test schema file for SynonymFilterFactory argument "tokenizerFactory" -->
+
+<schema name="synonym-test" version="1.0">
+ <types>
+ <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+
+ <fieldType name="text_synonyms" class="solr.TextField" positionIncrementGap="100">
+ <analyzer type="index">
+ <tokenizer class="solr.StandardTokenizerFactory"/>
+ <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="false" tokenizerFactory="solr.StandardTokenizerFactory"/>
+ </analyzer>
+ <analyzer type="query">
+ <tokenizer class="solr.StandardTokenizerFactory"/>
+ </analyzer>
+ </fieldType>
+
+ </types>
+
+ <fields>
+ <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="text" type="text_synonyms" indexed="true" stored="false"/>
+ </fields>
+
+ <defaultSearchField>text</defaultSearchField>
+ <uniqueKey>id</uniqueKey>
+</schema>
\ No newline at end of file
Added: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/SynonymTokenizerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/SynonymTokenizerTest.java?rev=1427399&view=auto
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/SynonymTokenizerTest.java (added)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/SynonymTokenizerTest.java Tue Jan 1 13:31:02 2013
@@ -0,0 +1,44 @@
+package org.apache.solr.schema;
+
+/*
+ * 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.
+ */
+
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.core.SolrCore;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * This is a simple test to make sure the schema loads when
+ * provided a tokenizerFactory that requires a match version
+ *
+ */
+
+public class SynonymTokenizerTest extends SolrTestCaseJ4 {
+
+ @BeforeClass
+ public static void beforeTests() throws Exception {
+ initCore("solrconfig-basic.xml", "schema-synonym-tokenizer.xml");
+ }
+
+ @Test
+ public void testSchemaLoading() {
+ SolrCore core = h.getCore();
+ IndexSchema schema = core.getSchema();
+ assertTrue( schema.getFieldTypes().containsKey("text_synonyms") );
+ }
+}