Repository: karaf-decanter Updated Branches: refs/heads/master 009aef25d -> 245171a6a
Make test more robust Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/245171a6 Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/245171a6 Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/245171a6 Branch: refs/heads/master Commit: 245171a6ab25b819cab28beaa3445fc4d473c33e Parents: 009aef2 Author: Christian Schneider <[email protected]> Authored: Tue Feb 16 18:16:27 2016 +0100 Committer: Christian Schneider <[email protected]> Committed: Tue Feb 16 18:16:27 2016 +0100 ---------------------------------------------------------------------- .../TestElasticsearchAppender.java | 24 ++++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/245171a6/appender/elasticsearch-native-1.x/src/test/java/org/apache/karaf/decanter/appender/elasticsearch/TestElasticsearchAppender.java ---------------------------------------------------------------------- diff --git a/appender/elasticsearch-native-1.x/src/test/java/org/apache/karaf/decanter/appender/elasticsearch/TestElasticsearchAppender.java b/appender/elasticsearch-native-1.x/src/test/java/org/apache/karaf/decanter/appender/elasticsearch/TestElasticsearchAppender.java index 5c8b8f2..5fd157c 100644 --- a/appender/elasticsearch-native-1.x/src/test/java/org/apache/karaf/decanter/appender/elasticsearch/TestElasticsearchAppender.java +++ b/appender/elasticsearch-native-1.x/src/test/java/org/apache/karaf/decanter/appender/elasticsearch/TestElasticsearchAppender.java @@ -28,10 +28,13 @@ import org.osgi.service.event.Event; import static org.elasticsearch.node.NodeBuilder.*; +import java.util.Map; + import org.apache.karaf.decanter.api.marshaller.Marshaller; import org.apache.karaf.decanter.marshaller.json.JsonMarshaller; public class TestElasticsearchAppender { + private static final int MAX_TRIES = 10; @Test public void testAppender() throws Exception { @@ -52,18 +55,25 @@ public class TestElasticsearchAppender { Marshaller marshaller = new JsonMarshaller(); ElasticsearchAppender appender = new ElasticsearchAppender(marshaller, "127.0.0.1", 9300, "elasticsearch"); appender.open(); - appender.handleEvent(new Event("testTopic", MapBuilder.<String, String>newMapBuilder().put("a", "b").put("c", "d").map())); - appender.handleEvent(new Event("testTopic", MapBuilder.<String, String>newMapBuilder().put("a", "b").put("c", "d").map())); - appender.handleEvent(new Event("testTopic", MapBuilder.<String, String>newMapBuilder().put("a", "b").put("c", "d").map())); + appender.handleEvent(new Event("testTopic", dummyMap())); + appender.handleEvent(new Event("testTopic", dummyMap())); + appender.handleEvent(new Event("testTopic", dummyMap())); appender.close(); - - int maxTryCount = 10; - for(int i=0; node.client().count(Requests.countRequest()).actionGet().getCount() == 0 && i< maxTryCount; i++) { + + long currentCount = 0; + int c = 0; + while (c < MAX_TRIES && currentCount != 3) { + currentCount = node.client().count(Requests.countRequest()).actionGet().getCount(); Thread.sleep(500); + c++; } - Assert.assertEquals(3L, node.client().count(Requests.countRequest()).actionGet().getCount()); + Assert.assertEquals(3L, currentCount); node.close(); } + private Map<String, String> dummyMap() { + return MapBuilder.<String, String>newMapBuilder().put("a", "b").put("c", "d").map(); + } + }
