This is an automated email from the ASF dual-hosted git repository. gaoyunhaii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink-ml.git
commit 203edbe415998d4f5c392e8a0b4e3218b2ac8610 Author: Yun Gao <gaoyunhen...@gmail.com> AuthorDate: Sun Oct 31 20:55:39 2021 +0800 [hotfix][iteration] Add the flink-ml-tests project --- flink-ml-tests/pom.xml | 57 ++++++++++++++++++++++ .../BoundedAllRoundStreamIterationITCase.java | 22 ++++----- .../iteration}/UnboundedStreamIterationITCase.java | 16 +++--- .../test/iteration}/operators/CollectSink.java | 2 +- .../test/iteration}/operators/EpochRecord.java | 2 +- .../iteration}/operators/IncrementEpochMap.java | 2 +- .../test/iteration}/operators/OutputRecord.java | 2 +- .../operators/ReduceAllRoundProcessFunction.java | 2 +- .../operators/RoundBasedTerminationCriteria.java | 2 +- .../test/iteration}/operators/SequenceSource.java | 2 +- .../TwoInputReduceAllRoundProcessFunction.java | 2 +- .../src/test/resources/log4j2-test.properties | 28 +++++++++++ pom.xml | 1 + 13 files changed, 113 insertions(+), 27 deletions(-) diff --git a/flink-ml-tests/pom.xml b/flink-ml-tests/pom.xml new file mode 100644 index 0000000..fccd0cb --- /dev/null +++ b/flink-ml-tests/pom.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.flink</groupId> + <artifactId>flink-ml-parent</artifactId> + <version>0.1-SNAPSHOT</version> + </parent> + + <artifactId>flink-ml-tests</artifactId> + <name>Flink ML : Tests</name> + + <dependencies> + + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-ml-iteration</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> + <version>${flink.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-test-utils-junit</artifactId> + <version>${flink.version}</version> + <scope>test</scope> + </dependency> + </dependencies> +</project> diff --git a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/BoundedAllRoundStreamIterationITCase.java b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/BoundedAllRoundStreamIterationITCase.java similarity index 93% rename from flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/BoundedAllRoundStreamIterationITCase.java rename to flink-ml-tests/src/test/java/org/apache/flink/test/iteration/BoundedAllRoundStreamIterationITCase.java index 62f7b8b..5084c78 100644 --- a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/BoundedAllRoundStreamIterationITCase.java +++ b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/BoundedAllRoundStreamIterationITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.iteration.itcases; +package org.apache.flink.test.iteration; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.iteration.DataStreamList; @@ -26,18 +26,18 @@ import org.apache.flink.iteration.IterationConfig; import org.apache.flink.iteration.Iterations; import org.apache.flink.iteration.ReplayableDataStreamList; import org.apache.flink.iteration.compile.DraftExecutionEnvironment; -import org.apache.flink.iteration.itcases.operators.CollectSink; -import org.apache.flink.iteration.itcases.operators.EpochRecord; -import org.apache.flink.iteration.itcases.operators.IncrementEpochMap; -import org.apache.flink.iteration.itcases.operators.OutputRecord; -import org.apache.flink.iteration.itcases.operators.RoundBasedTerminationCriteria; -import org.apache.flink.iteration.itcases.operators.SequenceSource; -import org.apache.flink.iteration.itcases.operators.TwoInputReduceAllRoundProcessFunction; import org.apache.flink.runtime.jobgraph.JobGraph; import org.apache.flink.runtime.minicluster.MiniCluster; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.SingleOutputStreamOperator; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; +import org.apache.flink.test.iteration.operators.CollectSink; +import org.apache.flink.test.iteration.operators.EpochRecord; +import org.apache.flink.test.iteration.operators.IncrementEpochMap; +import org.apache.flink.test.iteration.operators.OutputRecord; +import org.apache.flink.test.iteration.operators.RoundBasedTerminationCriteria; +import org.apache.flink.test.iteration.operators.SequenceSource; +import org.apache.flink.test.iteration.operators.TwoInputReduceAllRoundProcessFunction; import org.apache.flink.testutils.junit.SharedObjects; import org.apache.flink.testutils.junit.SharedReference; import org.apache.flink.util.OutputTag; @@ -54,9 +54,9 @@ import java.util.Map; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -import static org.apache.flink.iteration.itcases.UnboundedStreamIterationITCase.computeRoundStat; -import static org.apache.flink.iteration.itcases.UnboundedStreamIterationITCase.createMiniClusterConfiguration; -import static org.apache.flink.iteration.itcases.UnboundedStreamIterationITCase.verifyResult; +import static org.apache.flink.test.iteration.UnboundedStreamIterationITCase.computeRoundStat; +import static org.apache.flink.test.iteration.UnboundedStreamIterationITCase.createMiniClusterConfiguration; +import static org.apache.flink.test.iteration.UnboundedStreamIterationITCase.verifyResult; import static org.junit.Assert.assertEquals; /** diff --git a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/UnboundedStreamIterationITCase.java b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/UnboundedStreamIterationITCase.java similarity index 95% rename from flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/UnboundedStreamIterationITCase.java rename to flink-ml-tests/src/test/java/org/apache/flink/test/iteration/UnboundedStreamIterationITCase.java index f4c8edd..df084eb 100644 --- a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/UnboundedStreamIterationITCase.java +++ b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/UnboundedStreamIterationITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.iteration.itcases; +package org.apache.flink.test.iteration; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.configuration.Configuration; @@ -25,19 +25,19 @@ import org.apache.flink.iteration.DataStreamList; import org.apache.flink.iteration.IterationBodyResult; import org.apache.flink.iteration.Iterations; import org.apache.flink.iteration.compile.DraftExecutionEnvironment; -import org.apache.flink.iteration.itcases.operators.CollectSink; -import org.apache.flink.iteration.itcases.operators.EpochRecord; -import org.apache.flink.iteration.itcases.operators.IncrementEpochMap; -import org.apache.flink.iteration.itcases.operators.OutputRecord; -import org.apache.flink.iteration.itcases.operators.ReduceAllRoundProcessFunction; -import org.apache.flink.iteration.itcases.operators.SequenceSource; -import org.apache.flink.iteration.itcases.operators.TwoInputReduceAllRoundProcessFunction; import org.apache.flink.runtime.jobgraph.JobGraph; import org.apache.flink.runtime.minicluster.MiniCluster; import org.apache.flink.runtime.minicluster.MiniClusterConfiguration; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.SingleOutputStreamOperator; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; +import org.apache.flink.test.iteration.operators.CollectSink; +import org.apache.flink.test.iteration.operators.EpochRecord; +import org.apache.flink.test.iteration.operators.IncrementEpochMap; +import org.apache.flink.test.iteration.operators.OutputRecord; +import org.apache.flink.test.iteration.operators.ReduceAllRoundProcessFunction; +import org.apache.flink.test.iteration.operators.SequenceSource; +import org.apache.flink.test.iteration.operators.TwoInputReduceAllRoundProcessFunction; import org.apache.flink.testutils.junit.SharedObjects; import org.apache.flink.testutils.junit.SharedReference; import org.apache.flink.util.OutputTag; diff --git a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/CollectSink.java b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/CollectSink.java similarity index 96% rename from flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/CollectSink.java rename to flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/CollectSink.java index c9e1bad..0f09f6f 100644 --- a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/CollectSink.java +++ b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/CollectSink.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.iteration.itcases.operators; +package org.apache.flink.test.iteration.operators; import org.apache.flink.streaming.api.functions.sink.SinkFunction; import org.apache.flink.testutils.junit.SharedReference; diff --git a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/EpochRecord.java b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/EpochRecord.java similarity index 96% rename from flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/EpochRecord.java rename to flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/EpochRecord.java index b4825cb..f8c72b0 100644 --- a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/EpochRecord.java +++ b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/EpochRecord.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.iteration.itcases.operators; +package org.apache.flink.test.iteration.operators; /** * A value and its epoch. This a temporary implementation before we have determined how to notify diff --git a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/IncrementEpochMap.java b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/IncrementEpochMap.java similarity index 95% rename from flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/IncrementEpochMap.java rename to flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/IncrementEpochMap.java index a249a98..2f1dcfd 100644 --- a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/IncrementEpochMap.java +++ b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/IncrementEpochMap.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.iteration.itcases.operators; +package org.apache.flink.test.iteration.operators; import org.apache.flink.api.common.functions.MapFunction; diff --git a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/OutputRecord.java b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/OutputRecord.java similarity index 97% rename from flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/OutputRecord.java rename to flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/OutputRecord.java index 44db276..0499227 100644 --- a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/OutputRecord.java +++ b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/OutputRecord.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.iteration.itcases.operators; +package org.apache.flink.test.iteration.operators; /** The output record type. */ public class OutputRecord<T> { diff --git a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/ReduceAllRoundProcessFunction.java b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/ReduceAllRoundProcessFunction.java similarity index 98% rename from flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/ReduceAllRoundProcessFunction.java rename to flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/ReduceAllRoundProcessFunction.java index 60c49fe..dfce6e6 100644 --- a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/ReduceAllRoundProcessFunction.java +++ b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/ReduceAllRoundProcessFunction.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.iteration.itcases.operators; +package org.apache.flink.test.iteration.operators; import org.apache.flink.configuration.Configuration; import org.apache.flink.iteration.IterationListener; diff --git a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/RoundBasedTerminationCriteria.java b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/RoundBasedTerminationCriteria.java similarity index 97% rename from flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/RoundBasedTerminationCriteria.java rename to flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/RoundBasedTerminationCriteria.java index 1905e0c..8f6dc9f 100644 --- a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/RoundBasedTerminationCriteria.java +++ b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/RoundBasedTerminationCriteria.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.iteration.itcases.operators; +package org.apache.flink.test.iteration.operators; import org.apache.flink.api.common.functions.FlatMapFunction; import org.apache.flink.iteration.IterationListener; diff --git a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/SequenceSource.java b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/SequenceSource.java similarity index 97% rename from flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/SequenceSource.java rename to flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/SequenceSource.java index 566e03d..4054cf6 100644 --- a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/SequenceSource.java +++ b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/SequenceSource.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.iteration.itcases.operators; +package org.apache.flink.test.iteration.operators; import org.apache.flink.streaming.api.functions.source.RichParallelSourceFunction; diff --git a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/TwoInputReduceAllRoundProcessFunction.java b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/TwoInputReduceAllRoundProcessFunction.java similarity index 98% rename from flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/TwoInputReduceAllRoundProcessFunction.java rename to flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/TwoInputReduceAllRoundProcessFunction.java index 648f1dc..35e6876 100644 --- a/flink-ml-iteration/src/test/java/org/apache/flink/iteration/itcases/operators/TwoInputReduceAllRoundProcessFunction.java +++ b/flink-ml-tests/src/test/java/org/apache/flink/test/iteration/operators/TwoInputReduceAllRoundProcessFunction.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.iteration.itcases.operators; +package org.apache.flink.test.iteration.operators; import org.apache.flink.configuration.Configuration; import org.apache.flink.iteration.IterationListener; diff --git a/flink-ml-tests/src/test/resources/log4j2-test.properties b/flink-ml-tests/src/test/resources/log4j2-test.properties new file mode 100644 index 0000000..835c2ec --- /dev/null +++ b/flink-ml-tests/src/test/resources/log4j2-test.properties @@ -0,0 +1,28 @@ +################################################################################ +# 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. +################################################################################ + +# Set root logger level to OFF to not flood build logs +# set manually to INFO for debugging purposes +rootLogger.level = OFF +rootLogger.appenderRef.test.ref = TestLogger + +appender.testlogger.name = TestLogger +appender.testlogger.type = CONSOLE +appender.testlogger.target = SYSTEM_ERR +appender.testlogger.layout.type = PatternLayout +appender.testlogger.layout.pattern = %-4r [%t] %-5p %c %x - %m%n diff --git a/pom.xml b/pom.xml index 1fd1a8d..ee15d3d 100644 --- a/pom.xml +++ b/pom.xml @@ -56,6 +56,7 @@ under the License. <module>flink-ml-lib</module> <module>flink-ml-uber</module> <module>flink-ml-iteration</module> + <module>flink-ml-tests</module> <module>flink-ml-examples</module> </modules>