Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BF294181C8 for ; Mon, 1 Feb 2016 17:46:20 +0000 (UTC) Received: (qmail 39089 invoked by uid 500); 1 Feb 2016 17:46:20 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 39012 invoked by uid 500); 1 Feb 2016 17:46:20 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 37871 invoked by uid 99); 1 Feb 2016 17:46:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Feb 2016 17:46:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BB9DBDFE61; Mon, 1 Feb 2016 17:46:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.apache.org Date: Mon, 01 Feb 2016 17:46:45 -0000 Message-Id: <716bdc7374ff42d191a5d673e15fec06@git.apache.org> In-Reply-To: <9bc8945a1b59456ea209adbade6c40f8@git.apache.org> References: <9bc8945a1b59456ea209adbade6c40f8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [27/50] brooklyn-library git commit: Update test using Kafka API Update test using Kafka API Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/ea32c5ad Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/ea32c5ad Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/ea32c5ad Branch: refs/heads/0.5.0 Commit: ea32c5ad63b80c2e3b0b4c60f7f35c28042d5b38 Parents: dee689a Author: Andrew Kennedy Authored: Wed Mar 20 23:46:05 2013 +0000 Committer: Andrew Kennedy Committed: Fri Apr 19 10:36:07 2013 +0100 ---------------------------------------------------------------------- .../entity/messaging/kafka/KafkaBrokerImpl.java | 2 +- .../messaging/kafka/KafkaIntegrationTest.groovy | 5 ++--- .../entity/messaging/kafka/KafkaSupport.java | 23 +++++++++++--------- 3 files changed, 16 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/ea32c5ad/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java index 625fe3f..ed9ae0c 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java @@ -64,7 +64,7 @@ public class KafkaBrokerImpl extends SoftwareProcessImpl implements MessageBroke @Override public void postConstruct() { - setAttribute(BROKER_ID, hashCode()); + setAttribute(BROKER_ID, Math.abs(hashCode())); // Must be positive for partitioning to work } @Override http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/ea32c5ad/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.groovy ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.groovy b/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.groovy index 89f5773..2ef95c5 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.groovy +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.groovy @@ -119,9 +119,8 @@ public class KafkaIntegrationTest { KafkaSupport support = new KafkaSupport(cluster.getZookeeper()); support.sendMessage("brooklyn", "TEST_MESSAGE") - List messages = support.getMessage("brooklyn"); - assertEquals(messages.size(), 1); - assertEquals(messages.get(0), "TEST_MESSAGE"); + String message = support.getMessage("brooklyn"); + assertEquals(message, "TEST_MESSAGE"); } } http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/ea32c5ad/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaSupport.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaSupport.java b/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaSupport.java index d026f06..d9372a9 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaSupport.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaSupport.java @@ -15,13 +15,15 @@ */ package brooklyn.entity.messaging.kafka; -import static org.testng.Assert.*; +import static org.testng.Assert.assertTrue; +import java.nio.ByteBuffer; import java.util.List; import java.util.Properties; import kafka.consumer.Consumer; import kafka.consumer.ConsumerConfig; +import kafka.consumer.ConsumerIterator; import kafka.consumer.KafkaMessageStream; import kafka.javaapi.consumer.ConsumerConnector; import kafka.javaapi.producer.Producer; @@ -53,20 +55,21 @@ public class KafkaSupport { producer.close(); } - public List getMessage(String topic) { + public String getMessage(String topic) { Properties props = new Properties(); props.put("zk.connect", String.format("%s:%d", zookeeper.getAttribute(Attributes.HOSTNAME), zookeeper.getZookeeperPort())); props.put("zk.connectiontimeout.ms", "1000000"); - props.put("groupid", "test_group"); + props.put("groupid", "brooklyn"); ConsumerConfig consumerConfig = new ConsumerConfig(props); ConsumerConnector consumer = Consumer.createJavaConsumerConnector(consumerConfig); List> streams = consumer.createMessageStreams(ImmutableMap.of(topic, 1)).get(topic); - List messages = Lists.newArrayList(); - for (Message msg : Iterables.getOnlyElement(streams)) { - assertTrue(msg.isValid()); - String payload = new String(msg.payload().array()); - messages.add(payload); - } - return messages; + ConsumerIterator iterator = Iterables.getOnlyElement(streams).iterator(); + Message msg = iterator.next(); + assertTrue(msg.isValid()); + ByteBuffer buf = msg.payload(); + byte[] data = new byte[buf.remaining()]; + buf.get(data); + String payload = new String(data); + return payload; } }