This is an automated email from the ASF dual-hosted git repository.
zabetak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 948f9fb56a0 HIVE-26310: Remove unused junit runners from test-utils
module (Stamatis Zampetakis, reviewed by Ayush Saxena)
948f9fb56a0 is described below
commit 948f9fb56a00e981cd653146de44ae82307b4f2f
Author: Stamatis Zampetakis <[email protected]>
AuthorDate: Fri Jun 10 14:29:09 2022 +0200
HIVE-26310: Remove unused junit runners from test-utils module (Stamatis
Zampetakis, reviewed by Ayush Saxena)
Closes #3358
---
testutils/pom.xml | 4 --
.../junit/runners/ConcurrentTestRunner.java | 62 --------------------
.../junit/runners/model/ConcurrentScheduler.java | 68 ----------------------
3 files changed, 134 deletions(-)
diff --git a/testutils/pom.xml b/testutils/pom.xml
index 431c4e32601..68a1205ac0e 100644
--- a/testutils/pom.xml
+++ b/testutils/pom.xml
@@ -29,10 +29,6 @@
<dependencies>
<!-- dependencies are always listed in sorted order by groupId, artifactId
-->
<!-- inter-project -->
- <dependency>
- <groupId>com.google.code.tempus-fugit</groupId>
- <artifactId>tempus-fugit</artifactId>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git
a/testutils/src/java/org/apache/hive/testutils/junit/runners/ConcurrentTestRunner.java
b/testutils/src/java/org/apache/hive/testutils/junit/runners/ConcurrentTestRunner.java
deleted file mode 100644
index ed474819acc..00000000000
---
a/testutils/src/java/org/apache/hive/testutils/junit/runners/ConcurrentTestRunner.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2009-2012, toby weston & tempus-fugit committers
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- *
- */
-package org.apache.hive.testutils.junit.runners;
-
-import static java.util.concurrent.Executors.newFixedThreadPool;
-
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.apache.hive.testutils.junit.runners.model.ConcurrentScheduler;
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.model.InitializationError;
-
-/**
- * Originally taken from
com.google.code.tempusfugit.concurrency.ConcurrentTestRunner
- */
-public class ConcurrentTestRunner extends BlockJUnit4ClassRunner {
-
- private int numThreads = 1;
-
- public ConcurrentTestRunner(Class<?> type) throws InitializationError {
- super(type);
-
- String numThreadsProp = System.getProperty("test.concurrency.num.threads");
- if (numThreadsProp != null) {
- numThreads = Integer.parseInt(numThreadsProp);
- }
-
- setScheduler(new ConcurrentScheduler(newFixedThreadPool(numThreads, new
ConcurrentTestRunnerThreadFactory())));
-
- System.err.println(">>> ConcurrenTestRunner initialize with " + numThreads
+ " threads");
- System.err.flush();
- }
-
- private static class ConcurrentTestRunnerThreadFactory implements
ThreadFactory {
- private final AtomicLong count = new AtomicLong();
-
- public Thread newThread(Runnable runnable) {
- String threadName = ConcurrentTestRunner.class.getSimpleName() +
"-Thread-" + count.getAndIncrement();
- System.err.println(">>> ConcurrentTestRunner.newThread " + threadName);
- System.err.flush();
- return new Thread(runnable, threadName);
- }
- }
-}
diff --git
a/testutils/src/java/org/apache/hive/testutils/junit/runners/model/ConcurrentScheduler.java
b/testutils/src/java/org/apache/hive/testutils/junit/runners/model/ConcurrentScheduler.java
deleted file mode 100644
index fa07356848d..00000000000
---
a/testutils/src/java/org/apache/hive/testutils/junit/runners/model/ConcurrentScheduler.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2009-2012, toby weston & tempus-fugit committers
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hive.testutils.junit.runners.model;
-
-import static
com.google.code.tempusfugit.concurrency.ExecutorServiceShutdown.shutdown;
-import static com.google.code.tempusfugit.temporal.Duration.days;
-import static java.lang.Boolean.TRUE;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.concurrent.ExecutorService;
-
-import org.junit.runners.model.RunnerScheduler;
-
-/**
- * Originally taken from
com.google.code.tempusfugit.concurrency.ConcurrentScheduler
- */
-public class ConcurrentScheduler implements RunnerScheduler {
-
- private final ExecutorService executor;
- private final OutputStream outputStream;
-
- public ConcurrentScheduler(ExecutorService executor) {
- this(executor, System.err);
- }
-
- public ConcurrentScheduler(ExecutorService executor, OutputStream
outputStream) {
- this.executor = executor;
- this.outputStream = outputStream;
- }
-
- public void schedule(Runnable childStatement) {
- executor.submit(childStatement);
- }
-
- public void finished() {
- if (!successful(shutdown(executor).waitingForCompletion(days(365)))) {
- writeln(outputStream, "scheduler shutdown timed out before tests
completed, "
- + "you may have executors hanging around...");
- }
- }
-
- private Boolean successful(Boolean completed) {
- return TRUE.equals(completed);
- }
-
- private void writeln(OutputStream stream, String string) {
- try {
- stream.write(string.getBytes());
- stream.write(System.getProperty("line.separator").getBytes());
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-}
