erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Remove unnecessary @Guice.

Browse source
This commit is contained in:
Cedric Beust 2017-04-06 12:12:56 -07:00
parent ba98592f49
commit f83bdfe3b2
11 changed files with 14 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/kotlin/com/beust/kobalt/ContextTest.kt
View file

@ -4,11 +4,9 @@ import com.beust.kobalt.api.KobaltContext
import com.google.inject.Inject import com.google.inject.Inject
import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThat
import org.testng.annotations.DataProvider import org.testng.annotations.DataProvider
import org.testng.annotations.Guice
import org.testng.annotations.Test import org.testng.annotations.Test
import java.io.File import java.io.File
@Guice(modules = arrayOf(TestModule::class))
class ContextTest @Inject constructor(val context: KobaltContext) : BaseTest() { class ContextTest @Inject constructor(val context: KobaltContext) : BaseTest() {
val GROUP = "org.testng" val GROUP = "org.testng"

2
src/test/kotlin/com/beust/kobalt/IncludeExcludeTest.kt
View file

@ -21,7 +21,7 @@ class IncludeExcludeTest : KobaltTest() {
val A_HTML = "a.html" val A_HTML = "a.html"
@BeforeClass @BeforeClass
fun bc() { fun bc2() {
topDirectory = Files.createTempDirectory("kobaltTest-").toFile() topDirectory = Files.createTempDirectory("kobaltTest-").toFile()
directory = File(topDirectory, "com/beust") directory = File(topDirectory, "com/beust")
directory.mkdirs() directory.mkdirs()

4
src/test/kotlin/com/beust/kobalt/KobaltTest.kt
View file

@ -2,10 +2,8 @@ package com.beust.kobalt
import com.beust.kobalt.api.Kobalt import com.beust.kobalt.api.Kobalt
import org.testng.annotations.BeforeSuite import org.testng.annotations.BeforeSuite
import org.testng.annotations.Guice
@Guice(modules = arrayOf(TestModule::class)) open class KobaltTest: BaseTest() {
open class KobaltTest {
companion object { companion object {
@BeforeSuite @BeforeSuite
fun bs() { fun bs() {

6
src/test/kotlin/com/beust/kobalt/internal/BlockExtractorTest.kt
View file

@ -1,14 +1,12 @@
package com.beust.kobalt.internal package com.beust.kobalt.internal
import com.beust.kobalt.TestModule import com.beust.kobalt.BaseTest
import com.beust.kobalt.app.BuildFiles import com.beust.kobalt.app.BuildFiles
import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThat
import org.testng.annotations.Guice
import org.testng.annotations.Test import org.testng.annotations.Test
import java.io.File import java.io.File
@Guice(modules = arrayOf(TestModule::class)) class BlockExtractorTest : BaseTest() {
class BlockExtractorTest {
@Test @Test
fun verifyExtraction() { fun verifyExtraction() {

3
src/test/kotlin/com/beust/kobalt/internal/ExcludeTest.kt
View file

@ -1,7 +1,6 @@
package com.beust.kobalt.internal package com.beust.kobalt.internal
import com.beust.kobalt.BaseTest import com.beust.kobalt.BaseTest
import com.beust.kobalt.TestModule
import com.beust.kobalt.api.Kobalt import com.beust.kobalt.api.Kobalt
import com.beust.kobalt.app.BuildFileCompiler import com.beust.kobalt.app.BuildFileCompiler
import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.DependencyManager
@ -9,10 +8,8 @@ import com.beust.kobalt.maven.aether.Scope
import com.google.inject.Inject import com.google.inject.Inject
import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThat
import org.testng.annotations.DataProvider import org.testng.annotations.DataProvider
import org.testng.annotations.Guice
import org.testng.annotations.Test import org.testng.annotations.Test
@Guice(modules = arrayOf(TestModule::class))
class ExcludeTest @Inject constructor(compilerFactory: BuildFileCompiler.IFactory, class ExcludeTest @Inject constructor(compilerFactory: BuildFileCompiler.IFactory,
val dependencyManager: DependencyManager) : BaseTest(compilerFactory) { val dependencyManager: DependencyManager) : BaseTest(compilerFactory) {

2
src/test/kotlin/com/beust/kobalt/internal/ProfileTest.kt
View file

@ -9,11 +9,9 @@ import com.beust.kobalt.app.BuildFileCompiler
import com.google.inject.Inject import com.google.inject.Inject
import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThat
import org.testng.annotations.DataProvider import org.testng.annotations.DataProvider
import org.testng.annotations.Guice
import org.testng.annotations.Test import org.testng.annotations.Test
import java.util.* import java.util.*
@Guice(modules = arrayOf(TestModule::class))
class ProfileTest @Inject constructor(compilerFactory: BuildFileCompiler.IFactory) : BaseTest(compilerFactory) { class ProfileTest @Inject constructor(compilerFactory: BuildFileCompiler.IFactory) : BaseTest(compilerFactory) {
private fun runTestWithProfile(enabled: Boolean, oldSyntax: Boolean) : Project { private fun runTestWithProfile(enabled: Boolean, oldSyntax: Boolean) : Project {

3
src/test/kotlin/com/beust/kobalt/internal/TaskManagerTest.kt
View file

@ -1,15 +1,12 @@
package com.beust.kobalt.internal package com.beust.kobalt.internal
import com.beust.kobalt.BaseTest import com.beust.kobalt.BaseTest
import com.beust.kobalt.TestModule
import com.google.common.collect.ArrayListMultimap import com.google.common.collect.ArrayListMultimap
import com.google.common.collect.Multimap import com.google.common.collect.Multimap
import com.google.common.collect.TreeMultimap import com.google.common.collect.TreeMultimap
import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThat
import org.testng.annotations.Guice
import org.testng.annotations.Test import org.testng.annotations.Test
@Guice(modules = arrayOf(TestModule::class))
class TaskManagerTest : BaseTest() { class TaskManagerTest : BaseTest() {
class DryRunGraphExecutor<T>(val graph: DynamicGraph<T>) { class DryRunGraphExecutor<T>(val graph: DynamicGraph<T>) {

1
src/test/kotlin/com/beust/kobalt/maven/DependencyManagerTest.kt
View file

@ -14,7 +14,6 @@ import org.eclipse.aether.util.filter.AndDependencyFilter
import org.testng.annotations.Guice import org.testng.annotations.Guice
import org.testng.annotations.Test import org.testng.annotations.Test
@Guice(modules = arrayOf(TestModule::class))
class DependencyManagerTest @Inject constructor(val dependencyManager: DependencyManager, class DependencyManagerTest @Inject constructor(val dependencyManager: DependencyManager,
compilerFactory: BuildFileCompiler.IFactory) : BaseTest(compilerFactory) { compilerFactory: BuildFileCompiler.IFactory) : BaseTest(compilerFactory) {

12
src/test/kotlin/com/beust/kobalt/maven/DependencyTest.kt
View file

@ -1,16 +1,18 @@
package com.beust.kobalt.maven 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.KobaltExecutors
import com.beust.kobalt.misc.StringVersion import com.beust.kobalt.misc.StringVersion
import org.testng.Assert 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 java.util.concurrent.ExecutorService
import javax.inject.Inject import javax.inject.Inject
import kotlin.properties.Delegates import kotlin.properties.Delegates
@Guice(modules = arrayOf(TestModule::class)) class DependencyTest @Inject constructor(val executors: KobaltExecutors) : BaseTest() {
class DependencyTest @Inject constructor(val executors: KobaltExecutors) {
@DataProvider @DataProvider
fun dpVersions(): Array<Array<out Any>> { fun dpVersions(): Array<Array<out Any>> {
@ -29,7 +31,7 @@ class DependencyTest @Inject constructor(val executors: KobaltExecutors) {
private var executor: ExecutorService by Delegates.notNull() private var executor: ExecutorService by Delegates.notNull()
@BeforeClass @BeforeClass
fun bc() { fun bc2() {
executor = executors.newExecutor("DependencyTest", 5) executor = executors.newExecutor("DependencyTest", 5)
} }

2
src/test/kotlin/com/beust/kobalt/maven/DownloadTest.kt
View file

@ -23,7 +23,7 @@ class DownloadTest @Inject constructor(
private var executor: ExecutorService by Delegates.notNull() private var executor: ExecutorService by Delegates.notNull()
@BeforeClass @BeforeClass
fun bc() { fun bc2() {
executor = executors.newExecutor("DependentTest", 5) executor = executors.newExecutor("DependentTest", 5)
} }

6
src/test/kotlin/com/beust/kobalt/misc/MavenResolverTest.kt
View file

@ -1,6 +1,6 @@
package com.beust.kobalt.misc 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.KobaltSettings
import com.beust.kobalt.internal.KobaltSettingsXml import com.beust.kobalt.internal.KobaltSettingsXml
import com.beust.kobalt.maven.DependencyManager 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.DependencyRequest
import org.eclipse.aether.resolution.DependencyResolutionException import org.eclipse.aether.resolution.DependencyResolutionException
import org.testng.annotations.DataProvider import org.testng.annotations.DataProvider
import org.testng.annotations.Guice
import org.testng.annotations.Test import org.testng.annotations.Test
@Guice(modules = arrayOf(TestModule::class)) class MavenResolverTest : BaseTest() {
class MavenResolverTest {
@Inject @Inject
lateinit var resolver: KobaltMavenResolver lateinit var resolver: KobaltMavenResolver