Browse Source

Removed needless TestRiver used in RiverTests

DummyRiver can be used instead, no need for TestRiver
Luca Cavanna 11 years ago
parent
commit
c27c93c5bc

+ 3 - 3
src/test/java/org/elasticsearch/river/RiverTests.java

@@ -22,6 +22,7 @@ package org.elasticsearch.river;
 import com.google.common.base.Predicate;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.index.IndexResponse;
+import org.elasticsearch.river.dummy.DummyRiverModule;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.junit.Test;
 
@@ -35,10 +36,10 @@ public class RiverTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void testRiverStart() throws Exception {
-        final String riverName = "test_river";
+        final String riverName = "dummy-river-test";
         logger.info("-->  creating river [{}]", riverName);
         IndexResponse indexResponse = client().prepareIndex(RiverIndexName.Conf.DEFAULT_INDEX_NAME, riverName, "_meta")
-                .setSource("type", TestRiverModule.class.getCanonicalName()).get();
+                .setSource("type", DummyRiverModule.class.getCanonicalName()).get();
         assertTrue(indexResponse.isCreated());
 
         logger.info("-->  checking that river [{}] was created", riverName);
@@ -48,6 +49,5 @@ public class RiverTests extends ElasticsearchIntegrationTest {
                 return response.isExists();
             }
         }, 5, TimeUnit.SECONDS), equalTo(true));
-
     }
 }

+ 0 - 53
src/test/java/org/elasticsearch/river/TestRiver.java

@@ -1,53 +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.river;
-
-import org.elasticsearch.client.Client;
-import org.elasticsearch.common.inject.Inject;
-
-/**
- *
- */
-public class TestRiver extends AbstractRiverComponent implements River {
-
-    private final String riverIndexName;
-    private final Client client;
-
-    @Inject
-    public TestRiver(RiverName riverName, @RiverIndexName String riverIndexName, RiverSettings settings, Client client) {
-        super(riverName, settings);
-        logger.info("create");
-        this.client = client;
-        this.riverIndexName = riverIndexName;
-    }
-
-    @Override
-    public void start() {
-        logger.info("start");
-        if (!client.prepareIndex(riverIndexName, riverName.getName(), "_status").setSource("created", true).get().isCreated()) {
-            logger.warn("_status record wasn't created");
-        }
-    }
-
-    @Override
-    public void close() {
-        logger.info("close");
-    }
-}

+ 0 - 29
src/test/java/org/elasticsearch/river/TestRiverModule.java

@@ -1,29 +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.river;
-
-import org.elasticsearch.common.inject.AbstractModule;
-
-public class TestRiverModule extends AbstractModule {
-    @Override
-    protected void configure() {
-        bind(River.class).to(TestRiver.class).asEagerSingleton();
-    }
-}