From f83bdfe3b2e7ef2a1d6899fe83f405b05b2e6161 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 6 Apr 2017 12:12:56 -0700 Subject: [PATCH] Remove unnecessary @Guice. --- src/test/kotlin/com/beust/kobalt/ContextTest.kt | 2 -- .../kotlin/com/beust/kobalt/IncludeExcludeTest.kt | 2 +- src/test/kotlin/com/beust/kobalt/KobaltTest.kt | 4 +--- .../com/beust/kobalt/internal/BlockExtractorTest.kt | 6 ++---- .../kotlin/com/beust/kobalt/internal/ExcludeTest.kt | 3 --- .../kotlin/com/beust/kobalt/internal/ProfileTest.kt | 2 -- .../com/beust/kobalt/internal/TaskManagerTest.kt | 3 --- .../com/beust/kobalt/maven/DependencyManagerTest.kt | 1 - .../kotlin/com/beust/kobalt/maven/DependencyTest.kt | 12 +++++++----- .../kotlin/com/beust/kobalt/maven/DownloadTest.kt | 2 +- .../com/beust/kobalt/misc/MavenResolverTest.kt | 6 ++---- 11 files changed, 14 insertions(+), 29 deletions(-) diff --git a/src/test/kotlin/com/beust/kobalt/ContextTest.kt b/src/test/kotlin/com/beust/kobalt/ContextTest.kt index 783dc1cc..b0cec7ba 100644 --- a/src/test/kotlin/com/beust/kobalt/ContextTest.kt +++ b/src/test/kotlin/com/beust/kobalt/ContextTest.kt @@ -4,11 +4,9 @@ import com.beust.kobalt.api.KobaltContext import com.google.inject.Inject import org.assertj.core.api.Assertions.assertThat import org.testng.annotations.DataProvider -import org.testng.annotations.Guice import org.testng.annotations.Test import java.io.File -@Guice(modules = arrayOf(TestModule::class)) class ContextTest @Inject constructor(val context: KobaltContext) : BaseTest() { val GROUP = "org.testng" diff --git a/src/test/kotlin/com/beust/kobalt/IncludeExcludeTest.kt b/src/test/kotlin/com/beust/kobalt/IncludeExcludeTest.kt index 1501c556..054aff2d 100644 --- a/src/test/kotlin/com/beust/kobalt/IncludeExcludeTest.kt +++ b/src/test/kotlin/com/beust/kobalt/IncludeExcludeTest.kt @@ -21,7 +21,7 @@ class IncludeExcludeTest : KobaltTest() { val A_HTML = "a.html" @BeforeClass - fun bc() { + fun bc2() { topDirectory = Files.createTempDirectory("kobaltTest-").toFile() directory = File(topDirectory, "com/beust") directory.mkdirs() diff --git a/src/test/kotlin/com/beust/kobalt/KobaltTest.kt b/src/test/kotlin/com/beust/kobalt/KobaltTest.kt index 913cc35a..c7667a4a 100644 --- a/src/test/kotlin/com/beust/kobalt/KobaltTest.kt +++ b/src/test/kotlin/com/beust/kobalt/KobaltTest.kt @@ -2,10 +2,8 @@ package com.beust.kobalt import com.beust.kobalt.api.Kobalt import org.testng.annotations.BeforeSuite -import org.testng.annotations.Guice -@Guice(modules = arrayOf(TestModule::class)) -open class KobaltTest { +open class KobaltTest: BaseTest() { companion object { @BeforeSuite fun bs() { diff --git a/src/test/kotlin/com/beust/kobalt/internal/BlockExtractorTest.kt b/src/test/kotlin/com/beust/kobalt/internal/BlockExtractorTest.kt index aeea5f06..9e0e3514 100644 --- a/src/test/kotlin/com/beust/kobalt/internal/BlockExtractorTest.kt +++ b/src/test/kotlin/com/beust/kobalt/internal/BlockExtractorTest.kt @@ -1,14 +1,12 @@ package com.beust.kobalt.internal -import com.beust.kobalt.TestModule +import com.beust.kobalt.BaseTest import com.beust.kobalt.app.BuildFiles import org.assertj.core.api.Assertions.assertThat -import org.testng.annotations.Guice import org.testng.annotations.Test import java.io.File -@Guice(modules = arrayOf(TestModule::class)) -class BlockExtractorTest { +class BlockExtractorTest : BaseTest() { @Test fun verifyExtraction() { diff --git a/src/test/kotlin/com/beust/kobalt/internal/ExcludeTest.kt b/src/test/kotlin/com/beust/kobalt/internal/ExcludeTest.kt index 41865745..ccd65835 100644 --- a/src/test/kotlin/com/beust/kobalt/internal/ExcludeTest.kt +++ b/src/test/kotlin/com/beust/kobalt/internal/ExcludeTest.kt @@ -1,7 +1,6 @@ package com.beust.kobalt.internal import com.beust.kobalt.BaseTest -import com.beust.kobalt.TestModule import com.beust.kobalt.api.Kobalt import com.beust.kobalt.app.BuildFileCompiler import com.beust.kobalt.maven.DependencyManager @@ -9,10 +8,8 @@ import com.beust.kobalt.maven.aether.Scope import com.google.inject.Inject import org.assertj.core.api.Assertions.assertThat import org.testng.annotations.DataProvider -import org.testng.annotations.Guice import org.testng.annotations.Test -@Guice(modules = arrayOf(TestModule::class)) class ExcludeTest @Inject constructor(compilerFactory: BuildFileCompiler.IFactory, val dependencyManager: DependencyManager) : BaseTest(compilerFactory) { diff --git a/src/test/kotlin/com/beust/kobalt/internal/ProfileTest.kt b/src/test/kotlin/com/beust/kobalt/internal/ProfileTest.kt index b36fd612..e0f62382 100644 --- a/src/test/kotlin/com/beust/kobalt/internal/ProfileTest.kt +++ b/src/test/kotlin/com/beust/kobalt/internal/ProfileTest.kt @@ -9,11 +9,9 @@ import com.beust.kobalt.app.BuildFileCompiler import com.google.inject.Inject import org.assertj.core.api.Assertions.assertThat import org.testng.annotations.DataProvider -import org.testng.annotations.Guice import org.testng.annotations.Test import java.util.* -@Guice(modules = arrayOf(TestModule::class)) class ProfileTest @Inject constructor(compilerFactory: BuildFileCompiler.IFactory) : BaseTest(compilerFactory) { private fun runTestWithProfile(enabled: Boolean, oldSyntax: Boolean) : Project { diff --git a/src/test/kotlin/com/beust/kobalt/internal/TaskManagerTest.kt b/src/test/kotlin/com/beust/kobalt/internal/TaskManagerTest.kt index bb28018a..c60bb00f 100644 --- a/src/test/kotlin/com/beust/kobalt/internal/TaskManagerTest.kt +++ b/src/test/kotlin/com/beust/kobalt/internal/TaskManagerTest.kt @@ -1,15 +1,12 @@ package com.beust.kobalt.internal import com.beust.kobalt.BaseTest -import com.beust.kobalt.TestModule import com.google.common.collect.ArrayListMultimap import com.google.common.collect.Multimap import com.google.common.collect.TreeMultimap import org.assertj.core.api.Assertions.assertThat -import org.testng.annotations.Guice import org.testng.annotations.Test -@Guice(modules = arrayOf(TestModule::class)) class TaskManagerTest : BaseTest() { class DryRunGraphExecutor(val graph: DynamicGraph) { diff --git a/src/test/kotlin/com/beust/kobalt/maven/DependencyManagerTest.kt b/src/test/kotlin/com/beust/kobalt/maven/DependencyManagerTest.kt index ffaacdc5..762493a5 100644 --- a/src/test/kotlin/com/beust/kobalt/maven/DependencyManagerTest.kt +++ b/src/test/kotlin/com/beust/kobalt/maven/DependencyManagerTest.kt @@ -14,7 +14,6 @@ import org.eclipse.aether.util.filter.AndDependencyFilter import org.testng.annotations.Guice import org.testng.annotations.Test -@Guice(modules = arrayOf(TestModule::class)) class DependencyManagerTest @Inject constructor(val dependencyManager: DependencyManager, compilerFactory: BuildFileCompiler.IFactory) : BaseTest(compilerFactory) { diff --git a/src/test/kotlin/com/beust/kobalt/maven/DependencyTest.kt b/src/test/kotlin/com/beust/kobalt/maven/DependencyTest.kt index 9cbf3ce1..cd2bc9a3 100644 --- a/src/test/kotlin/com/beust/kobalt/maven/DependencyTest.kt +++ b/src/test/kotlin/com/beust/kobalt/maven/DependencyTest.kt @@ -1,16 +1,18 @@ package com.beust.kobalt.maven -import com.beust.kobalt.TestModule +import com.beust.kobalt.BaseTest import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.StringVersion import org.testng.Assert -import org.testng.annotations.* +import org.testng.annotations.AfterClass +import org.testng.annotations.BeforeClass +import org.testng.annotations.DataProvider +import org.testng.annotations.Test import java.util.concurrent.ExecutorService import javax.inject.Inject import kotlin.properties.Delegates -@Guice(modules = arrayOf(TestModule::class)) -class DependencyTest @Inject constructor(val executors: KobaltExecutors) { +class DependencyTest @Inject constructor(val executors: KobaltExecutors) : BaseTest() { @DataProvider fun dpVersions(): Array> { @@ -29,7 +31,7 @@ class DependencyTest @Inject constructor(val executors: KobaltExecutors) { private var executor: ExecutorService by Delegates.notNull() @BeforeClass - fun bc() { + fun bc2() { executor = executors.newExecutor("DependencyTest", 5) } diff --git a/src/test/kotlin/com/beust/kobalt/maven/DownloadTest.kt b/src/test/kotlin/com/beust/kobalt/maven/DownloadTest.kt index 820bef21..27e64886 100644 --- a/src/test/kotlin/com/beust/kobalt/maven/DownloadTest.kt +++ b/src/test/kotlin/com/beust/kobalt/maven/DownloadTest.kt @@ -23,7 +23,7 @@ class DownloadTest @Inject constructor( private var executor: ExecutorService by Delegates.notNull() @BeforeClass - fun bc() { + fun bc2() { executor = executors.newExecutor("DependentTest", 5) } diff --git a/src/test/kotlin/com/beust/kobalt/misc/MavenResolverTest.kt b/src/test/kotlin/com/beust/kobalt/misc/MavenResolverTest.kt index 2e98cf28..baea8895 100644 --- a/src/test/kotlin/com/beust/kobalt/misc/MavenResolverTest.kt +++ b/src/test/kotlin/com/beust/kobalt/misc/MavenResolverTest.kt @@ -1,6 +1,6 @@ package com.beust.kobalt.misc -import com.beust.kobalt.TestModule +import com.beust.kobalt.BaseTest import com.beust.kobalt.internal.KobaltSettings import com.beust.kobalt.internal.KobaltSettingsXml import com.beust.kobalt.maven.DependencyManager @@ -18,11 +18,9 @@ import org.eclipse.aether.resolution.ArtifactResult import org.eclipse.aether.resolution.DependencyRequest import org.eclipse.aether.resolution.DependencyResolutionException import org.testng.annotations.DataProvider -import org.testng.annotations.Guice import org.testng.annotations.Test -@Guice(modules = arrayOf(TestModule::class)) -class MavenResolverTest { +class MavenResolverTest : BaseTest() { @Inject lateinit var resolver: KobaltMavenResolver