Просмотр исходного кода

[kuromoji] move integration tests to REST tests

We can keep only unit tests in plugins instead of starting each time a local node and running tests against it.
David Pilato 10 лет назад
Родитель
Сommit
7843c63aa3

+ 15 - 0
plugins/analysis-kuromoji/rest-api-spec/test/analysis_kuromoji/10_basic.yaml

@@ -1,5 +1,20 @@
 # Integration tests for Kuromoji analysis components
 #
+---
+"Analyzer":
+    - do:
+        indices.analyze:
+          text:         JR新宿駅の近くにビールを飲みに行こうか
+          analyzer:     kuromoji
+    - length: { tokens: 7 }
+    - match:  { tokens.0.token: jr }
+    - match:  { tokens.1.token: 新宿 }
+    - match:  { tokens.2.token: 駅 }
+    - match:  { tokens.3.token: 近く }
+    - match:  { tokens.4.token: ビール }
+    - match:  { tokens.5.token: 飲む }
+    - match:  { tokens.6.token: 行く }
+---
 "Tokenizer":
     - do:
         indices.analyze:

+ 35 - 0
plugins/analysis-kuromoji/rest-api-spec/test/analysis_kuromoji/20_search.yaml

@@ -0,0 +1,35 @@
+# Integration tests for Kuromoji analysis components
+#
+---
+"Index kuromoji content":
+  - do:
+      indices.create:
+        index: test
+        body:
+          mappings:
+            type:
+              properties:
+                text:
+                  type:     string
+                  analyzer: kuromoji
+  - do:
+       cluster.health:
+         wait_for_status: yellow
+
+  - do:
+      index:
+        index:  test
+        type:   type
+        id:     1
+        body:   { "text": "JR新宿駅の近くにビールを飲みに行こうか" }
+  - do:
+      indices.refresh: {}
+
+  - do:
+      search:
+        index: test
+        body:
+          query:
+            match:
+              text: jr
+  - match: { hits.total: 1 }

+ 0 - 90
plugins/analysis-kuromoji/src/test/java/org/elasticsearch/index/analysis/KuromojiIntegrationTests.java

@@ -1,90 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch 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.
- */
-package org.elasticsearch.index.analysis;
-
-import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.plugins.PluginsService;
-import org.elasticsearch.test.ElasticsearchIntegrationTest;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE)
-public class KuromojiIntegrationTests extends ElasticsearchIntegrationTest {
-
-    @Override
-    protected Settings nodeSettings(int nodeOrdinal) {
-        return Settings.builder()
-                .put(super.nodeSettings(nodeOrdinal))
-                .put("plugins." + PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, true)
-                .build();
-    }
-
-    @Test
-    public void testKuromojiAnalyzer() throws ExecutionException, InterruptedException {
-        AnalyzeResponse response = client().admin().indices()
-                .prepareAnalyze("JR新宿駅の近くにビールを飲みに行こうか").setAnalyzer("kuromoji")
-                .execute().get();
-
-        String[] expectedTokens = {"jr", "新宿", "駅", "近く", "ビール", "飲む", "行く"};
-
-        assertThat(response, notNullValue());
-        assertThat(response.getTokens().size(), is(7));
-
-        for (int i = 0; i < expectedTokens.length; i++) {
-            assertThat(response.getTokens().get(i).getTerm(), is(expectedTokens[i]));
-        }
-    }
-
-    @Test
-    public void testKuromojiAnalyzerInMapping() throws ExecutionException, InterruptedException, IOException {
-        createIndex("test");
-        ensureGreen("test");
-        final XContentBuilder mapping = jsonBuilder().startObject()
-                .startObject("type")
-                .startObject("properties")
-                .startObject("foo")
-                .field("type", "string")
-                .field("analyzer", "kuromoji")
-                .endObject()
-                .endObject()
-                .endObject()
-                .endObject();
-
-        client().admin().indices().preparePutMapping("test").setType("type").setSource(mapping).get();
-
-        index("test", "type", "1", "foo", "JR新宿駅の近くにビールを飲みに行こうか");
-        refresh();
-
-        SearchResponse response = client().prepareSearch("test").setQuery(
-                QueryBuilders.matchQuery("foo", "jr")
-        ).execute().actionGet();
-
-        assertThat(response.getHits().getTotalHits(), is(1L));
-    }
-}

+ 0 - 0
plugins/analysis-kuromoji/src/test/java/org/elasticsearch/index/analysis/empty_user_dict.txt → plugins/analysis-kuromoji/src/test/resources/org/elasticsearch/index/analysis/empty_user_dict.txt


+ 0 - 0
plugins/analysis-kuromoji/src/test/java/org/elasticsearch/index/analysis/kuromoji_analysis.json → plugins/analysis-kuromoji/src/test/resources/org/elasticsearch/index/analysis/kuromoji_analysis.json


+ 0 - 0
plugins/analysis-kuromoji/src/test/java/org/elasticsearch/index/analysis/user_dict.txt → plugins/analysis-kuromoji/src/test/resources/org/elasticsearch/index/analysis/user_dict.txt


+ 2 - 0
plugins/pom.xml

@@ -277,7 +277,9 @@
                     <include>api/cluster.health.json</include>
                     <!-- used in plugin REST tests -->
                     <include>api/index.json</include>
+                    <include>api/search.json</include>
                     <include>api/indices.analyze.json</include>
+                    <include>api/indices.create.json</include>
                     <include>api/indices.refresh.json</include>
                     <include>api/count.json</include>
                 </includes>