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 49a05f4fb94370dd04480c16b04732c8a854cbbb Author: Matthias Pohl <matth...@ververica.com> AuthorDate: Fri Nov 26 12:29:40 2021 +0100 [FLINK-25080][tests] Move TestingUtils to flink-core --- .../java/org/apache/flink}/testutils/TestingUtils.java | 17 +++++++++-------- .../runtime/jobmanager/JMXJobManagerMetricTest.java | 2 +- .../itcases/AbstractQueryableStateTestBase.java | 2 +- .../webmonitor/handlers/JarHandlerParameterTest.java | 2 +- .../flink/runtime/webmonitor/handlers/JarHandlers.java | 2 +- .../webmonitor/handlers/JarRunHandlerParameterTest.java | 2 +- .../flink/runtime/concurrent/FutureUtilsTest.java | 2 +- .../dispatcher/FileExecutionGraphInfoStoreTest.java | 2 +- .../runner/DefaultDispatcherRunnerITCase.java | 2 +- .../runner/ZooKeeperDefaultDispatcherRunnerTest.java | 2 +- .../runtime/executiongraph/ExecutionGraphTestUtils.java | 2 +- .../TestingDefaultExecutionGraphBuilder.java | 2 +- .../flink/runtime/heartbeat/HeartbeatManagerTest.java | 2 +- .../nonha/embedded/EmbeddedLeaderServiceTest.java | 2 +- .../io/network/netty/CancelPartitionRequestTest.java | 2 +- .../network/netty/ClientTransportErrorHandlingTest.java | 2 +- .../network/netty/ServerTransportErrorHandlingTest.java | 2 +- .../partition/PartialConsumePipelinedResultTest.java | 2 +- .../jobmanager/SlotCountExceedingParallelismTest.java | 2 +- .../TestingJobManagerSharedServicesBuilder.java | 2 +- .../slotpool/DeclarativeSlotPoolBridgeBuilder.java | 2 +- .../jobmaster/slotpool/SlotPoolInteractionsTest.java | 2 +- .../LeaderChangeClusterComponentsTest.java | 2 +- .../runtime/leaderelection/LeaderElectionTest.java | 2 +- .../leaderretrieval/ZooKeeperLeaderRetrievalTest.java | 2 +- .../runtime/registration/RetryingRegistrationTest.java | 2 +- .../ResourceManagerPartitionLifecycleTest.java | 2 +- .../ResourceManagerTaskExecutorTest.java | 2 +- .../runtime/resourcemanager/ResourceManagerTest.java | 2 +- .../slotmanager/DeclarativeSlotManagerBuilder.java | 2 +- .../slotmanager/DeclarativeSlotManagerTest.java | 2 +- .../slotmanager/DefaultSlotStatusSyncerTest.java | 2 +- .../slotmanager/FineGrainedSlotManagerTestBase.java | 2 +- .../slotmanager/SlotManagerConfigurationBuilder.java | 2 +- .../slotmanager/TaskExecutorManagerBuilder.java | 2 +- .../slotmanager/TaskExecutorManagerTest.java | 2 +- .../flink/runtime/rest/RestClientMultipartTest.java | 2 +- .../org/apache/flink/runtime/rest/RestClientTest.java | 2 +- .../flink/runtime/rest/RestExternalHandlersITCase.java | 2 +- .../flink/runtime/rest/RestServerEndpointITCase.java | 2 +- .../handler/cluster/JobManagerCustomLogHandlerTest.java | 2 +- .../handler/cluster/JobManagerLogListHandlerTest.java | 2 +- .../runtime/rest/handler/job/JobConfigHandlerTest.java | 2 +- .../rest/handler/job/JobExceptionsHandlerTest.java | 2 +- .../runtime/rest/handler/job/JobSubmitHandlerTest.java | 2 +- .../job/SubtaskCurrentAttemptDetailsHandlerTest.java | 2 +- .../SubtaskExecutionAttemptAccumulatorsHandlerTest.java | 2 +- .../job/SubtaskExecutionAttemptDetailsHandlerTest.java | 2 +- .../job/metrics/AggregatingMetricsHandlerTestBase.java | 2 +- .../taskmanager/AbstractTaskManagerFileHandlerTest.java | 2 +- .../taskmanager/TaskManagerDetailsHandlerTest.java | 2 +- .../taskmanager/TaskManagerLogListHandlerTest.java | 2 +- .../scheduler/DefaultExecutionGraphFactoryTest.java | 2 +- .../flink/runtime/scheduler/SchedulerTestingUtils.java | 2 +- .../scheduler/adaptive/AdaptiveSchedulerBuilder.java | 2 +- .../scheduler/benchmark/SchedulerBenchmarkBase.java | 2 +- .../taskexecutor/TaskManagerServicesBuilder.java | 2 +- .../taskexecutor/TaskSubmissionTestEnvironment.java | 2 +- .../flink/runtime/taskexecutor/slot/TaskSlotUtils.java | 2 +- .../TaskCancelAsyncProducerConsumerITCase.java | 2 +- .../flink/runtime/taskmanager/TestTaskBuilder.java | 2 +- .../threadinfo/JobVertexThreadInfoTrackerTest.java | 2 +- .../runtime/tasks/StreamTaskTerminationTest.java | 2 +- flink-test-utils-parent/flink-test-utils/pom.xml | 8 ++++++++ .../flink/test/accumulators/AccumulatorLiveITCase.java | 2 +- .../apache/flink/test/cancelling/CancelingTestBase.java | 2 +- .../flink/test/checkpointing/RescalingITCase.java | 2 +- .../flink/test/checkpointing/SavepointITCase.java | 2 +- .../JobManagerHAProcessFailureRecoveryITCase.java | 2 +- .../test/recovery/ProcessFailureCancelingITCase.java | 2 +- .../restore/AbstractOperatorRestoreTestBase.java | 2 +- .../org/apache/flink/yarn/YarnConfigurationITCase.java | 2 +- 72 files changed, 87 insertions(+), 78 deletions(-) diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestingUtils.java b/flink-core/src/test/java/org/apache/flink/testutils/TestingUtils.java similarity index 75% rename from flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestingUtils.java rename to flink-core/src/test/java/org/apache/flink/testutils/TestingUtils.java index 620ef61..94f1aa5 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestingUtils.java +++ b/flink-core/src/test/java/org/apache/flink/testutils/TestingUtils.java @@ -1,12 +1,13 @@ /* - * 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 + * 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 + * 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, @@ -15,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.runtime.testutils; +package org.apache.flink.testutils; import org.apache.flink.api.common.time.Time; import org.apache.flink.util.concurrent.ScheduledExecutor; diff --git a/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/runtime/jobmanager/JMXJobManagerMetricTest.java b/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/runtime/jobmanager/JMXJobManagerMetricTest.java index 67d265f..c4effbf 100644 --- a/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/runtime/jobmanager/JMXJobManagerMetricTest.java +++ b/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/runtime/jobmanager/JMXJobManagerMetricTest.java @@ -36,8 +36,8 @@ import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.jobgraph.tasks.CheckpointCoordinatorConfiguration; import org.apache.flink.runtime.jobgraph.tasks.JobCheckpointingSettings; import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.test.util.MiniClusterWithClientResource; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.apache.flink.util.concurrent.FutureUtils; diff --git a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/AbstractQueryableStateTestBase.java b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/AbstractQueryableStateTestBase.java index 114ff9d..39b5a36 100644 --- a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/AbstractQueryableStateTestBase.java +++ b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/AbstractQueryableStateTestBase.java @@ -52,7 +52,6 @@ import org.apache.flink.queryablestate.exceptions.UnknownKeyOrNamespaceException import org.apache.flink.runtime.jobgraph.JobGraph; import org.apache.flink.runtime.jobmaster.JobResult; import org.apache.flink.runtime.state.StateBackend; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.QueryableStateStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -62,6 +61,7 @@ import org.apache.flink.streaming.api.operators.AbstractStreamOperator; import org.apache.flink.streaming.api.operators.OneInputStreamOperator; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.testutils.ClassLoaderUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.Collector; import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.Preconditions; diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarHandlerParameterTest.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarHandlerParameterTest.java index bfbe6d7..fd187b7 100644 --- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarHandlerParameterTest.java +++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarHandlerParameterTest.java @@ -29,11 +29,11 @@ import org.apache.flink.runtime.rest.handler.HandlerRequestException; import org.apache.flink.runtime.rest.handler.RestHandlerException; import org.apache.flink.runtime.rest.messages.MessageParameter; import org.apache.flink.runtime.rest.messages.MessageQueryParameter; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.util.BlobServerResource; import org.apache.flink.runtime.webmonitor.TestingDispatcherGateway; import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever; import org.apache.flink.runtime.webmonitor.testutils.ParameterProgram; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus; diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarHandlers.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarHandlers.java index e03a0fb..5406edf 100644 --- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarHandlers.java +++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarHandlers.java @@ -25,10 +25,10 @@ import org.apache.flink.runtime.rest.handler.HandlerRequest; import org.apache.flink.runtime.rest.messages.EmptyMessageParameters; import org.apache.flink.runtime.rest.messages.EmptyRequestBody; import org.apache.flink.runtime.rest.messages.JobPlanInfo; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.webmonitor.RestfulGateway; import org.apache.flink.runtime.webmonitor.TestingDispatcherGateway; import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever; +import org.apache.flink.testutils.TestingUtils; import java.nio.file.Path; import java.util.Collections; diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandlerParameterTest.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandlerParameterTest.java index 492035f..5ad4d60 100644 --- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandlerParameterTest.java +++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandlerParameterTest.java @@ -31,10 +31,10 @@ import org.apache.flink.runtime.jobgraph.JobGraph; import org.apache.flink.runtime.jobgraph.SavepointRestoreSettings; import org.apache.flink.runtime.rest.handler.HandlerRequest; import org.apache.flink.runtime.rest.handler.RestHandlerException; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.webmonitor.TestingDispatcherGateway; import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever; import org.apache.flink.runtime.webmonitor.testutils.ParameterProgram; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.ExceptionUtils; import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/concurrent/FutureUtilsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/concurrent/FutureUtilsTest.java index a72e4b6..3132e0a 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/concurrent/FutureUtilsTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/concurrent/FutureUtilsTest.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.time.Time; import org.apache.flink.core.testutils.FlinkMatchers; import org.apache.flink.core.testutils.OneShotLatch; import org.apache.flink.runtime.messages.Acknowledge; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.testutils.executor.TestExecutorResource; import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.FlinkException; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/FileExecutionGraphInfoStoreTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/FileExecutionGraphInfoStoreTest.java index 097bdc9..ce590f4 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/FileExecutionGraphInfoStoreTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/FileExecutionGraphInfoStoreTest.java @@ -45,9 +45,9 @@ import org.apache.flink.runtime.resourcemanager.StandaloneResourceManagerFactory import org.apache.flink.runtime.rest.handler.legacy.utils.ArchivedExecutionGraphBuilder; import org.apache.flink.runtime.rpc.FatalErrorHandler; import org.apache.flink.runtime.scheduler.ExecutionGraphInfo; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.util.ManualTicker; import org.apache.flink.runtime.webmonitor.retriever.MetricQueryServiceRetriever; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.Preconditions; import org.apache.flink.util.TestLogger; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/runner/DefaultDispatcherRunnerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/runner/DefaultDispatcherRunnerITCase.java index c1a1aae..03bf6df 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/runner/DefaultDispatcherRunnerITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/runner/DefaultDispatcherRunnerITCase.java @@ -48,10 +48,10 @@ import org.apache.flink.runtime.metrics.groups.UnregisteredMetricGroups; import org.apache.flink.runtime.rpc.RpcService; import org.apache.flink.runtime.rpc.TestingRpcServiceResource; import org.apache.flink.runtime.testutils.TestingJobGraphStore; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.util.BlobServerResource; import org.apache.flink.runtime.util.LeaderConnectionInfo; import org.apache.flink.runtime.util.TestingFatalErrorHandler; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.apache.flink.shaded.guava30.com.google.common.collect.Iterables; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/runner/ZooKeeperDefaultDispatcherRunnerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/runner/ZooKeeperDefaultDispatcherRunnerTest.java index 7f4f547..1be2bfe 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/runner/ZooKeeperDefaultDispatcherRunnerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/runner/ZooKeeperDefaultDispatcherRunnerTest.java @@ -50,11 +50,11 @@ import org.apache.flink.runtime.rpc.TestingRpcService; import org.apache.flink.runtime.rpc.TestingRpcServiceResource; import org.apache.flink.runtime.testtasks.NoOpInvokable; import org.apache.flink.runtime.testutils.CommonTestUtils; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.util.LeaderConnectionInfo; import org.apache.flink.runtime.util.TestingFatalErrorHandler; import org.apache.flink.runtime.util.ZooKeeperUtils; import org.apache.flink.runtime.zookeeper.ZooKeeperResource; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.TestLogger; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ExecutionGraphTestUtils.java b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ExecutionGraphTestUtils.java index 36e0275..d3fb222 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ExecutionGraphTestUtils.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ExecutionGraphTestUtils.java @@ -37,7 +37,7 @@ import org.apache.flink.runtime.scheduler.strategy.ConsumedPartitionGroup; import org.apache.flink.runtime.scheduler.strategy.ExecutionVertexID; import org.apache.flink.runtime.testtasks.NoOpInvokable; import org.apache.flink.runtime.testutils.DirectScheduledExecutorService; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import javax.annotation.Nullable; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/TestingDefaultExecutionGraphBuilder.java b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/TestingDefaultExecutionGraphBuilder.java index 5842208..f921907 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/TestingDefaultExecutionGraphBuilder.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/TestingDefaultExecutionGraphBuilder.java @@ -41,7 +41,7 @@ import org.apache.flink.runtime.scheduler.SchedulerBase; import org.apache.flink.runtime.scheduler.VertexParallelismStore; import org.apache.flink.runtime.shuffle.ShuffleMaster; import org.apache.flink.runtime.shuffle.ShuffleTestUtils; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/heartbeat/HeartbeatManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/heartbeat/HeartbeatManagerTest.java index 98e31c7..26d6dd6 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/heartbeat/HeartbeatManagerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/heartbeat/HeartbeatManagerTest.java @@ -23,7 +23,7 @@ import org.apache.flink.core.testutils.OneShotLatch; import org.apache.flink.runtime.clusterframework.types.ResourceID; import org.apache.flink.runtime.concurrent.ManuallyTriggeredScheduledExecutor; import org.apache.flink.runtime.rpc.exceptions.RecipientUnreachableException; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.apache.flink.util.concurrent.FutureUtils; import org.apache.flink.util.concurrent.ScheduledExecutorServiceAdapter; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/nonha/embedded/EmbeddedLeaderServiceTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/nonha/embedded/EmbeddedLeaderServiceTest.java index c5229ea..61365ad 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/nonha/embedded/EmbeddedLeaderServiceTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/nonha/embedded/EmbeddedLeaderServiceTest.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.highavailability.nonha.embedded; import org.apache.flink.runtime.leaderelection.LeaderElectionService; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.junit.Assert; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/CancelPartitionRequestTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/CancelPartitionRequestTest.java index e61d97d..7bc7e99 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/CancelPartitionRequestTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/CancelPartitionRequestTest.java @@ -29,7 +29,7 @@ import org.apache.flink.runtime.io.network.partition.ResultSubpartition.BufferAn import org.apache.flink.runtime.io.network.partition.ResultSubpartitionView; import org.apache.flink.runtime.io.network.partition.consumer.InputChannelID; import org.apache.flink.runtime.io.network.util.TestPooledBufferProvider; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.shaded.netty4.io.netty.channel.Channel; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/ClientTransportErrorHandlingTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/ClientTransportErrorHandlingTest.java index 9f42c45..f32e0a9 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/ClientTransportErrorHandlingTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/ClientTransportErrorHandlingTest.java @@ -29,7 +29,7 @@ import org.apache.flink.runtime.io.network.partition.ResultPartitionID; import org.apache.flink.runtime.io.network.partition.ResultPartitionProvider; import org.apache.flink.runtime.io.network.partition.consumer.InputChannelID; import org.apache.flink.runtime.io.network.partition.consumer.RemoteInputChannel; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.shaded.netty4.io.netty.buffer.Unpooled; import org.apache.flink.shaded.netty4.io.netty.channel.Channel; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/ServerTransportErrorHandlingTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/ServerTransportErrorHandlingTest.java index 4796b35..139d5b8 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/ServerTransportErrorHandlingTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/ServerTransportErrorHandlingTest.java @@ -25,7 +25,7 @@ import org.apache.flink.runtime.io.network.partition.ResultPartitionManager; import org.apache.flink.runtime.io.network.partition.ResultSubpartitionView; import org.apache.flink.runtime.io.network.partition.consumer.InputChannelID; import org.apache.flink.runtime.io.network.util.TestPooledBufferProvider; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.shaded.netty4.io.netty.channel.Channel; import org.apache.flink.shaded.netty4.io.netty.channel.ChannelHandler; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/PartialConsumePipelinedResultTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/PartialConsumePipelinedResultTest.java index 6d1c2a0..42398ba 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/PartialConsumePipelinedResultTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/PartialConsumePipelinedResultTest.java @@ -34,7 +34,7 @@ import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.jobmanager.scheduler.SlotSharingGroup; import org.apache.flink.runtime.testutils.MiniClusterResource; import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.junit.ClassRule; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/SlotCountExceedingParallelismTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/SlotCountExceedingParallelismTest.java index 6e2aa0a..65f5637 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/SlotCountExceedingParallelismTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/SlotCountExceedingParallelismTest.java @@ -33,7 +33,7 @@ import org.apache.flink.runtime.jobgraph.JobVertex; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.testutils.MiniClusterResource; import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.types.IntValue; import org.apache.flink.util.TestLogger; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/TestingJobManagerSharedServicesBuilder.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/TestingJobManagerSharedServicesBuilder.java index c1f50f6..75b7cf2 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/TestingJobManagerSharedServicesBuilder.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/TestingJobManagerSharedServicesBuilder.java @@ -24,7 +24,7 @@ import org.apache.flink.runtime.execution.librarycache.ContextClassLoaderLibrary import org.apache.flink.runtime.execution.librarycache.LibraryCacheManager; import org.apache.flink.runtime.shuffle.ShuffleMaster; import org.apache.flink.runtime.shuffle.ShuffleTestUtils; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import java.util.concurrent.ScheduledExecutorService; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DeclarativeSlotPoolBridgeBuilder.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DeclarativeSlotPoolBridgeBuilder.java index 77a639a..a5d926c 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DeclarativeSlotPoolBridgeBuilder.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DeclarativeSlotPoolBridgeBuilder.java @@ -25,7 +25,7 @@ import org.apache.flink.runtime.concurrent.ComponentMainThreadExecutor; import org.apache.flink.runtime.jobmaster.JobMasterId; import org.apache.flink.runtime.resourcemanager.ResourceManagerGateway; import org.apache.flink.runtime.resourcemanager.utils.TestingResourceManagerGateway; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.clock.Clock; import org.apache.flink.util.clock.SystemClock; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolInteractionsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolInteractionsTest.java index 6fc3cdc..b98029c 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolInteractionsTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolInteractionsTest.java @@ -24,7 +24,7 @@ import org.apache.flink.runtime.clusterframework.types.ResourceProfile; import org.apache.flink.runtime.executiongraph.TestingComponentMainThreadExecutor; import org.apache.flink.runtime.jobmaster.SlotRequestId; import org.apache.flink.runtime.testutils.CommonTestUtils; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.TestLogger; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/LeaderChangeClusterComponentsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/LeaderChangeClusterComponentsTest.java index e8903b3..aa3a809 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/LeaderChangeClusterComponentsTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/LeaderChangeClusterComponentsTest.java @@ -34,8 +34,8 @@ import org.apache.flink.runtime.minicluster.TestingMiniCluster; import org.apache.flink.runtime.minicluster.TestingMiniClusterConfiguration; import org.apache.flink.runtime.resourcemanager.ResourceManagerServiceImpl; import org.apache.flink.runtime.testutils.CommonTestUtils; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.util.LeaderRetrievalUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.junit.AfterClass; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/LeaderElectionTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/LeaderElectionTest.java index 33e8567..28cd2b3 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/LeaderElectionTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/LeaderElectionTest.java @@ -23,9 +23,9 @@ import org.apache.flink.configuration.HighAvailabilityOptions; import org.apache.flink.runtime.highavailability.nonha.embedded.EmbeddedLeaderService; import org.apache.flink.runtime.highavailability.zookeeper.CuratorFrameworkWithUnhandledErrorListener; import org.apache.flink.runtime.rpc.FatalErrorHandler; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.util.TestingFatalErrorHandlerResource; import org.apache.flink.runtime.util.ZooKeeperUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.apache.curator.test.TestingServer; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalTest.java index 17509cd..4e34818 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalTest.java @@ -28,10 +28,10 @@ import org.apache.flink.runtime.leaderelection.LeaderElectionService; import org.apache.flink.runtime.leaderelection.TestingContender; import org.apache.flink.runtime.rpc.AddressResolution; import org.apache.flink.runtime.rpc.RpcSystem; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.util.LeaderRetrievalUtils; import org.apache.flink.runtime.util.TestingFatalErrorHandlerResource; import org.apache.flink.runtime.util.ZooKeeperUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.apache.curator.test.TestingServer; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/registration/RetryingRegistrationTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/registration/RetryingRegistrationTest.java index 95c2a6f..39480df 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/registration/RetryingRegistrationTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/registration/RetryingRegistrationTest.java @@ -20,7 +20,7 @@ package org.apache.flink.runtime.registration; import org.apache.flink.runtime.rpc.RpcService; import org.apache.flink.runtime.rpc.TestingRpcService; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.FlinkException; import org.apache.flink.util.TestLogger; import org.apache.flink.util.concurrent.FutureUtils; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerPartitionLifecycleTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerPartitionLifecycleTest.java index d42c862..bbbe025 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerPartitionLifecycleTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerPartitionLifecycleTest.java @@ -33,7 +33,7 @@ import org.apache.flink.runtime.taskexecutor.TaskExecutorHeartbeatPayload; import org.apache.flink.runtime.taskexecutor.TaskExecutorMemoryConfiguration; import org.apache.flink.runtime.taskexecutor.TestingTaskExecutorGatewayBuilder; import org.apache.flink.runtime.taskexecutor.partition.ClusterPartitionReport; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.junit.After; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTaskExecutorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTaskExecutorTest.java index e8ce7e8..a282ed3 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTaskExecutorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTaskExecutorTest.java @@ -37,7 +37,7 @@ import org.apache.flink.runtime.taskexecutor.TaskExecutorMemoryConfiguration; import org.apache.flink.runtime.taskexecutor.TaskExecutorRegistrationSuccess; import org.apache.flink.runtime.taskexecutor.TestingTaskExecutorGateway; import org.apache.flink.runtime.taskexecutor.TestingTaskExecutorGatewayBuilder; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.FlinkException; import org.apache.flink.util.TestLogger; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTest.java index 3eb533a..6f36562 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTest.java @@ -49,8 +49,8 @@ import org.apache.flink.runtime.taskexecutor.TaskExecutorGateway; import org.apache.flink.runtime.taskexecutor.TaskExecutorMemoryConfiguration; import org.apache.flink.runtime.taskexecutor.TaskExecutorThreadInfoGateway; import org.apache.flink.runtime.taskexecutor.TestingTaskExecutorGatewayBuilder; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.util.TestingFatalErrorHandler; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.FlinkException; import org.apache.flink.util.TestLogger; import org.apache.flink.util.concurrent.FutureUtils; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/DeclarativeSlotManagerBuilder.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/DeclarativeSlotManagerBuilder.java index b1fe17e..6492e06 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/DeclarativeSlotManagerBuilder.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/DeclarativeSlotManagerBuilder.java @@ -26,7 +26,7 @@ import org.apache.flink.runtime.metrics.groups.SlotManagerMetricGroup; import org.apache.flink.runtime.metrics.groups.UnregisteredMetricGroups; import org.apache.flink.runtime.resourcemanager.ResourceManagerId; import org.apache.flink.runtime.resourcemanager.WorkerResourceSpec; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.concurrent.Executors; import org.apache.flink.util.concurrent.ScheduledExecutor; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/DeclarativeSlotManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/DeclarativeSlotManagerTest.java index 94a840a..161d482 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/DeclarativeSlotManagerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/DeclarativeSlotManagerTest.java @@ -46,7 +46,7 @@ import org.apache.flink.runtime.taskexecutor.TestingTaskExecutorGatewayBuilder; import org.apache.flink.runtime.taskexecutor.exceptions.SlotAllocationException; import org.apache.flink.runtime.taskexecutor.exceptions.SlotOccupiedException; import org.apache.flink.runtime.testutils.SystemExitTrackingSecurityManager; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.FlinkException; import org.apache.flink.util.TestLogger; import org.apache.flink.util.concurrent.FutureUtils; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/DefaultSlotStatusSyncerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/DefaultSlotStatusSyncerTest.java index d00bbd2..cdd7656 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/DefaultSlotStatusSyncerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/DefaultSlotStatusSyncerTest.java @@ -32,7 +32,7 @@ import org.apache.flink.runtime.taskexecutor.SlotReport; import org.apache.flink.runtime.taskexecutor.SlotStatus; import org.apache.flink.runtime.taskexecutor.TestingTaskExecutorGateway; import org.apache.flink.runtime.taskexecutor.TestingTaskExecutorGatewayBuilder; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.apache.flink.util.concurrent.FutureUtils; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/FineGrainedSlotManagerTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/FineGrainedSlotManagerTestBase.java index b79167f..56090df 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/FineGrainedSlotManagerTestBase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/FineGrainedSlotManagerTestBase.java @@ -33,7 +33,7 @@ import org.apache.flink.runtime.slots.ResourceRequirement; import org.apache.flink.runtime.slots.ResourceRequirements; import org.apache.flink.runtime.taskexecutor.SlotStatus; import org.apache.flink.runtime.taskexecutor.TestingTaskExecutorGatewayBuilder; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.FlinkException; import org.apache.flink.util.TestLogger; import org.apache.flink.util.concurrent.FutureUtils; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/SlotManagerConfigurationBuilder.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/SlotManagerConfigurationBuilder.java index 78cd124..9f8035e 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/SlotManagerConfigurationBuilder.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/SlotManagerConfigurationBuilder.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.time.Time; import org.apache.flink.configuration.MemorySize; import org.apache.flink.configuration.ResourceManagerOptions; import org.apache.flink.runtime.resourcemanager.WorkerResourceSpec; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; /** Builder for {@link SlotManagerConfiguration}. */ public class SlotManagerConfigurationBuilder { diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/TaskExecutorManagerBuilder.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/TaskExecutorManagerBuilder.java index cd4cc8f..158387e 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/TaskExecutorManagerBuilder.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/TaskExecutorManagerBuilder.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.resourcemanager.slotmanager; import org.apache.flink.api.common.time.Time; import org.apache.flink.runtime.resourcemanager.WorkerResourceSpec; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.concurrent.Executors; import org.apache.flink.util.concurrent.ScheduledExecutor; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/TaskExecutorManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/TaskExecutorManagerTest.java index 630c001..d221929 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/TaskExecutorManagerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/TaskExecutorManagerTest.java @@ -29,7 +29,7 @@ import org.apache.flink.runtime.resourcemanager.registration.TaskExecutorConnect import org.apache.flink.runtime.taskexecutor.SlotReport; import org.apache.flink.runtime.taskexecutor.SlotStatus; import org.apache.flink.runtime.taskexecutor.TestingTaskExecutorGatewayBuilder; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.junit.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestClientMultipartTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestClientMultipartTest.java index 97b5992..ea7b1fa 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestClientMultipartTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestClientMultipartTest.java @@ -23,7 +23,7 @@ import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.rest.messages.EmptyMessageParameters; import org.apache.flink.runtime.rest.messages.EmptyRequestBody; import org.apache.flink.runtime.rest.messages.EmptyResponseBody; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.ConfigurationException; import org.apache.flink.util.TestLogger; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestClientTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestClientTest.java index 06aad7e..c76b237 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestClientTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestClientTest.java @@ -25,7 +25,7 @@ import org.apache.flink.runtime.rest.messages.EmptyRequestBody; import org.apache.flink.runtime.rest.messages.EmptyResponseBody; import org.apache.flink.runtime.rest.messages.MessageHeaders; import org.apache.flink.runtime.rest.versioning.RestAPIVersion; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.NetUtils; import org.apache.flink.util.TestLogger; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestExternalHandlersITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestExternalHandlersITCase.java index 9fd6dcc..3c6f6b7 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestExternalHandlersITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestExternalHandlersITCase.java @@ -30,7 +30,7 @@ import org.apache.flink.runtime.rest.messages.MessageHeaders; import org.apache.flink.runtime.rest.messages.RequestBody; import org.apache.flink.runtime.rest.messages.ResponseBody; import org.apache.flink.runtime.rest.util.TestRestServerEndpoint; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.testutils.junit.extensions.ContextClassLoaderExtension; import org.apache.flink.util.ConfigurationException; import org.apache.flink.util.TestLogger; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointITCase.java index 58e47b2..a489b24 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointITCase.java @@ -48,10 +48,10 @@ import org.apache.flink.runtime.rest.util.TestRestHandler; import org.apache.flink.runtime.rest.util.TestRestServerEndpoint; import org.apache.flink.runtime.rest.versioning.RestAPIVersion; import org.apache.flink.runtime.rpc.RpcUtils; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.webmonitor.RestfulGateway; import org.apache.flink.runtime.webmonitor.TestingRestfulGateway; import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.ConfigurationException; import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.FlinkRuntimeException; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerCustomLogHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerCustomLogHandlerTest.java index ac51d06..8cbe2c5 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerCustomLogHandlerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerCustomLogHandlerTest.java @@ -23,8 +23,8 @@ import org.apache.flink.runtime.rest.handler.HandlerRequestException; import org.apache.flink.runtime.rest.messages.EmptyRequestBody; import org.apache.flink.runtime.rest.messages.cluster.FileMessageParameters; import org.apache.flink.runtime.rest.messages.cluster.JobManagerCustomLogHeaders; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.webmonitor.TestingDispatcherGateway; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.apache.commons.io.FileUtils; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerLogListHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerLogListHandlerTest.java index abc64e8..4fb20be 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerLogListHandlerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerLogListHandlerTest.java @@ -26,8 +26,8 @@ import org.apache.flink.runtime.rest.messages.EmptyRequestBody; import org.apache.flink.runtime.rest.messages.LogInfo; import org.apache.flink.runtime.rest.messages.LogListInfo; import org.apache.flink.runtime.rest.messages.cluster.JobManagerLogListHeaders; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.webmonitor.TestingDispatcherGateway; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.StringUtils; import org.apache.flink.util.TestLogger; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobConfigHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobConfigHandlerTest.java index 4446390..9a92331 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobConfigHandlerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobConfigHandlerTest.java @@ -32,7 +32,7 @@ import org.apache.flink.runtime.rest.messages.JobConfigHeaders; import org.apache.flink.runtime.rest.messages.JobConfigInfo; import org.apache.flink.runtime.rest.messages.JobIDPathParameter; import org.apache.flink.runtime.rest.messages.JobMessageParameters; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.junit.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobExceptionsHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobExceptionsHandlerTest.java index ce7d9dd..9a80f39 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobExceptionsHandlerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobExceptionsHandlerTest.java @@ -47,8 +47,8 @@ import org.apache.flink.runtime.scheduler.exceptionhistory.ExceptionHistoryEntry import org.apache.flink.runtime.scheduler.exceptionhistory.RootExceptionHistoryEntry; import org.apache.flink.runtime.taskmanager.LocalTaskManagerLocation; import org.apache.flink.runtime.taskmanager.TaskManagerLocation; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.util.EvictingBoundedList; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.SerializedThrowable; import org.apache.flink.util.TestLogger; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobSubmitHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobSubmitHandlerTest.java index 432ae30..4f60708 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobSubmitHandlerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobSubmitHandlerTest.java @@ -34,8 +34,8 @@ import org.apache.flink.runtime.rest.handler.RestHandlerException; import org.apache.flink.runtime.rest.messages.EmptyMessageParameters; import org.apache.flink.runtime.rest.messages.job.JobSubmitRequestBody; import org.apache.flink.runtime.rpc.RpcUtils; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.webmonitor.TestingDispatcherGateway; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.TestLogger; import org.apache.flink.util.concurrent.FutureUtils; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskCurrentAttemptDetailsHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskCurrentAttemptDetailsHandlerTest.java index 835c5ce..e23dfda 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskCurrentAttemptDetailsHandlerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskCurrentAttemptDetailsHandlerTest.java @@ -43,8 +43,8 @@ import org.apache.flink.runtime.rest.messages.job.SubtaskExecutionAttemptDetails import org.apache.flink.runtime.rest.messages.job.SubtaskMessageParameters; import org.apache.flink.runtime.rest.messages.job.metrics.IOMetricsInfo; import org.apache.flink.runtime.taskmanager.LocalTaskManagerLocation; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.util.EvictingBoundedList; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.junit.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptAccumulatorsHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptAccumulatorsHandlerTest.java index 57dea7e..13910dd 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptAccumulatorsHandlerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptAccumulatorsHandlerTest.java @@ -35,7 +35,7 @@ import org.apache.flink.runtime.rest.messages.job.SubtaskAttemptMessageParameter import org.apache.flink.runtime.rest.messages.job.SubtaskExecutionAttemptAccumulatorsHeaders; import org.apache.flink.runtime.rest.messages.job.SubtaskExecutionAttemptAccumulatorsInfo; import org.apache.flink.runtime.rest.messages.job.UserAccumulator; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.OptionalFailure; import org.apache.flink.util.TestLogger; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptDetailsHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptDetailsHandlerTest.java index 575edd0..57bb244 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptDetailsHandlerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptDetailsHandlerTest.java @@ -45,8 +45,8 @@ import org.apache.flink.runtime.rest.messages.job.SubtaskAttemptPathParameter; import org.apache.flink.runtime.rest.messages.job.SubtaskExecutionAttemptDetailsHeaders; import org.apache.flink.runtime.rest.messages.job.SubtaskExecutionAttemptDetailsInfo; import org.apache.flink.runtime.rest.messages.job.metrics.IOMetricsInfo; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.util.EvictingBoundedList; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.junit.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingMetricsHandlerTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingMetricsHandlerTestBase.java index 4ff19d9..0369e62 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingMetricsHandlerTestBase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingMetricsHandlerTestBase.java @@ -31,10 +31,10 @@ import org.apache.flink.runtime.rest.messages.EmptyRequestBody; import org.apache.flink.runtime.rest.messages.job.metrics.AbstractAggregatedMetricsParameters; import org.apache.flink.runtime.rest.messages.job.metrics.AggregatedMetric; import org.apache.flink.runtime.rest.messages.job.metrics.AggregatedMetricsResponseBody; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.webmonitor.RestfulGateway; import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever; import org.apache.flink.runtime.webmonitor.retriever.MetricQueryServiceRetriever; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.apache.flink.util.concurrent.Executors; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/AbstractTaskManagerFileHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/AbstractTaskManagerFileHandlerTest.java index 531bfe0..78e8bdc 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/AbstractTaskManagerFileHandlerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/AbstractTaskManagerFileHandlerTest.java @@ -37,9 +37,9 @@ import org.apache.flink.runtime.rest.messages.UntypedResponseMessageHeaders; import org.apache.flink.runtime.rest.messages.taskmanager.TaskManagerFileMessageParameters; import org.apache.flink.runtime.rest.messages.taskmanager.TaskManagerIdPathParameter; import org.apache.flink.runtime.rest.messages.taskmanager.TaskManagerMessageParameters; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.webmonitor.RestfulGateway; import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.FileUtils; import org.apache.flink.util.FlinkException; import org.apache.flink.util.Preconditions; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerDetailsHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerDetailsHandlerTest.java index c53c9dc..ee6f15c 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerDetailsHandlerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerDetailsHandlerTest.java @@ -38,7 +38,7 @@ import org.apache.flink.runtime.rest.messages.taskmanager.TaskManagerIdPathParam import org.apache.flink.runtime.rest.messages.taskmanager.TaskManagerInfo; import org.apache.flink.runtime.rest.messages.taskmanager.TaskManagerMetricsInfo; import org.apache.flink.runtime.taskexecutor.TaskExecutorMemoryConfiguration; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerLogListHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerLogListHandlerTest.java index 4f8dd42..8fdc9c8 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerLogListHandlerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerLogListHandlerTest.java @@ -30,7 +30,7 @@ import org.apache.flink.runtime.rest.messages.LogListInfo; import org.apache.flink.runtime.rest.messages.taskmanager.TaskManagerIdPathParameter; import org.apache.flink.runtime.rest.messages.taskmanager.TaskManagerLogsHeaders; import org.apache.flink.runtime.rest.messages.taskmanager.TaskManagerMessageParameters; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.apache.flink.util.concurrent.FutureUtils; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/DefaultExecutionGraphFactoryTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/DefaultExecutionGraphFactoryTest.java index ae967ce..08eb46f 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/DefaultExecutionGraphFactoryTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/DefaultExecutionGraphFactoryTest.java @@ -38,7 +38,7 @@ import org.apache.flink.runtime.jobmaster.TestUtils; import org.apache.flink.runtime.metrics.groups.UnregisteredMetricGroups; import org.apache.flink.runtime.shuffle.ShuffleTestUtils; import org.apache.flink.runtime.testtasks.NoOpInvokable; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.hamcrest.MatcherAssert; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/SchedulerTestingUtils.java b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/SchedulerTestingUtils.java index 8c1e9be..d214d80 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/SchedulerTestingUtils.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/SchedulerTestingUtils.java @@ -67,7 +67,7 @@ import org.apache.flink.runtime.state.CheckpointStorage; import org.apache.flink.runtime.state.StateBackend; import org.apache.flink.runtime.taskexecutor.TaskExecutorOperatorEventGateway; import org.apache.flink.runtime.taskmanager.TaskExecutionState; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.SerializedValue; import org.apache.flink.util.TernaryBoolean; import org.apache.flink.util.concurrent.ScheduledExecutor; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveSchedulerBuilder.java b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveSchedulerBuilder.java index 0bdabaa..68a2e53 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveSchedulerBuilder.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveSchedulerBuilder.java @@ -44,7 +44,7 @@ import org.apache.flink.runtime.scheduler.ExecutionGraphFactory; import org.apache.flink.runtime.scheduler.adaptive.allocator.SlotAllocator; import org.apache.flink.runtime.shuffle.ShuffleMaster; import org.apache.flink.runtime.shuffle.ShuffleTestUtils; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.FatalExitExceptionHandler; import javax.annotation.Nullable; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/benchmark/SchedulerBenchmarkBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/benchmark/SchedulerBenchmarkBase.java index 192b205..bf50fe8 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/benchmark/SchedulerBenchmarkBase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/benchmark/SchedulerBenchmarkBase.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.scheduler.benchmark; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import java.util.concurrent.ScheduledExecutorService; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskManagerServicesBuilder.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskManagerServicesBuilder.java index d46c21c..e7abb13 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskManagerServicesBuilder.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskManagerServicesBuilder.java @@ -34,7 +34,7 @@ import org.apache.flink.runtime.taskexecutor.slot.TestingTaskSlotTable; import org.apache.flink.runtime.taskmanager.LocalUnresolvedTaskManagerLocation; import org.apache.flink.runtime.taskmanager.Task; import org.apache.flink.runtime.taskmanager.UnresolvedTaskManagerLocation; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskSubmissionTestEnvironment.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskSubmissionTestEnvironment.java index 2136166..b0a9fcf 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskSubmissionTestEnvironment.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskSubmissionTestEnvironment.java @@ -57,9 +57,9 @@ import org.apache.flink.runtime.taskmanager.NoOpTaskManagerActions; import org.apache.flink.runtime.taskmanager.Task; import org.apache.flink.runtime.taskmanager.TaskManagerActions; import org.apache.flink.runtime.taskmanager.TestCheckpointResponder; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.util.ConfigurationParserUtils; import org.apache.flink.runtime.util.TestingFatalErrorHandler; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.concurrent.Executors; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/slot/TaskSlotUtils.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/slot/TaskSlotUtils.java index 23c01e9..6255316 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/slot/TaskSlotUtils.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/slot/TaskSlotUtils.java @@ -23,7 +23,7 @@ import org.apache.flink.configuration.MemorySize; import org.apache.flink.runtime.clusterframework.types.AllocationID; import org.apache.flink.runtime.clusterframework.types.ResourceProfile; import org.apache.flink.runtime.memory.MemoryManager; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.concurrent.Executors; /** Testing utility and factory methods for {@link TaskSlotTable} and {@link TaskSlot}s. */ diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskCancelAsyncProducerConsumerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskCancelAsyncProducerConsumerITCase.java index 9dcaefd..09d60e6 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskCancelAsyncProducerConsumerITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskCancelAsyncProducerConsumerITCase.java @@ -42,7 +42,7 @@ import org.apache.flink.runtime.jobmanager.scheduler.SlotSharingGroup; import org.apache.flink.runtime.minicluster.MiniCluster; import org.apache.flink.runtime.testutils.MiniClusterExtension; import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.types.LongValue; import org.apache.flink.util.TestLoggerExtension; import org.apache.flink.util.concurrent.FutureUtils; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TestTaskBuilder.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TestTaskBuilder.java index dec19f8..527e16b 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TestTaskBuilder.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TestTaskBuilder.java @@ -52,8 +52,8 @@ import org.apache.flink.runtime.taskexecutor.KvStateService; import org.apache.flink.runtime.taskexecutor.NoOpPartitionProducerStateChecker; import org.apache.flink.runtime.taskexecutor.PartitionProducerStateChecker; import org.apache.flink.runtime.taskexecutor.TestGlobalAggregateManager; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.util.TestingTaskManagerRuntimeInfo; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.Preconditions; import org.apache.flink.util.SerializedValue; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/webmonitor/threadinfo/JobVertexThreadInfoTrackerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/webmonitor/threadinfo/JobVertexThreadInfoTrackerTest.java index 934b045..099e5a8 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/webmonitor/threadinfo/JobVertexThreadInfoTrackerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/webmonitor/threadinfo/JobVertexThreadInfoTrackerTest.java @@ -30,8 +30,8 @@ import org.apache.flink.runtime.messages.ThreadInfoSample; import org.apache.flink.runtime.resourcemanager.ResourceManagerGateway; import org.apache.flink.runtime.resourcemanager.utils.TestingResourceManagerGateway; import org.apache.flink.runtime.taskexecutor.TaskExecutorThreadInfoGateway; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.util.JvmUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.apache.flink.shaded.guava30.com.google.common.cache.Cache; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTerminationTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTerminationTest.java index 000330f..9a87d04 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTerminationTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTerminationTest.java @@ -72,12 +72,12 @@ import org.apache.flink.runtime.taskmanager.NoOpTaskOperatorEventGateway; import org.apache.flink.runtime.taskmanager.Task; import org.apache.flink.runtime.taskmanager.TaskManagerActions; import org.apache.flink.runtime.taskmanager.TaskManagerRuntimeInfo; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.util.TestingTaskManagerRuntimeInfo; import org.apache.flink.streaming.api.graph.StreamConfig; import org.apache.flink.streaming.api.operators.AbstractStreamOperator; import org.apache.flink.streaming.api.operators.StreamOperator; import org.apache.flink.streaming.runtime.tasks.mailbox.MailboxDefaultAction; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.FlinkException; import org.apache.flink.util.SerializedValue; import org.apache.flink.util.TestLogger; diff --git a/flink-test-utils-parent/flink-test-utils/pom.xml b/flink-test-utils-parent/flink-test-utils/pom.xml index b7f1ba6..06b1872 100644 --- a/flink-test-utils-parent/flink-test-utils/pom.xml +++ b/flink-test-utils-parent/flink-test-utils/pom.xml @@ -58,6 +58,14 @@ under the License. </dependency> <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-core</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>compile</scope> + </dependency> + + <dependency> <!-- provides fallback AkkaRpcSystem loader for the IDE --> <groupId>org.apache.flink</groupId> <artifactId>flink-rpc-akka-loader</artifactId> diff --git a/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorLiveITCase.java b/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorLiveITCase.java index 37c4101..aa7f333 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorLiveITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorLiveITCase.java @@ -39,10 +39,10 @@ import org.apache.flink.optimizer.plantranslate.JobGraphGenerator; import org.apache.flink.runtime.jobgraph.JobGraph; import org.apache.flink.runtime.minicluster.MiniClusterJobClient; import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.test.util.MiniClusterWithClientResource; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.Collector; import org.apache.flink.util.TestLogger; import org.apache.flink.util.concurrent.FutureUtils; diff --git a/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancelingTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancelingTestBase.java index 6d5ee53..ebed95b 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancelingTestBase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancelingTestBase.java @@ -34,8 +34,8 @@ import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.optimizer.plantranslate.JobGraphGenerator; import org.apache.flink.runtime.jobgraph.JobGraph; import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.test.util.MiniClusterWithClientResource; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.TestLogger; import org.junit.Assert; diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/RescalingITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/RescalingITCase.java index 5511455..15a8997 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/RescalingITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/RescalingITCase.java @@ -44,7 +44,6 @@ import org.apache.flink.runtime.state.FunctionInitializationContext; import org.apache.flink.runtime.state.FunctionSnapshotContext; import org.apache.flink.runtime.state.KeyGroupRangeAssignment; import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.streaming.api.checkpoint.CheckpointedFunction; import org.apache.flink.streaming.api.checkpoint.ListCheckpointed; import org.apache.flink.streaming.api.datastream.DataStream; @@ -54,6 +53,7 @@ import org.apache.flink.streaming.api.functions.sink.SinkFunction; import org.apache.flink.streaming.api.functions.source.RichParallelSourceFunction; import org.apache.flink.streaming.api.functions.source.SourceFunction; import org.apache.flink.test.util.MiniClusterWithClientResource; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.Collector; import org.apache.flink.util.TestLogger; import org.apache.flink.util.concurrent.FutureUtils; diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java index 42077d8..b8348f9 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java @@ -66,7 +66,6 @@ import org.apache.flink.runtime.state.StateSnapshotContext; import org.apache.flink.runtime.testtasks.BlockingNoOpInvokable; import org.apache.flink.runtime.testutils.CommonTestUtils; import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.streaming.api.checkpoint.CheckpointedFunction; import org.apache.flink.streaming.api.checkpoint.ListCheckpointed; import org.apache.flink.streaming.api.datastream.DataStream; @@ -85,6 +84,7 @@ import org.apache.flink.streaming.api.operators.OneInputStreamOperator; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.test.util.MiniClusterWithClientResource; import org.apache.flink.testutils.EntropyInjectingTestFileSystem; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.Collector; import org.apache.flink.util.FlinkException; import org.apache.flink.util.TestLogger; diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHAProcessFailureRecoveryITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHAProcessFailureRecoveryITCase.java index dd054cb..aafd8c6 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHAProcessFailureRecoveryITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHAProcessFailureRecoveryITCase.java @@ -47,9 +47,9 @@ import org.apache.flink.runtime.rpc.RpcUtils; import org.apache.flink.runtime.taskexecutor.TaskExecutorResourceUtils; import org.apache.flink.runtime.taskexecutor.TaskManagerRunner; import org.apache.flink.runtime.testutils.DispatcherProcess; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.testutils.ZooKeeperTestUtils; import org.apache.flink.runtime.zookeeper.ZooKeeperTestEnvironment; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.Collector; import org.apache.flink.util.TestLogger; import org.apache.flink.util.concurrent.FutureUtils; diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/ProcessFailureCancelingITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/ProcessFailureCancelingITCase.java index 86d6c1a..6e191c7 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/recovery/ProcessFailureCancelingITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/ProcessFailureCancelingITCase.java @@ -47,7 +47,6 @@ import org.apache.flink.runtime.rpc.AddressResolution; import org.apache.flink.runtime.rpc.RpcService; import org.apache.flink.runtime.rpc.RpcSystem; import org.apache.flink.runtime.rpc.RpcUtils; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.runtime.util.BlobServerResource; import org.apache.flink.runtime.util.TestingFatalErrorHandler; import org.apache.flink.runtime.webmonitor.retriever.impl.VoidMetricQueryServiceRetriever; @@ -55,6 +54,7 @@ import org.apache.flink.runtime.zookeeper.ZooKeeperResource; import org.apache.flink.test.recovery.AbstractTaskManagerProcessFailureRecoveryTest.TaskExecutorProcessEntryPoint; import org.apache.flink.test.util.TestProcessBuilder; import org.apache.flink.test.util.TestProcessBuilder.TestProcess; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.TestLogger; diff --git a/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/AbstractOperatorRestoreTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/AbstractOperatorRestoreTestBase.java index fbee649..a21958e 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/AbstractOperatorRestoreTestBase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/AbstractOperatorRestoreTestBase.java @@ -29,11 +29,11 @@ import org.apache.flink.runtime.jobgraph.SavepointRestoreSettings; import org.apache.flink.runtime.state.StateBackend; import org.apache.flink.runtime.state.memory.MemoryStateBackend; import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; -import org.apache.flink.runtime.testutils.TestingUtils; import org.apache.flink.streaming.api.CheckpointingMode; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.graph.StreamingJobGraphGenerator; import org.apache.flink.test.util.MiniClusterWithClientResource; +import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.TestLogger; import org.apache.flink.util.concurrent.FutureUtils; diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java index 641a0b5..2f35b98 100644 --- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java +++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java @@ -37,7 +37,7 @@ import org.apache.flink.runtime.rest.messages.EmptyRequestBody; import org.apache.flink.runtime.rest.messages.taskmanager.TaskManagerInfo; import org.apache.flink.runtime.rest.messages.taskmanager.TaskManagersHeaders; import org.apache.flink.runtime.rest.messages.taskmanager.TaskManagersInfo; -import org.apache.flink.runtime.testutils.TestingUtils; +import org.apache.flink.testutils.TestingUtils; import org.apache.hadoop.fs.Path; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;