Skip to content

kstream test fix #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ymatsuda merged 1 commit into from
Aug 27, 2015
Merged

kstream test fix #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 0 additions & 35 deletions stream/src/main/java/org/apache/kafka/streaming/kstream/internals/KStreamSource.java
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions ...am/src/main/java/org/apache/kafka/streaming/processor/internals/ProcessorContextImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,7 @@ public <K, V> void forward(K key, V value) {
@Override
@SuppressWarnings("unchecked")
public <K, V> void forward(K key, V value, int childIndex) {
<<<<<<< HEAD
ProcessorNode childNode = (ProcessorNode<K, V>) task.node().children().get(childIndex);

@guozhangwang Guozhang Wang (guozhangwang) Aug 27, 2015

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thanks.

=======
ProcessorNode childNode = (ProcessorNode<K, V, ?, ?>) task.node().children().get(childIndex);
>>>>>>> kstream refactored
task.node(childNode);
childNode.process(key, value);
}
Expand Down
20 changes: 10 additions & 10 deletions stream/src/test/java/org/apache/kafka/streaming/kstream/internals/KStreamBranchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@
import org.apache.kafka.streaming.kstream.KStream;
import org.apache.kafka.streaming.kstream.KStreamBuilder;
import org.apache.kafka.streaming.kstream.Predicate;
import org.apache.kafka.streaming.kstream.internals.KStreamSource;
import org.apache.kafka.test.MockKStreamBuilder;
import org.apache.kafka.test.MockProcessor;
import org.apache.kafka.test.KStreamTestDriver;
import org.apache.kafka.test.MockProcessorDef;
import org.junit.Test;

import java.lang.reflect.Array;
Expand All @@ -33,15 +32,15 @@

public class KStreamBranchTest {

private String topic1 = "topic";
private String topicName = "topic";

private KStreamBuilder topology = new MockKStreamBuilder();
private IntegerDeserializer keyDeserializer = new IntegerDeserializer();
private StringDeserializer valDeserializer = new StringDeserializer();

@SuppressWarnings("unchecked")
@Test
public void testKStreamBranch() {
KStreamBuilder builder = new KStreamBuilder();

Predicate<Integer, String> isEven = new Predicate<Integer, String>() {
@Override
Expand All @@ -66,21 +65,22 @@ public boolean apply(Integer key, String value) {

KStream<Integer, String> stream;
KStream<Integer, String>[] branches;
MockProcessor<Integer, String>[] processors;
MockProcessorDef<Integer, String>[] processors;

stream = topology.<Integer, String>from(keyDeserializer, valDeserializer, topic1);
stream = builder.from(keyDeserializer, valDeserializer, topicName);
branches = stream.branch(isEven, isMultipleOfThree, isOdd);

assertEquals(3, branches.length);

processors = (MockProcessor<Integer, String>[]) Array.newInstance(MockProcessor.class, branches.length);
processors = (MockProcessorDef<Integer, String>[]) Array.newInstance(MockProcessorDef.class, branches.length);
for (int i = 0; i < branches.length; i++) {
processors[i] = new MockProcessor<>();
processors[i] = new MockProcessorDef<>();
branches[i].process(processors[i]);
}

KStreamTestDriver driver = new KStreamTestDriver(builder);
for (int i = 0; i < expectedKeys.length; i++) {
((KStreamSource<Integer, String>) stream).source().process(expectedKeys[i], "V" + expectedKeys[i]);
driver.process(topicName, expectedKeys[i], "V" + expectedKeys[i]);
}

assertEquals(3, processors[0].processed.size());
Expand Down
26 changes: 14 additions & 12 deletions stream/src/test/java/org/apache/kafka/streaming/kstream/internals/KStreamFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@
import org.apache.kafka.streaming.kstream.KStream;
import org.apache.kafka.streaming.kstream.KStreamBuilder;
import org.apache.kafka.streaming.kstream.Predicate;
import org.apache.kafka.streaming.kstream.internals.KStreamSource;
import org.apache.kafka.test.MockKStreamBuilder;
import org.apache.kafka.test.MockProcessor;
import org.apache.kafka.test.KStreamTestDriver;
import org.apache.kafka.test.MockProcessorDef;

import org.junit.Test;

Expand All @@ -34,7 +33,6 @@ public class KStreamFilterTest {

private String topicName = "topic";

private KStreamBuilder topology = new MockKStreamBuilder();
private IntegerDeserializer keyDeserializer = new IntegerDeserializer();
private StringDeserializer valDeserializer = new StringDeserializer();

Expand All @@ -47,35 +45,39 @@ public boolean apply(Integer key, String value) {

@Test
public void testFilter() {
KStreamBuilder builder = new KStreamBuilder();
final int[] expectedKeys = new int[]{1, 2, 3, 4, 5, 6, 7};

KStream<Integer, String> stream;
MockProcessor<Integer, String> processor;
MockProcessorDef<Integer, String> processor;

processor = new MockProcessor<>();
stream = topology.<Integer, String>from(keyDeserializer, valDeserializer, topicName);
processor = new MockProcessorDef<>();
stream = builder.from(keyDeserializer, valDeserializer, topicName);
stream.filter(isMultipleOfThree).process(processor);

KStreamTestDriver driver = new KStreamTestDriver(builder);
for (int i = 0; i < expectedKeys.length; i++) {
((KStreamSource<Integer, String>) stream).source().process(expectedKeys[i], "V" + expectedKeys[i]);
driver.process(topicName, expectedKeys[i], "V" + expectedKeys[i]);
}

assertEquals(2, processor.processed.size());
}

@Test
public void testFilterOut() {
KStreamBuilder builder = new KStreamBuilder();
final int[] expectedKeys = new int[]{1, 2, 3, 4, 5, 6, 7};

KStream<Integer, String> stream;
MockProcessor<Integer, String> processor;
MockProcessorDef<Integer, String> processor;

processor = new MockProcessor<>();
stream = topology.<Integer, String>from(keyDeserializer, valDeserializer, topicName);
processor = new MockProcessorDef<>();
stream = builder.from(keyDeserializer, valDeserializer, topicName);
stream.filterOut(isMultipleOfThree).process(processor);

KStreamTestDriver driver = new KStreamTestDriver(builder);
for (int i = 0; i < expectedKeys.length; i++) {
((KStreamSource<Integer, String>) stream).source().process(expectedKeys[i], "V" + expectedKeys[i]);
driver.process(topicName, expectedKeys[i], "V" + expectedKeys[i]);
}

assertEquals(5, processor.processed.size());
Expand Down
30 changes: 15 additions & 15 deletions stream/src/test/java/org/apache/kafka/streaming/kstream/internals/KStreamFlatMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@
import org.apache.kafka.streaming.kstream.KStream;
import org.apache.kafka.streaming.kstream.KStreamBuilder;
import org.apache.kafka.streaming.kstream.KeyValue;
import org.apache.kafka.streaming.kstream.KeyValueMapper;
import org.apache.kafka.streaming.kstream.internals.KStreamSource;
import org.apache.kafka.test.MockKStreamBuilder;
import org.apache.kafka.test.MockProcessor;
import org.apache.kafka.streaming.kstream.KeyValueFlatMap;
import org.apache.kafka.test.KStreamTestDriver;
import org.apache.kafka.test.MockProcessorDef;
import org.junit.Test;

import static org.junit.Assert.assertEquals;
Expand All @@ -36,36 +35,37 @@ public class KStreamFlatMapTest {

private String topicName = "topic";

private KStreamBuilder topology = new MockKStreamBuilder();
private IntegerDeserializer keyDeserializer = new IntegerDeserializer();
private StringDeserializer valDeserializer = new StringDeserializer();

@Test
public void testFlatMap() {
KStreamBuilder builder = new KStreamBuilder();

KeyValueMapper<Integer, String, String, Iterable<String>> mapper =
new KeyValueMapper<Integer, String, String, Iterable<String>>() {
KeyValueFlatMap<Integer, String, String, String> mapper =
new KeyValueFlatMap<Integer, String, String, String>() {
@Override
public KeyValue<String, Iterable<String>> apply(Integer key, String value) {
ArrayList<String> result = new ArrayList<String>();
public Iterable<KeyValue<String, String>> apply(Integer key, String value) {
ArrayList<KeyValue<String, String>> result = new ArrayList<>();
for (int i = 0; i < key; i++) {
result.add(value);
result.add(KeyValue.pair(Integer.toString(key), value));
}
return KeyValue.pair(Integer.toString(key * 10), (Iterable<String>) result);
return result;
}
};

final int[] expectedKeys = new int[]{0, 1, 2, 3};

KStream<Integer, String> stream;
MockProcessor<String, String> processor;
MockProcessorDef<String, String> processor;

processor = new MockProcessor<>();
stream = topology.<Integer, String>from(keyDeserializer, valDeserializer, topicName);
processor = new MockProcessorDef<>();
stream = builder.from(keyDeserializer, valDeserializer, topicName);
stream.flatMap(mapper).process(processor);

KStreamTestDriver driver = new KStreamTestDriver(builder);
for (int i = 0; i < expectedKeys.length; i++) {
((KStreamSource<Integer, String>) stream).source().process(expectedKeys[i], "V" + expectedKeys[i]);
driver.process(topicName, expectedKeys[i], "V" + expectedKeys[i]);
}

assertEquals(6, processor.processed.size());
Expand Down
16 changes: 8 additions & 8 deletions .../src/test/java/org/apache/kafka/streaming/kstream/internals/KStreamFlatMapValuesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@
import org.apache.kafka.streaming.kstream.KStream;
import org.apache.kafka.streaming.kstream.KStreamBuilder;
import org.apache.kafka.streaming.kstream.ValueMapper;
import org.apache.kafka.streaming.kstream.internals.KStreamSource;
import org.apache.kafka.test.MockKStreamBuilder;
import org.apache.kafka.test.MockProcessor;
import org.apache.kafka.test.KStreamTestDriver;
import org.apache.kafka.test.MockProcessorDef;
import org.junit.Test;

import java.util.ArrayList;
Expand All @@ -35,12 +34,12 @@ public class KStreamFlatMapValuesTest {

private String topicName = "topic";

private KStreamBuilder topology = new MockKStreamBuilder();
private IntegerDeserializer keyDeserializer = new IntegerDeserializer();
private StringDeserializer valDeserializer = new StringDeserializer();

@Test
public void testFlatMapValues() {
KStreamBuilder builder = new KStreamBuilder();

ValueMapper<String, Iterable<String>> mapper =
new ValueMapper<String, Iterable<String>>() {
Expand All @@ -56,14 +55,15 @@ public Iterable<String> apply(String value) {
final int[] expectedKeys = new int[]{0, 1, 2, 3};

KStream<Integer, String> stream;
MockProcessor<Integer, String> processor;
MockProcessorDef<Integer, String> processor;

processor = new MockProcessor<>();
stream = topology.<Integer, String>from(keyDeserializer, valDeserializer, topicName);
processor = new MockProcessorDef<>();
stream = builder.from(keyDeserializer, valDeserializer, topicName);
stream.flatMapValues(mapper).process(processor);

KStreamTestDriver driver = new KStreamTestDriver(builder);
for (int i = 0; i < expectedKeys.length; i++) {
((KStreamSource<Integer, String>) stream).source().process(expectedKeys[i], "V" + expectedKeys[i]);
driver.process(topicName, expectedKeys[i], "V" + expectedKeys[i]);
}

assertEquals(8, processor.processed.size());
Expand Down
Loading