Return-Path: X-Original-To: apmail-flink-commits-archive@minotaur.apache.org Delivered-To: apmail-flink-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 659BE18D8C for ; Mon, 5 Oct 2015 14:42:42 +0000 (UTC) Received: (qmail 41624 invoked by uid 500); 5 Oct 2015 14:42:36 -0000 Delivered-To: apmail-flink-commits-archive@flink.apache.org Received: (qmail 41529 invoked by uid 500); 5 Oct 2015 14:42:36 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 41282 invoked by uid 99); 5 Oct 2015 14:42:35 -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, 05 Oct 2015 14:42:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 82845E0508; Mon, 5 Oct 2015 14:42:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aljoscha@apache.org To: commits@flink.apache.org Date: Mon, 05 Oct 2015 14:42:42 -0000 Message-Id: In-Reply-To: <36465f6d44d147ffa2258efd2f342f51@git.apache.org> References: <36465f6d44d147ffa2258efd2f342f51@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/13] flink git commit: Disable tests because operators are not implemented yet Disable tests because operators are not implemented yet Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/833b3477 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/833b3477 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/833b3477 Branch: refs/heads/master Commit: 833b34776a6afe08f34d035318c88dffe7f9cb31 Parents: d0c9e78 Author: Aljoscha Krettek Authored: Fri Oct 2 17:40:31 2015 +0200 Committer: Aljoscha Krettek Committed: Mon Oct 5 16:36:35 2015 +0200 ---------------------------------------------------------------------- .../streaming/api/WindowCrossJoinTest.java | 6 ++ .../api/operators/co/SelfConnectionTest.java | 5 + .../join/WindowJoinITCase.java | 101 ++++++++++--------- .../join/WindowJoinITCase.java | 101 ++++++++++--------- 4 files changed, 113 insertions(+), 100 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/833b3477/flink-staging/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/WindowCrossJoinTest.java ---------------------------------------------------------------------- diff --git a/flink-staging/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/WindowCrossJoinTest.java b/flink-staging/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/WindowCrossJoinTest.java index 0137682..7d2a131 100644 --- a/flink-staging/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/WindowCrossJoinTest.java +++ b/flink-staging/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/WindowCrossJoinTest.java @@ -33,6 +33,7 @@ import org.apache.flink.streaming.api.windowing.helper.Timestamp; import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; import org.apache.flink.streaming.util.TestListResultSink; import org.apache.flink.streaming.util.TestStreamEnvironment; +import org.junit.Ignore; import org.junit.Test; public class WindowCrossJoinTest extends StreamingMultipleProgramsTestBase { @@ -50,6 +51,11 @@ public class WindowCrossJoinTest extends StreamingMultipleProgramsTestBase { } } + /** + * TODO: enable once new join operator is ready + * @throws Exception + */ + @Ignore @Test public void test() throws Exception { StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment(); http://git-wip-us.apache.org/repos/asf/flink/blob/833b3477/flink-staging/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/operators/co/SelfConnectionTest.java ---------------------------------------------------------------------- diff --git a/flink-staging/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/operators/co/SelfConnectionTest.java b/flink-staging/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/operators/co/SelfConnectionTest.java index 19a61ba..fc9de1d 100644 --- a/flink-staging/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/operators/co/SelfConnectionTest.java +++ b/flink-staging/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/operators/co/SelfConnectionTest.java @@ -39,13 +39,18 @@ import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; import org.apache.flink.streaming.util.TestListResultSink; import org.apache.flink.streaming.util.TestStreamEnvironment; import org.apache.flink.util.Collector; +import org.junit.Ignore; import org.junit.Test; public class SelfConnectionTest extends StreamingMultipleProgramsTestBase { private static List expected; + /** + * TODO: enable once new join operator is implemented + */ @SuppressWarnings({ "unchecked", "rawtypes" }) + @Ignore @Test public void sameDataStreamTest() { http://git-wip-us.apache.org/repos/asf/flink/blob/833b3477/flink-staging/flink-streaming/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/join/WindowJoinITCase.java ---------------------------------------------------------------------- diff --git a/flink-staging/flink-streaming/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/join/WindowJoinITCase.java b/flink-staging/flink-streaming/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/join/WindowJoinITCase.java index e657b67..aae4b93 100644 --- a/flink-staging/flink-streaming/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/join/WindowJoinITCase.java +++ b/flink-staging/flink-streaming/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleJavaPrograms/join/WindowJoinITCase.java @@ -1,50 +1,51 @@ -/* - * 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}); - } -} +///* +// * 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. +// */ +// +// TODO: reactivate once we have new join implementation +//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/833b3477/flink-staging/flink-streaming/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleScalaPrograms/join/WindowJoinITCase.java ---------------------------------------------------------------------- diff --git a/flink-staging/flink-streaming/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleScalaPrograms/join/WindowJoinITCase.java b/flink-staging/flink-streaming/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleScalaPrograms/join/WindowJoinITCase.java index 08ce890..0aa884f 100644 --- a/flink-staging/flink-streaming/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleScalaPrograms/join/WindowJoinITCase.java +++ b/flink-staging/flink-streaming/flink-streaming-examples/src/test/java/org/apache/flink/streaming/test/exampleScalaPrograms/join/WindowJoinITCase.java @@ -1,50 +1,51 @@ -/* - * 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}); - } -} +///* +// * 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. +// */ +// +// TODO: reactivate once we have new join implementation +//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}); +// } +//}