svn commit: r1366110 - in /lucene/dev/trunk: lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestMultiWordSynonyms.java solr/core/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java

[rm...@apache.org]

Author: rmuir
Date: Thu Jul 26 17:55:23 2012
New Revision: 1366110

URL: http://svn.apache.org/viewvc?rev=1366110&view=rev
Log:
move test to same place as 4.x branch for easier backporting

Added:
    lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestMultiWordSynonyms.java
      - copied, changed from r1366103, lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java
Removed:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java

Copied: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestMultiWordSynonyms.java (from r1366103, lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestMultiWordSynonyms.java?p2=lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestMultiWordSynonyms.java&p1=lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java&r1=1366103&r2=1366110&rev=1366110&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestMultiWordSynonyms.java Thu Jul 26 17:55:23 2012
@@ -1,3 +1,5 @@
+package org.apache.lucene.analysis.synonym;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -15,20 +17,15 @@
  * limitations under the License.
  */
 
-package org.apache.solr.analysis;
-
 import org.apache.lucene.analysis.BaseTokenStreamTestCase;
 import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.synonym.SynonymFilterFactory;
-import org.apache.lucene.analysis.util.ResourceLoader;
+import org.apache.lucene.analysis.util.StringMockResourceLoader;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.StringReader;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -42,25 +39,9 @@ public class TestMultiWordSynonyms exten
     args.put("synonyms", "synonyms.txt");
     factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
     factory.init(args);
-    factory.inform(new StringMockSolrResourceLoader("a b c,d"));
+    factory.inform(new StringMockResourceLoader("a b c,d"));
     TokenStream ts = factory.create(new MockTokenizer(new StringReader("a e"), MockTokenizer.WHITESPACE, false));
     // This fails because ["e","e"] is the value of the token stream
     assertTokenStreamContents(ts, new String[] { "a", "e" });
   }
-  
-  private class StringMockSolrResourceLoader implements ResourceLoader {
-    String text;
-
-    StringMockSolrResourceLoader(String text) {
-      this.text = text;
-    }
-
-    public <T> T newInstance(String cname, Class<T> expectedType, String... subpackages) {
-      return null;
-    }
-
-    public InputStream openResource(String resource) throws IOException {
-      return new ByteArrayInputStream(text.getBytes("UTF-8"));
-    }
-  }
 }