http://git-wip-us.apache.org/repos/asf/flink/blob/d0e1d635/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/join/WindowJoinITCase.java ---------------------------------------------------------------------- diff --git a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/join/WindowJoinITCase.java b/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/join/WindowJoinITCase.java deleted file mode 100644 index e657b67..0000000 --- a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/join/WindowJoinITCase.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF 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.apache.flink.streaming.test.exampleJavaPrograms.join; - -import org.apache.flink.streaming.examples.join.WindowJoin; -import org.apache.flink.streaming.examples.join.util.WindowJoinData; -import org.apache.flink.streaming.util.StreamingProgramTestBase; - -public class WindowJoinITCase extends StreamingProgramTestBase { - - protected String gradesPath; - protected String salariesPath; - protected String resultPath; - - @Override - protected void preSubmit() throws Exception { - gradesPath = createTempFile("gradesText.txt", WindowJoinData.GRADES_INPUT); - salariesPath = createTempFile("salariesText.txt", WindowJoinData.SALARIES_INPUT); - resultPath = getTempDirPath("result"); - } - - @Override - protected void postSubmit() throws Exception { - // since the two sides of the join might have different speed - // the exact output can not be checked just whether it is well-formed - // checks that the result lines look like e.g. (bob, 2, 2015) - checkLinesAgainstRegexp(resultPath, "^\\([a-z]+,(\\d),(\\d)+\\)"); - } - - @Override - protected void testProgram() throws Exception { - WindowJoin.main(new String[]{gradesPath, salariesPath, resultPath}); - } -}
http://git-wip-us.apache.org/repos/asf/flink/blob/d0e1d635/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/ml/IncrementalLearningSkeletonITCase.java ---------------------------------------------------------------------- diff --git a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/ml/IncrementalLearningSkeletonITCase.java b/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/ml/IncrementalLearningSkeletonITCase.java deleted file mode 100644 index 83569dc..0000000 --- a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/ml/IncrementalLearningSkeletonITCase.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF 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.apache.flink.streaming.test.exampleJavaPrograms.ml; - -import org.apache.flink.streaming.examples.ml.IncrementalLearningSkeleton; -import org.apache.flink.streaming.examples.ml.util.IncrementalLearningSkeletonData; -import org.apache.flink.streaming.util.StreamingProgramTestBase; - -public class IncrementalLearningSkeletonITCase extends StreamingProgramTestBase { - - protected String resultPath; - - @Override - protected void preSubmit() throws Exception { - resultPath = getTempDirPath("result"); - } - - @Override - protected void postSubmit() throws Exception { - compareResultsByLinesInMemory(IncrementalLearningSkeletonData.RESULTS, resultPath); - } - - @Override - protected void testProgram() throws Exception { - IncrementalLearningSkeleton.main(new String[]{resultPath}); - } -} http://git-wip-us.apache.org/repos/asf/flink/blob/d0e1d635/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/socket/SocketTextStreamWordCountITCase.java ---------------------------------------------------------------------- diff --git a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/socket/SocketTextStreamWordCountITCase.java b/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/socket/SocketTextStreamWordCountITCase.java deleted file mode 100644 index 838834b..0000000 --- a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/socket/SocketTextStreamWordCountITCase.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF 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.apache.flink.streaming.test.exampleJavaPrograms.socket; - -import org.apache.flink.streaming.examples.socket.SocketTextStreamWordCount; -import org.apache.flink.streaming.util.SocketProgramITCaseBase; - -public class SocketTextStreamWordCountITCase extends SocketProgramITCaseBase { - - @Override - protected void testProgram() throws Exception { - SocketTextStreamWordCount.main(new String[]{HOST, port.toString(), resultPath}); - } - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flink/blob/d0e1d635/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/twitter/TwitterStreamITCase.java ---------------------------------------------------------------------- diff --git a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/twitter/TwitterStreamITCase.java b/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/twitter/TwitterStreamITCase.java deleted file mode 100644 index 7850082..0000000 --- a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/twitter/TwitterStreamITCase.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF 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.apache.flink.streaming.test.exampleJavaPrograms.twitter; - -import org.apache.flink.streaming.examples.twitter.TwitterStream; -import org.apache.flink.streaming.examples.twitter.util.TwitterStreamData; -import org.apache.flink.streaming.util.StreamingProgramTestBase; - -public class TwitterStreamITCase extends StreamingProgramTestBase { - protected String resultPath; - - @Override - protected void preSubmit() throws Exception { - resultPath = getTempDirPath("result"); - } - - @Override - protected void postSubmit() throws Exception { - compareResultsByLinesInMemory(TwitterStreamData.STREAMING_COUNTS_AS_TUPLES, resultPath); - } - - @Override - protected void testProgram() throws Exception { - TwitterStream.main(new String[]{resultPath}); - } - -} http://git-wip-us.apache.org/repos/asf/flink/blob/d0e1d635/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/windowing/SessionWindowingITCase.java ---------------------------------------------------------------------- diff --git a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/windowing/SessionWindowingITCase.java b/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/windowing/SessionWindowingITCase.java deleted file mode 100644 index 7f46be9..0000000 --- a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/windowing/SessionWindowingITCase.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF 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.apache.flink.streaming.test.exampleJavaPrograms.windowing; - -import org.apache.flink.streaming.examples.windowing.SessionWindowing; -import org.apache.flink.streaming.examples.windowing.util.SessionWindowingData; -import org.apache.flink.streaming.util.StreamingProgramTestBase; - -public class SessionWindowingITCase extends StreamingProgramTestBase { - - protected String resultPath; - - @Override - protected void preSubmit() throws Exception { - resultPath = getTempDirPath("result"); - } - - @Override - protected void postSubmit() throws Exception { - compareResultsByLinesInMemory(SessionWindowingData.EXPECTED, resultPath); - } - - @Override - protected void testProgram() throws Exception { - SessionWindowing.main(new String[]{resultPath}); - } -} http://git-wip-us.apache.org/repos/asf/flink/blob/d0e1d635/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/windowing/TopSpeedWindowingExampleITCase.java ---------------------------------------------------------------------- diff --git a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/windowing/TopSpeedWindowingExampleITCase.java b/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/windowing/TopSpeedWindowingExampleITCase.java deleted file mode 100644 index 37812c9..0000000 --- a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/windowing/TopSpeedWindowingExampleITCase.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF 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.apache.flink.streaming.test.exampleJavaPrograms.windowing; - -import org.apache.flink.streaming.examples.windowing.TopSpeedWindowing; -import org.apache.flink.streaming.examples.windowing.util.TopSpeedWindowingExampleData; -import org.apache.flink.streaming.util.StreamingProgramTestBase; - -public class TopSpeedWindowingExampleITCase extends StreamingProgramTestBase { - - protected String textPath; - protected String resultPath; - - @Override - protected void preSubmit() throws Exception { - setParallelism(1); //needed to ensure total ordering for windows - textPath = createTempFile("text.txt", TopSpeedWindowingExampleData.CAR_DATA); - resultPath = getTempDirPath("result"); - } - - @Override - protected void postSubmit() throws Exception { - compareResultsByLinesInMemory(TopSpeedWindowingExampleData.TOP_SPEEDS, resultPath); - } - - @Override - protected void testProgram() throws Exception { - TopSpeedWindowing.main(new String[]{textPath, resultPath}); - } -} http://git-wip-us.apache.org/repos/asf/flink/blob/d0e1d635/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/windowing/WindowWordCountITCase.java ---------------------------------------------------------------------- diff --git a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/windowing/WindowWordCountITCase.java b/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/windowing/WindowWordCountITCase.java deleted file mode 100644 index e7cce60..0000000 --- a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/windowing/WindowWordCountITCase.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF 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.apache.flink.streaming.test.exampleJavaPrograms.windowing; - -import org.apache.flink.streaming.examples.windowing.WindowWordCount; -import org.apache.flink.streaming.util.StreamingProgramTestBase; -import org.apache.flink.test.testdata.WordCountData; - -public class WindowWordCountITCase extends StreamingProgramTestBase { - - protected String textPath; - protected String resultPath; - protected String windowSize = "250"; - protected String slideSize = "150"; - - @Override - protected void preSubmit() throws Exception { - textPath = createTempFile("text.txt", WordCountData.TEXT); - resultPath = getTempDirPath("result"); - } - - @Override - protected void postSubmit() throws Exception { - // since the parallel tokenizers might have different speed - // the exact output can not be checked just whether it is well-formed - // checks that the result lines look like e.g. (faust, 2) - checkLinesAgainstRegexp(resultPath, "^\\([a-z]+,(\\d)+\\)"); - } - - @Override - protected void testProgram() throws Exception { - WindowWordCount.main(new String[]{textPath, resultPath, windowSize, slideSize}); - } -} http://git-wip-us.apache.org/repos/asf/flink/blob/d0e1d635/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/wordcount/PojoExampleITCase.java ---------------------------------------------------------------------- diff --git a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/wordcount/PojoExampleITCase.java b/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/wordcount/PojoExampleITCase.java deleted file mode 100644 index 6e3c213..0000000 --- a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/wordcount/PojoExampleITCase.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF 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.apache.flink.streaming.test.exampleJavaPrograms.wordcount; - -import org.apache.flink.streaming.examples.wordcount.PojoExample; -import org.apache.flink.streaming.util.StreamingProgramTestBase; -import org.apache.flink.test.testdata.WordCountData; - -public class PojoExampleITCase extends StreamingProgramTestBase { - - protected String textPath; - protected String resultPath; - - @Override - protected void preSubmit() throws Exception { - textPath = createTempFile("text.txt", WordCountData.TEXT); - resultPath = getTempDirPath("result"); - } - - @Override - protected void postSubmit() throws Exception { - compareResultsByLinesInMemory(WordCountData.STREAMING_COUNTS_AS_TUPLES, resultPath); - } - - @Override - protected void testProgram() throws Exception { - PojoExample.main(new String[]{textPath, resultPath}); - } -} http://git-wip-us.apache.org/repos/asf/flink/blob/d0e1d635/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/wordcount/WordCountITCase.java ---------------------------------------------------------------------- diff --git a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/wordcount/WordCountITCase.java b/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/wordcount/WordCountITCase.java deleted file mode 100644 index fcf568e..0000000 --- a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/wordcount/WordCountITCase.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF 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.apache.flink.streaming.test.exampleJavaPrograms.wordcount; - -import org.apache.flink.streaming.examples.wordcount.WordCount; -import org.apache.flink.streaming.util.StreamingProgramTestBase; -import org.apache.flink.test.testdata.WordCountData; - -public class WordCountITCase extends StreamingProgramTestBase { - - protected String textPath; - protected String resultPath; - - @Override - protected void preSubmit() throws Exception { - textPath = createTempFile("text.txt", WordCountData.TEXT); - resultPath = getTempDirPath("result"); - } - - @Override - protected void postSubmit() throws Exception { - compareResultsByLinesInMemory(WordCountData.STREAMING_COUNTS_AS_TUPLES, resultPath); - } - - @Override - protected void testProgram() throws Exception { - WordCount.main(new String[]{textPath, resultPath}); - } -} http://git-wip-us.apache.org/repos/asf/flink/blob/d0e1d635/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleScalaPrograms/join/WindowJoinITCase.java ---------------------------------------------------------------------- diff --git a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleScalaPrograms/join/WindowJoinITCase.java b/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleScalaPrograms/join/WindowJoinITCase.java deleted file mode 100644 index 08ce890..0000000 --- a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleScalaPrograms/join/WindowJoinITCase.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF 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.apache.flink.streaming.test.exampleScalaPrograms.join; - -import org.apache.flink.streaming.scala.examples.join.WindowJoin; -import org.apache.flink.streaming.examples.join.util.WindowJoinData; -import org.apache.flink.streaming.util.StreamingProgramTestBase; - -public class WindowJoinITCase extends StreamingProgramTestBase { - - protected String gradesPath; - protected String salariesPath; - protected String resultPath; - - @Override - protected void preSubmit() throws Exception { - gradesPath = createTempFile("gradesText.txt", WindowJoinData.GRADES_INPUT); - salariesPath = createTempFile("salariesText.txt", WindowJoinData.SALARIES_INPUT); - resultPath = getTempDirPath("result"); - } - - @Override - protected void postSubmit() throws Exception { - // since the two sides of the join might have different speed - // the exact output can not be checked just whether it is well-formed - // checks that the result lines look like e.g. Person(bob, 2, 2015) - checkLinesAgainstRegexp(resultPath, "^Person\\([a-z]+,(\\d),(\\d)+\\)"); - } - - @Override - protected void testProgram() throws Exception { - WindowJoin.main(new String[]{gradesPath, salariesPath, resultPath}); - } -} http://git-wip-us.apache.org/repos/asf/flink/blob/d0e1d635/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleScalaPrograms/socket/SocketTextStreamWordCountITCase.java ---------------------------------------------------------------------- diff --git a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleScalaPrograms/socket/SocketTextStreamWordCountITCase.java b/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleScalaPrograms/socket/SocketTextStreamWordCountITCase.java deleted file mode 100644 index b3629ad..0000000 --- a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleScalaPrograms/socket/SocketTextStreamWordCountITCase.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF 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.apache.flink.streaming.test.exampleScalaPrograms.socket; - -import org.apache.flink.streaming.scala.examples.socket.SocketTextStreamWordCount; -import org.apache.flink.streaming.util.SocketProgramITCaseBase; - -public class SocketTextStreamWordCountITCase extends SocketProgramITCaseBase { - - @Override - protected void testProgram() throws Exception { - SocketTextStreamWordCount.main(new String[]{HOST, port.toString(), resultPath}); - } - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flink/blob/d0e1d635/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleScalaPrograms/windowing/TopSpeedWindowingExampleITCase.java ---------------------------------------------------------------------- diff --git a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleScalaPrograms/windowing/TopSpeedWindowingExampleITCase.java b/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleScalaPrograms/windowing/TopSpeedWindowingExampleITCase.java deleted file mode 100644 index ef4e47f..0000000 --- a/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleScalaPrograms/windowing/TopSpeedWindowingExampleITCase.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF 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.apache.flink.streaming.test.exampleScalaPrograms.windowing; - -import org.apache.flink.streaming.scala.examples.windowing.TopSpeedWindowing; -import org.apache.flink.streaming.examples.windowing.util.TopSpeedWindowingExampleData; -import org.apache.flink.streaming.util.StreamingProgramTestBase; - -public class TopSpeedWindowingExampleITCase extends StreamingProgramTestBase { - protected String textPath; - protected String resultPath; - - @Override - protected void preSubmit() throws Exception { - setParallelism(1); //needed to ensure total ordering for windows - textPath = createTempFile("text.txt", TopSpeedWindowingExampleData.CAR_DATA); - resultPath = getTempDirPath("result"); - } - - @Override - protected void postSubmit() throws Exception { - compareResultsByLinesInMemory(TopSpeedWindowingExampleData.TOP_CASE_CLASS_SPEEDS, resultPath); - } - - @Override - protected void testProgram() throws Exception { - TopSpeedWindowing.main(new String[]{textPath, resultPath}); - - } -} http://git-wip-us.apache.org/repos/asf/flink/blob/d0e1d635/flink-tests/pom.xml ---------------------------------------------------------------------- diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml index 9061a1b..22c0351 100644 --- a/flink-tests/pom.xml +++ b/flink-tests/pom.xml @@ -102,19 +102,11 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-java-examples</artifactId> + <artifactId>flink-examples-batch</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-scala-examples</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - - + <dependency> <groupId>org.apache.flink</groupId> <artifactId>flink-core</artifactId> http://git-wip-us.apache.org/repos/asf/flink/blob/d0e1d635/flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/PageRankITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/PageRankITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/PageRankITCase.java index 2d1519d..e3b722a 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/PageRankITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/PageRankITCase.java @@ -22,9 +22,11 @@ import java.io.File; import com.google.common.base.Charsets; import com.google.common.io.Files; -import org.apache.flink.examples.java.graph.PageRankBasic; + +import org.apache.flink.examples.java.graph.PageRank; import org.apache.flink.test.testdata.PageRankData; import org.apache.flink.test.util.MultipleProgramsTestBase; + import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -68,13 +70,13 @@ public class PageRankITCase extends MultipleProgramsTestBase { @Test public void testPageRankSmallNumberOfIterations() throws Exception{ - PageRankBasic.main(new String[] {verticesPath, edgesPath, resultPath, PageRankData.NUM_VERTICES+"", "3"}); + PageRank.main(new String[]{verticesPath, edgesPath, resultPath, PageRankData.NUM_VERTICES + "", "3"}); expected = PageRankData.RANKS_AFTER_3_ITERATIONS; } @Test public void testPageRankWithConvergenceCriterion() throws Exception { - PageRankBasic.main(new String[] {verticesPath, edgesPath, resultPath, PageRankData.NUM_VERTICES+"", "1000"}); + PageRank.main(new String[]{verticesPath, edgesPath, resultPath, PageRankData.NUM_VERTICES + "", "1000"}); expected = PageRankData.RANKS_AFTER_EPSILON_0_0001_CONVERGENCE; } } http://git-wip-us.apache.org/repos/asf/flink/blob/d0e1d635/flink-tests/src/test/java/org/apache/flink/test/optimizer/iterations/PageRankCompilerTest.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/optimizer/iterations/PageRankCompilerTest.java b/flink-tests/src/test/java/org/apache/flink/test/optimizer/iterations/PageRankCompilerTest.java index 9b17270..f916151 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/optimizer/iterations/PageRankCompilerTest.java +++ b/flink-tests/src/test/java/org/apache/flink/test/optimizer/iterations/PageRankCompilerTest.java @@ -31,11 +31,11 @@ import org.apache.flink.optimizer.plan.BulkPartialSolutionPlanNode; import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.optimizer.plan.SinkPlanNode; import org.apache.flink.configuration.Configuration; -import org.apache.flink.examples.java.graph.PageRankBasic.BuildOutgoingEdgeList; -import org.apache.flink.examples.java.graph.PageRankBasic.Dampener; -import org.apache.flink.examples.java.graph.PageRankBasic.EpsilonFilter; -import org.apache.flink.examples.java.graph.PageRankBasic.JoinVertexWithEdgesMatch; -import org.apache.flink.examples.java.graph.PageRankBasic.RankAssigner; +import org.apache.flink.examples.java.graph.PageRank.BuildOutgoingEdgeList; +import org.apache.flink.examples.java.graph.PageRank.Dampener; +import org.apache.flink.examples.java.graph.PageRank.EpsilonFilter; +import org.apache.flink.examples.java.graph.PageRank.JoinVertexWithEdgesMatch; +import org.apache.flink.examples.java.graph.PageRank.RankAssigner; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.runtime.operators.util.LocalStrategy; import org.apache.flink.optimizer.util.CompilerTestBase; http://git-wip-us.apache.org/repos/asf/flink/blob/d0e1d635/flink-tests/src/test/java/org/apache/flink/test/optimizer/jsonplan/DumpCompiledPlanTest.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/optimizer/jsonplan/DumpCompiledPlanTest.java b/flink-tests/src/test/java/org/apache/flink/test/optimizer/jsonplan/DumpCompiledPlanTest.java index d186cbb..dad2f12 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/optimizer/jsonplan/DumpCompiledPlanTest.java +++ b/flink-tests/src/test/java/org/apache/flink/test/optimizer/jsonplan/DumpCompiledPlanTest.java @@ -26,7 +26,7 @@ import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.optimizer.plandump.PlanJSONDumpGenerator; import org.apache.flink.examples.java.clustering.KMeans; import org.apache.flink.examples.java.graph.ConnectedComponents; -import org.apache.flink.examples.java.graph.PageRankBasic; +import org.apache.flink.examples.java.graph.PageRank; import org.apache.flink.examples.java.relational.TPCHQuery3; import org.apache.flink.examples.java.relational.WebLogAnalysis; import org.apache.flink.examples.java.wordcount.WordCount; @@ -128,7 +128,7 @@ public class DumpCompiledPlanTest extends CompilerTestBase { PreviewPlanEnvironment env = new PreviewPlanEnvironment(); env.setAsContext(); try { - PageRankBasic.main(new String[] {IN_FILE, IN_FILE, OUT_FILE, "10", "123"}); + PageRank.main(new String[]{IN_FILE, IN_FILE, OUT_FILE, "10", "123"}); } catch(OptimizerPlanEnvironment.ProgramAbortException pae) { // all good. } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/flink/blob/d0e1d635/flink-tests/src/test/java/org/apache/flink/test/optimizer/jsonplan/PreviewPlanDumpTest.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/optimizer/jsonplan/PreviewPlanDumpTest.java b/flink-tests/src/test/java/org/apache/flink/test/optimizer/jsonplan/PreviewPlanDumpTest.java index 95a06c3..57c82b5 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/optimizer/jsonplan/PreviewPlanDumpTest.java +++ b/flink-tests/src/test/java/org/apache/flink/test/optimizer/jsonplan/PreviewPlanDumpTest.java @@ -25,7 +25,7 @@ import org.apache.flink.client.program.OptimizerPlanEnvironment; import org.apache.flink.client.program.PreviewPlanEnvironment; import org.apache.flink.examples.java.clustering.KMeans; import org.apache.flink.examples.java.graph.ConnectedComponents; -import org.apache.flink.examples.java.graph.PageRankBasic; +import org.apache.flink.examples.java.graph.PageRank; import org.apache.flink.examples.java.relational.TPCHQuery3; import org.apache.flink.examples.java.wordcount.WordCount; import org.apache.flink.optimizer.Optimizer; @@ -129,7 +129,7 @@ public class PreviewPlanDumpTest extends CompilerTestBase { PreviewPlanEnvironment env = new PreviewPlanEnvironment(); env.setAsContext(); try { - PageRankBasic.main(new String[] {IN_FILE, IN_FILE, OUT_FILE, "10", "123"}); + PageRank.main(new String[]{IN_FILE, IN_FILE, OUT_FILE, "10", "123"}); } catch(OptimizerPlanEnvironment.ProgramAbortException pae) { // all good. } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/flink/blob/d0e1d635/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java ---------------------------------------------------------------------- diff --git a/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java b/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java index 14ee8ec..69264cd 100644 --- a/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java +++ b/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java @@ -602,8 +602,11 @@ public class YARNSessionFIFOITCase extends YarnTestBase { public void testDetachedPerJobYarnCluster() { LOG.info("Starting testDetachedPerJobYarnCluster()"); - File exampleJarLocation = YarnTestBase.findFile("..", new ContainsName(new String[] {"-WordCount.jar"}, "streaming")); // exclude streaming wordcount here. - Assert.assertNotNull("Could not find wordcount jar", exampleJarLocation); + File exampleJarLocation = YarnTestBase.findFile( + ".." + File.separator + "flink-examples" + File.separator + "flink-examples-batch", + new ContainsName(new String[] {"-WordCount.jar"})); + + Assert.assertNotNull("Could not find batch wordcount jar", exampleJarLocation); testDetachedPerJobYarnClusterInternal(exampleJarLocation.getAbsolutePath()); @@ -617,8 +620,10 @@ public class YARNSessionFIFOITCase extends YarnTestBase { public void testDetachedPerJobYarnClusterWithStreamingJob() { LOG.info("Starting testDetachedPerJobYarnClusterWithStreamingJob()"); - File exampleJarLocation = YarnTestBase.findFile("..", new ContainsName(new String[] {"flink-streaming-examples", "-WordCount.jar"})); - Assert.assertNotNull("Could not find wordcount jar", exampleJarLocation); + File exampleJarLocation = YarnTestBase.findFile( + ".." + File.separator + "flink-examples" + File.separator + "flink-examples-streaming", + new ContainsName(new String[] {"-WordCount.jar"})); + Assert.assertNotNull("Could not find streaming wordcount jar", exampleJarLocation); testDetachedPerJobYarnClusterInternal(exampleJarLocation.getAbsolutePath()); http://git-wip-us.apache.org/repos/asf/flink/blob/d0e1d635/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0975f72..6cba956 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,6 @@ under the License. <module>flink-optimizer</module> <module>flink-streaming-java</module> <module>flink-streaming-scala</module> - <module>flink-streaming-examples</module> <module>flink-streaming-connectors</module> <module>flink-examples</module> <module>flink-clients</module>
