From 374e0bf29f66ee62d7008ab03fdf392e131371ec Mon Sep 17 00:00:00 2001 From: Robinson Date: Sun, 3 Jan 2021 20:25:26 +0100 Subject: [PATCH] cleaned up test class names --- ...orArgsWithExtraSpaceTest.kt => ArgsWithExtraSpaceTest.kt} | 2 +- .../{ProcessExecutorBigOutputTest.kt => BigOutputTest.kt} | 4 ++-- .../{ProcessExecutorCancelJavaTest.kt => CancelJavaTest.kt} | 2 +- .../executor/{ProcessExecutorCancelTest.kt => CancelTest.kt} | 2 +- ...{ProcessExecutorCommandLineTest.kt => CommandLineTest.kt} | 4 ++-- .../{ProcessExecutorExitValueTest.kt => ExitValueTest.kt} | 4 ++-- .../{ProcessExecutorHelloWorldTest.kt => HelloWorldTest.kt} | 2 +- .../{ProcessInitExceptionTest.kt => InitExceptionTest.kt} | 2 +- ...{ProcessExecutorInputStreamTest.kt => InputStreamTest.kt} | 2 +- .../executor/{ProcessExecutorLoggerTest.kt => LoggerTest.kt} | 2 +- .../executor/{ProcessExecutorMainTest.kt => MainTest.kt} | 0 test/dorkbox/executor/ProcessListenerThrowTest.kt | 2 +- ...{ProcessExecutorStreamCloseTest.kt => StreamCloseTest.kt} | 2 +- .../{ProcessListenerSuccessTest.kt => SuccessTest.kt} | 2 +- .../{ProcessExecutorTimeoutTest.kt => TimeoutTest.kt} | 5 ++--- 15 files changed, 18 insertions(+), 19 deletions(-) rename test/dorkbox/executor/{ProcessExecutorArgsWithExtraSpaceTest.kt => ArgsWithExtraSpaceTest.kt} (97%) rename test/dorkbox/executor/{ProcessExecutorBigOutputTest.kt => BigOutputTest.kt} (97%) rename test/dorkbox/executor/{ProcessExecutorCancelJavaTest.kt => CancelJavaTest.kt} (98%) rename test/dorkbox/executor/{ProcessExecutorCancelTest.kt => CancelTest.kt} (99%) rename test/dorkbox/executor/{ProcessExecutorCommandLineTest.kt => CommandLineTest.kt} (97%) rename test/dorkbox/executor/{ProcessExecutorExitValueTest.kt => ExitValueTest.kt} (97%) rename test/dorkbox/executor/{ProcessExecutorHelloWorldTest.kt => HelloWorldTest.kt} (99%) rename test/dorkbox/executor/{ProcessInitExceptionTest.kt => InitExceptionTest.kt} (98%) rename test/dorkbox/executor/{ProcessExecutorInputStreamTest.kt => InputStreamTest.kt} (98%) rename test/dorkbox/executor/{ProcessExecutorLoggerTest.kt => LoggerTest.kt} (98%) rename test/dorkbox/executor/{ProcessExecutorMainTest.kt => MainTest.kt} (100%) rename test/dorkbox/executor/{ProcessExecutorStreamCloseTest.kt => StreamCloseTest.kt} (98%) rename test/dorkbox/executor/{ProcessListenerSuccessTest.kt => SuccessTest.kt} (98%) rename test/dorkbox/executor/{ProcessExecutorTimeoutTest.kt => TimeoutTest.kt} (97%) diff --git a/test/dorkbox/executor/ProcessExecutorArgsWithExtraSpaceTest.kt b/test/dorkbox/executor/ArgsWithExtraSpaceTest.kt similarity index 97% rename from test/dorkbox/executor/ProcessExecutorArgsWithExtraSpaceTest.kt rename to test/dorkbox/executor/ArgsWithExtraSpaceTest.kt index c2162fd..0ed2457 100644 --- a/test/dorkbox/executor/ProcessExecutorArgsWithExtraSpaceTest.kt +++ b/test/dorkbox/executor/ArgsWithExtraSpaceTest.kt @@ -32,7 +32,7 @@ import org.junit.Test * * @see ArgumentsAsList */ -class ProcessExecutorArgsWithExtraSpaceTest { +class ArgsWithExtraSpaceTest { @Test @Throws(Exception::class) fun testReadOutputAndError() { diff --git a/test/dorkbox/executor/ProcessExecutorBigOutputTest.kt b/test/dorkbox/executor/BigOutputTest.kt similarity index 97% rename from test/dorkbox/executor/ProcessExecutorBigOutputTest.kt rename to test/dorkbox/executor/BigOutputTest.kt index 9bd7873..96e5142 100644 --- a/test/dorkbox/executor/ProcessExecutorBigOutputTest.kt +++ b/test/dorkbox/executor/BigOutputTest.kt @@ -25,7 +25,7 @@ import kotlinx.coroutines.runBlocking import org.junit.Assert import org.junit.Test import java.io.ByteArrayOutputStream -import java.util.concurrent.TimeUnit +import java.util.concurrent.* /** * Tests reading large output that doesn't fit into a buffer between this process and sub process. @@ -36,7 +36,7 @@ import java.util.concurrent.TimeUnit * * @see BigOutput */ -class ProcessExecutorBigOutputTest { +class BigOutputTest { companion object { private fun repeat(s: String): String { val sb = StringBuffer(BigOutput.LENGTH) diff --git a/test/dorkbox/executor/ProcessExecutorCancelJavaTest.kt b/test/dorkbox/executor/CancelJavaTest.kt similarity index 98% rename from test/dorkbox/executor/ProcessExecutorCancelJavaTest.kt rename to test/dorkbox/executor/CancelJavaTest.kt index 2e25a41..8594d6b 100644 --- a/test/dorkbox/executor/ProcessExecutorCancelJavaTest.kt +++ b/test/dorkbox/executor/CancelJavaTest.kt @@ -30,7 +30,7 @@ import org.hamcrest.MatcherAssert import org.junit.Assert import org.junit.Test -class ProcessExecutorCancelJavaTest { +class CancelJavaTest { private val javaCommand: String by lazy { TestSetup.getFile(HelloWorld::class.java) } diff --git a/test/dorkbox/executor/ProcessExecutorCancelTest.kt b/test/dorkbox/executor/CancelTest.kt similarity index 99% rename from test/dorkbox/executor/ProcessExecutorCancelTest.kt rename to test/dorkbox/executor/CancelTest.kt index a7ba051..fc64f4b 100644 --- a/test/dorkbox/executor/ProcessExecutorCancelTest.kt +++ b/test/dorkbox/executor/CancelTest.kt @@ -31,7 +31,7 @@ import org.junit.Assert import org.junit.Test import java.util.* -class ProcessExecutorCancelTest { +class CancelTest { private val writerLoopCommand: List by lazy { listOf("java", TestSetup.getFile(Loop::class.java)) } diff --git a/test/dorkbox/executor/ProcessExecutorCommandLineTest.kt b/test/dorkbox/executor/CommandLineTest.kt similarity index 97% rename from test/dorkbox/executor/ProcessExecutorCommandLineTest.kt rename to test/dorkbox/executor/CommandLineTest.kt index 1294e2a..893f98e 100644 --- a/test/dorkbox/executor/ProcessExecutorCommandLineTest.kt +++ b/test/dorkbox/executor/CommandLineTest.kt @@ -24,12 +24,12 @@ import org.junit.Assert import org.junit.Test import java.io.IOException import java.util.* -import java.util.concurrent.TimeoutException +import java.util.concurrent.* /** * Tests passing command line arguments to a Java process. */ -class ProcessExecutorCommandLineTest { +class CommandLineTest { @Test @Throws(Exception::class) fun testOneArg() { diff --git a/test/dorkbox/executor/ProcessExecutorExitValueTest.kt b/test/dorkbox/executor/ExitValueTest.kt similarity index 97% rename from test/dorkbox/executor/ProcessExecutorExitValueTest.kt rename to test/dorkbox/executor/ExitValueTest.kt index 842d82a..850cba9 100644 --- a/test/dorkbox/executor/ProcessExecutorExitValueTest.kt +++ b/test/dorkbox/executor/ExitValueTest.kt @@ -24,9 +24,9 @@ import dorkbox.executor.samples.ExitLikeABoss import dorkbox.executor.samples.TestSetup import kotlinx.coroutines.runBlocking import org.junit.Test -import java.util.concurrent.TimeUnit +import java.util.concurrent.* -class ProcessExecutorExitValueTest { +class ExitValueTest { companion object { private fun exitLikeABoss(exitValue: Int): List { return listOf("java", TestSetup.getFile(ExitLikeABoss::class.java), exitValue.toString()) diff --git a/test/dorkbox/executor/ProcessExecutorHelloWorldTest.kt b/test/dorkbox/executor/HelloWorldTest.kt similarity index 99% rename from test/dorkbox/executor/ProcessExecutorHelloWorldTest.kt rename to test/dorkbox/executor/HelloWorldTest.kt index 0252974..93872b7 100644 --- a/test/dorkbox/executor/ProcessExecutorHelloWorldTest.kt +++ b/test/dorkbox/executor/HelloWorldTest.kt @@ -35,7 +35,7 @@ import java.io.ByteArrayOutputStream * * @see HelloWorld */ -class ProcessExecutorHelloWorldTest { +class HelloWorldTest { @Test @Throws(Exception::class) fun testReadOutputAndError() { diff --git a/test/dorkbox/executor/ProcessInitExceptionTest.kt b/test/dorkbox/executor/InitExceptionTest.kt similarity index 98% rename from test/dorkbox/executor/ProcessInitExceptionTest.kt rename to test/dorkbox/executor/InitExceptionTest.kt index 2470167..434ad58 100644 --- a/test/dorkbox/executor/ProcessInitExceptionTest.kt +++ b/test/dorkbox/executor/InitExceptionTest.kt @@ -23,7 +23,7 @@ import org.junit.Assert import org.junit.Test import java.io.IOException -class ProcessInitExceptionTest { +class InitExceptionTest { @Test @Throws(Exception::class) fun testNull() { diff --git a/test/dorkbox/executor/ProcessExecutorInputStreamTest.kt b/test/dorkbox/executor/InputStreamTest.kt similarity index 98% rename from test/dorkbox/executor/ProcessExecutorInputStreamTest.kt rename to test/dorkbox/executor/InputStreamTest.kt index de0e5ed..c8aa63c 100644 --- a/test/dorkbox/executor/ProcessExecutorInputStreamTest.kt +++ b/test/dorkbox/executor/InputStreamTest.kt @@ -29,7 +29,7 @@ import java.io.PipedInputStream import java.io.PipedOutputStream import java.util.concurrent.TimeUnit -class ProcessExecutorInputStreamTest { +class InputStreamTest { @Test @Throws(Exception::class) fun testWritingToProcessAndReadingAfterProcessQuit() { diff --git a/test/dorkbox/executor/ProcessExecutorLoggerTest.kt b/test/dorkbox/executor/LoggerTest.kt similarity index 98% rename from test/dorkbox/executor/ProcessExecutorLoggerTest.kt rename to test/dorkbox/executor/LoggerTest.kt index 7f162a5..b80724d 100644 --- a/test/dorkbox/executor/ProcessExecutorLoggerTest.kt +++ b/test/dorkbox/executor/LoggerTest.kt @@ -27,7 +27,7 @@ import org.junit.Test import org.slf4j.LoggerFactory import java.io.OutputStream -class ProcessExecutorLoggerTest { +class LoggerTest { @Test @Throws(Exception::class) fun testFullName() { diff --git a/test/dorkbox/executor/ProcessExecutorMainTest.kt b/test/dorkbox/executor/MainTest.kt similarity index 100% rename from test/dorkbox/executor/ProcessExecutorMainTest.kt rename to test/dorkbox/executor/MainTest.kt diff --git a/test/dorkbox/executor/ProcessListenerThrowTest.kt b/test/dorkbox/executor/ProcessListenerThrowTest.kt index d9ff907..27ff6bb 100644 --- a/test/dorkbox/executor/ProcessListenerThrowTest.kt +++ b/test/dorkbox/executor/ProcessListenerThrowTest.kt @@ -17,7 +17,7 @@ package dorkbox.executor -import dorkbox.executor.ProcessListenerSuccessTest.ProcessListenerImpl +import dorkbox.executor.SuccessTest.ProcessListenerImpl import dorkbox.executor.exceptions.InvalidOutputException import dorkbox.executor.processResults.ProcessResult import dorkbox.executor.processResults.SyncProcessResult diff --git a/test/dorkbox/executor/ProcessExecutorStreamCloseTest.kt b/test/dorkbox/executor/StreamCloseTest.kt similarity index 98% rename from test/dorkbox/executor/ProcessExecutorStreamCloseTest.kt rename to test/dorkbox/executor/StreamCloseTest.kt index cdf36f6..6a53596 100644 --- a/test/dorkbox/executor/ProcessExecutorStreamCloseTest.kt +++ b/test/dorkbox/executor/StreamCloseTest.kt @@ -35,7 +35,7 @@ import java.io.ByteArrayOutputStream * * @see HelloWorld */ -class ProcessExecutorStreamCloseTest { +class StreamCloseTest { @Test @Throws(Exception::class) fun testRedirectOutputNotClosed() { diff --git a/test/dorkbox/executor/ProcessListenerSuccessTest.kt b/test/dorkbox/executor/SuccessTest.kt similarity index 98% rename from test/dorkbox/executor/ProcessListenerSuccessTest.kt rename to test/dorkbox/executor/SuccessTest.kt index 839039a..e09acef 100644 --- a/test/dorkbox/executor/ProcessListenerSuccessTest.kt +++ b/test/dorkbox/executor/SuccessTest.kt @@ -23,7 +23,7 @@ import kotlinx.coroutines.runBlocking import org.junit.Assert import org.junit.Test -class ProcessListenerSuccessTest { +class SuccessTest { @Test @Throws(Exception::class) fun testJavaVersion() { diff --git a/test/dorkbox/executor/ProcessExecutorTimeoutTest.kt b/test/dorkbox/executor/TimeoutTest.kt similarity index 97% rename from test/dorkbox/executor/ProcessExecutorTimeoutTest.kt rename to test/dorkbox/executor/TimeoutTest.kt index a063957..2ed0456 100644 --- a/test/dorkbox/executor/ProcessExecutorTimeoutTest.kt +++ b/test/dorkbox/executor/TimeoutTest.kt @@ -27,10 +27,9 @@ import org.hamcrest.MatcherAssert import org.junit.Assert import org.junit.Test import java.util.* -import java.util.concurrent.TimeUnit -import java.util.concurrent.TimeoutException +import java.util.concurrent.* -class ProcessExecutorTimeoutTest { +class TimeoutTest { private val writerLoopCommand: List by lazy { listOf("java", TestSetup.getFile(Loop::class.java)) }