From 5687acabdc2009456dc69f0ef451bb9ec53564c4 Mon Sep 17 00:00:00 2001
From: sanil15 <sanil.jain15@gmail.com>
Date: Wed, 7 Mar 2018 10:23:37 -0800
Subject: [PATCH 1/2] SAMZA-1602 Moving class StreamAssert from src/test to
 src/main

---
 build.gradle                                                  | 4 ++--
 .../java/com/apache/samza/test/framework}/StreamAssert.java   | 4 ++--
 .../org/apache/samza/test/operator/BroadcastAssertApp.java    | 2 +-
 .../operator/StreamApplicationIntegrationTestHarness.java     | 2 +-
 .../test/java/org/apache/samza/test/timer/TestTimerApp.java   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename samza-test/src/{test/java/org/apache/samza/test/util => main/java/com/apache/samza/test/framework}/StreamAssert.java (98%)

diff --git a/build.gradle b/build.gradle
index a15a456bc2..44a6ccd052 100644
--- a/build.gradle
+++ b/build.gradle
@@ -761,16 +761,16 @@ project(":samza-test_$scalaVersion") {
     compile "net.sf.jopt-simple:jopt-simple:$joptSimpleVersion"
     compile "javax.mail:mail:1.4"
     compile "org.apache.kafka:kafka_$scalaVersion:$kafkaVersion"
+    compile "junit:junit:$junitVersion"
+    compile "org.hamcrest:hamcrest-all:$hamcrestVersion"
     testCompile "org.apache.kafka:kafka_$scalaVersion:$kafkaVersion:test"
     testCompile "com.101tec:zkclient:$zkClientVersion"
-    testCompile "junit:junit:$junitVersion"
     testCompile project(":samza-kafka_$scalaVersion")
     testCompile "org.apache.kafka:kafka_$scalaVersion:$kafkaVersion:test"
     testCompile "org.apache.kafka:kafka-clients:$kafkaVersion:test"
     testCompile project(":samza-core_$scalaVersion").sourceSets.test.output
     testCompile "org.scalatest:scalatest_$scalaVersion:$scalaTestVersion"
     testCompile "org.mockito:mockito-core:$mockitoVersion"
-    testCompile "org.hamcrest:hamcrest-all:$hamcrestVersion"
     testRuntime "org.slf4j:slf4j-simple:$slf4jVersion"
   }
 
diff --git a/samza-test/src/test/java/org/apache/samza/test/util/StreamAssert.java b/samza-test/src/main/java/com/apache/samza/test/framework/StreamAssert.java
similarity index 98%
rename from samza-test/src/test/java/org/apache/samza/test/util/StreamAssert.java
rename to samza-test/src/main/java/com/apache/samza/test/framework/StreamAssert.java
index 8a46db04ec..ee22ef4bf0 100644
--- a/samza-test/src/test/java/org/apache/samza/test/util/StreamAssert.java
+++ b/samza-test/src/main/java/com/apache/samza/test/framework/StreamAssert.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.samza.test.util;
+package com.apache.samza.test.framework;
 
 import com.google.common.collect.Iterables;
 import org.apache.samza.config.Config;
@@ -49,7 +49,7 @@
 /**
  * An assertion on the content of a {@link MessageStream}.
  *
- * <p>Example: </pre>{@code
+ * <pre>Example: {@code
  * MessageStream<String> stream = streamGraph.getInputStream("input", serde).map(some_function)...;
  * ...
  * StreamAssert.that(id, stream, stringSerde).containsInAnyOrder(Arrays.asList("a", "b", "c"));
diff --git a/samza-test/src/test/java/org/apache/samza/test/operator/BroadcastAssertApp.java b/samza-test/src/test/java/org/apache/samza/test/operator/BroadcastAssertApp.java
index 9c89aba006..0b4e136a4c 100644
--- a/samza-test/src/test/java/org/apache/samza/test/operator/BroadcastAssertApp.java
+++ b/samza-test/src/test/java/org/apache/samza/test/operator/BroadcastAssertApp.java
@@ -25,7 +25,7 @@
 import org.apache.samza.operators.StreamGraph;
 import org.apache.samza.serializers.JsonSerdeV2;
 import org.apache.samza.test.operator.data.PageView;
-import org.apache.samza.test.util.StreamAssert;
+import com.apache.samza.test.framework.StreamAssert;
 
 import java.util.Arrays;
 
diff --git a/samza-test/src/test/java/org/apache/samza/test/operator/StreamApplicationIntegrationTestHarness.java b/samza-test/src/test/java/org/apache/samza/test/operator/StreamApplicationIntegrationTestHarness.java
index 04497bd931..94d30b1039 100644
--- a/samza-test/src/test/java/org/apache/samza/test/operator/StreamApplicationIntegrationTestHarness.java
+++ b/samza-test/src/test/java/org/apache/samza/test/operator/StreamApplicationIntegrationTestHarness.java
@@ -32,7 +32,7 @@
 import org.apache.samza.config.MapConfig;
 import org.apache.samza.runtime.ApplicationRunner;
 import org.apache.samza.test.harness.AbstractIntegrationTestHarness;
-import org.apache.samza.test.util.StreamAssert;
+import com.apache.samza.test.framework.StreamAssert;
 import scala.Option;
 import scala.Option$;
 
diff --git a/samza-test/src/test/java/org/apache/samza/test/timer/TestTimerApp.java b/samza-test/src/test/java/org/apache/samza/test/timer/TestTimerApp.java
index d8913c594e..5d40edf22b 100644
--- a/samza-test/src/test/java/org/apache/samza/test/timer/TestTimerApp.java
+++ b/samza-test/src/test/java/org/apache/samza/test/timer/TestTimerApp.java
@@ -28,7 +28,7 @@
 import org.apache.samza.operators.functions.TimerFunction;
 import org.apache.samza.serializers.JsonSerdeV2;
 import org.apache.samza.test.operator.data.PageView;
-import org.apache.samza.test.util.StreamAssert;
+import com.apache.samza.test.framework.StreamAssert;
 
 import java.util.ArrayList;
 import java.util.Arrays;

From ffab5c1f0a84a5650243faee02822677d4b17ce4 Mon Sep 17 00:00:00 2001
From: sanil15 <sanil.jain15@gmail.com>
Date: Wed, 7 Mar 2018 12:08:09 -0800
Subject: [PATCH 2/2] SAMZA-1602 Renaming package from com to org since the
 package will be used for open source

---
 .../{com => org}/apache/samza/test/framework/StreamAssert.java  | 2 +-
 .../java/org/apache/samza/test/operator/BroadcastAssertApp.java | 2 +-
 .../test/operator/StreamApplicationIntegrationTestHarness.java  | 2 +-
 .../src/test/java/org/apache/samza/test/timer/TestTimerApp.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename samza-test/src/main/java/{com => org}/apache/samza/test/framework/StreamAssert.java (99%)

diff --git a/samza-test/src/main/java/com/apache/samza/test/framework/StreamAssert.java b/samza-test/src/main/java/org/apache/samza/test/framework/StreamAssert.java
similarity index 99%
rename from samza-test/src/main/java/com/apache/samza/test/framework/StreamAssert.java
rename to samza-test/src/main/java/org/apache/samza/test/framework/StreamAssert.java
index ee22ef4bf0..de0d96235c 100644
--- a/samza-test/src/main/java/com/apache/samza/test/framework/StreamAssert.java
+++ b/samza-test/src/main/java/org/apache/samza/test/framework/StreamAssert.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package com.apache.samza.test.framework;
+package org.apache.samza.test.framework;
 
 import com.google.common.collect.Iterables;
 import org.apache.samza.config.Config;
diff --git a/samza-test/src/test/java/org/apache/samza/test/operator/BroadcastAssertApp.java b/samza-test/src/test/java/org/apache/samza/test/operator/BroadcastAssertApp.java
index 0b4e136a4c..426a53b39a 100644
--- a/samza-test/src/test/java/org/apache/samza/test/operator/BroadcastAssertApp.java
+++ b/samza-test/src/test/java/org/apache/samza/test/operator/BroadcastAssertApp.java
@@ -25,7 +25,7 @@
 import org.apache.samza.operators.StreamGraph;
 import org.apache.samza.serializers.JsonSerdeV2;
 import org.apache.samza.test.operator.data.PageView;
-import com.apache.samza.test.framework.StreamAssert;
+import org.apache.samza.test.framework.StreamAssert;
 
 import java.util.Arrays;
 
diff --git a/samza-test/src/test/java/org/apache/samza/test/operator/StreamApplicationIntegrationTestHarness.java b/samza-test/src/test/java/org/apache/samza/test/operator/StreamApplicationIntegrationTestHarness.java
index 94d30b1039..fae3db45b0 100644
--- a/samza-test/src/test/java/org/apache/samza/test/operator/StreamApplicationIntegrationTestHarness.java
+++ b/samza-test/src/test/java/org/apache/samza/test/operator/StreamApplicationIntegrationTestHarness.java
@@ -32,7 +32,7 @@
 import org.apache.samza.config.MapConfig;
 import org.apache.samza.runtime.ApplicationRunner;
 import org.apache.samza.test.harness.AbstractIntegrationTestHarness;
-import com.apache.samza.test.framework.StreamAssert;
+import org.apache.samza.test.framework.StreamAssert;
 import scala.Option;
 import scala.Option$;
 
diff --git a/samza-test/src/test/java/org/apache/samza/test/timer/TestTimerApp.java b/samza-test/src/test/java/org/apache/samza/test/timer/TestTimerApp.java
index 5d40edf22b..27d1063f2d 100644
--- a/samza-test/src/test/java/org/apache/samza/test/timer/TestTimerApp.java
+++ b/samza-test/src/test/java/org/apache/samza/test/timer/TestTimerApp.java
@@ -28,7 +28,7 @@
 import org.apache.samza.operators.functions.TimerFunction;
 import org.apache.samza.serializers.JsonSerdeV2;
 import org.apache.samza.test.operator.data.PageView;
-import com.apache.samza.test.framework.StreamAssert;
+import org.apache.samza.test.framework.StreamAssert;
 
 import java.util.ArrayList;
 import java.util.Arrays;