This is an automated email from the ASF dual-hosted git repository. chesnay pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 68437b937a60c647abe1a4104289849c006b8fe7 Author: Alexander Fedulov <1492164+afedu...@users.noreply.github.com> AuthorDate: Mon Oct 16 23:39:51 2023 +0200 [FLINK-28050][connectors] Move DataGeneratorSource tests into a separate module This is required to avoid circular dependency that arises when DataGeneratorSource gets used in flink-streaming-java --- .../pom.xml | 18 +++++++++++- .../architecture/TestCodeArchitectureTest.java | 0 .../datagen/source/DataGeneratorSourceITCase.java | 0 .../datagen/source/DataGeneratorSourceTest.java | 0 .../src/test/resources/archunit.properties | 0 .../src/test/resources/log4j2-test.properties | 0 .../0fbe3123-5829-4891-93a5-a99bd8413fd9 | 0 .../5a661a23-5b47-407c-9994-b6215a46c45c | 0 .../archunit-violations/stored.rules | 4 --- flink-connectors/flink-connector-datagen/pom.xml | 33 ---------------------- flink-connectors/pom.xml | 1 + 11 files changed, 18 insertions(+), 38 deletions(-) diff --git a/flink-connectors/flink-connector-datagen/pom.xml b/flink-connectors/flink-connector-datagen-test/pom.xml similarity index 83% copy from flink-connectors/flink-connector-datagen/pom.xml copy to flink-connectors/flink-connector-datagen-test/pom.xml index 8063058aca4..5b89683ba20 100644 --- a/flink-connectors/flink-connector-datagen/pom.xml +++ b/flink-connectors/flink-connector-datagen-test/pom.xml @@ -28,7 +28,7 @@ <version>1.19-SNAPSHOT</version> </parent> - <artifactId>flink-connector-datagen</artifactId> + <artifactId>flink-connector-datagen-tests</artifactId> <name>Flink : Connectors : Datagen</name> <packaging>jar</packaging> @@ -65,6 +65,11 @@ <type>test-jar</type> </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <scope>test</scope> + </dependency> <!-- ArchUit test dependencies --> @@ -73,6 +78,17 @@ <artifactId>flink-architecture-tests-test</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-connector-datagen</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-test-utils-junit</artifactId> + </dependency> </dependencies> </project> diff --git a/flink-connectors/flink-connector-datagen/src/test/java/org/apache/flink/architecture/TestCodeArchitectureTest.java b/flink-connectors/flink-connector-datagen-test/src/test/java/org/apache/flink/architecture/TestCodeArchitectureTest.java similarity index 100% rename from flink-connectors/flink-connector-datagen/src/test/java/org/apache/flink/architecture/TestCodeArchitectureTest.java rename to flink-connectors/flink-connector-datagen-test/src/test/java/org/apache/flink/architecture/TestCodeArchitectureTest.java diff --git a/flink-connectors/flink-connector-datagen/src/test/java/org/apache/flink/connector/datagen/source/DataGeneratorSourceITCase.java b/flink-connectors/flink-connector-datagen-test/src/test/java/org/apache/flink/connector/datagen/source/DataGeneratorSourceITCase.java similarity index 100% rename from flink-connectors/flink-connector-datagen/src/test/java/org/apache/flink/connector/datagen/source/DataGeneratorSourceITCase.java rename to flink-connectors/flink-connector-datagen-test/src/test/java/org/apache/flink/connector/datagen/source/DataGeneratorSourceITCase.java diff --git a/flink-connectors/flink-connector-datagen/src/test/java/org/apache/flink/connector/datagen/source/DataGeneratorSourceTest.java b/flink-connectors/flink-connector-datagen-test/src/test/java/org/apache/flink/connector/datagen/source/DataGeneratorSourceTest.java similarity index 100% rename from flink-connectors/flink-connector-datagen/src/test/java/org/apache/flink/connector/datagen/source/DataGeneratorSourceTest.java rename to flink-connectors/flink-connector-datagen-test/src/test/java/org/apache/flink/connector/datagen/source/DataGeneratorSourceTest.java diff --git a/flink-connectors/flink-connector-datagen/src/test/resources/archunit.properties b/flink-connectors/flink-connector-datagen-test/src/test/resources/archunit.properties similarity index 100% rename from flink-connectors/flink-connector-datagen/src/test/resources/archunit.properties rename to flink-connectors/flink-connector-datagen-test/src/test/resources/archunit.properties diff --git a/flink-connectors/flink-connector-datagen/src/test/resources/log4j2-test.properties b/flink-connectors/flink-connector-datagen-test/src/test/resources/log4j2-test.properties similarity index 100% rename from flink-connectors/flink-connector-datagen/src/test/resources/log4j2-test.properties rename to flink-connectors/flink-connector-datagen-test/src/test/resources/log4j2-test.properties diff --git a/flink-connectors/flink-connector-datagen/archunit-violations/0fbe3123-5829-4891-93a5-a99bd8413fd9 b/flink-connectors/flink-connector-datagen/archunit-violations/0fbe3123-5829-4891-93a5-a99bd8413fd9 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/flink-connectors/flink-connector-datagen/archunit-violations/5a661a23-5b47-407c-9994-b6215a46c45c b/flink-connectors/flink-connector-datagen/archunit-violations/5a661a23-5b47-407c-9994-b6215a46c45c deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/flink-connectors/flink-connector-datagen/archunit-violations/stored.rules b/flink-connectors/flink-connector-datagen/archunit-violations/stored.rules deleted file mode 100644 index 687f775c531..00000000000 --- a/flink-connectors/flink-connector-datagen/archunit-violations/stored.rules +++ /dev/null @@ -1,4 +0,0 @@ -# -#Sun Oct 09 19:59:56 CEST 2022 -ITCASE\ tests\ should\ use\ a\ MiniCluster\ resource\ or\ extension=5a661a23-5b47-407c-9994-b6215a46c45c -Tests\ inheriting\ from\ AbstractTestBase\ should\ have\ name\ ending\ with\ ITCase=0fbe3123-5829-4891-93a5-a99bd8413fd9 diff --git a/flink-connectors/flink-connector-datagen/pom.xml b/flink-connectors/flink-connector-datagen/pom.xml index 8063058aca4..697b9d8ea5a 100644 --- a/flink-connectors/flink-connector-datagen/pom.xml +++ b/flink-connectors/flink-connector-datagen/pom.xml @@ -40,39 +40,6 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> - - <!-- test dependency --> - - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-test-utils</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <type>test-jar</type> - </dependency> - - - <!-- ArchUit test dependencies --> - - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-architecture-tests-test</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/flink-connectors/pom.xml b/flink-connectors/pom.xml index dfb64faf8d9..e4f72894ecc 100644 --- a/flink-connectors/pom.xml +++ b/flink-connectors/pom.xml @@ -41,6 +41,7 @@ under the License. <module>flink-file-sink-common</module> <module>flink-connector-files</module> <module>flink-connector-datagen</module> + <module>flink-connector-datagen-test</module> </modules> <!-- override these root dependencies as 'provided', so they don't end up