Merge pull request #119 from nhaarman/clean-tests

Use same test source for inline tests

Author: nhaarman

.travis.yml

@@ -5,6 +5,11 @@ language: java
 jdk:
 - oraclejdk7
 
+matrix:
+  include:
+  - jdk: oraclejdk7
+    env: TERM=dumb MOCK_MAKER=mock-maker-inline
+
 env:
   matrix:
   - TERM=dumb

build.gradle

@@ -3,3 +3,5 @@ plugins {
 }
 
 apply from: 'gradle/scripts/tagging.gradle'
+
+println ext.versionName

gradle.properties

@@ -24,3 +24,4 @@
 #
 
 isRelease = false
+publishToLocal = false

mockito-kotlin/build.gradle

@@ -21,27 +21,6 @@ repositories {
     jcenter()
 }
 
-sourceSets {
-    testInlineMockito {
-        compileClasspath += main.output + test.output
-        runtimeClasspath += main.output + test.output
-    }
-}
-
-configurations {
-    testInlineMockitoCompile.extendsFrom testCompile
-    testInlineMockitoRuntime.extendsFrom testRuntime
-}
-
-// define custom test task for running integration tests
-task testInlineMockito(type: Test) {
-    testClassesDir = sourceSets.testInlineMockito.output.classesDir
-    classpath = sourceSets.testInlineMockito.runtimeClasspath
-}
-
-test.dependsOn testInlineMockito
-
-
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
@@ -63,3 +42,26 @@ dokka {
     }
 }
 javadoc.dependsOn dokka
+
+//Switch inline
+task createTestResources << {
+    def mockMakerFile = new File("$projectDir/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker")
+    if (System.env.MOCK_MAKER != null) {
+        logger.warn("! Using MockMaker ${System.env.MOCK_MAKER}")
+        mockMakerFile.parentFile.mkdirs()
+        mockMakerFile.createNewFile()
+        mockMakerFile.write(System.env.MOCK_MAKER)
+    } else {
+        logger.warn("! Using default MockMaker")
+    }
+}
+
+task removeTestResources << {
+    def mockMakerFile = new File("$projectDir/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker")
+    if (mockMakerFile.exists()) {
+        mockMakerFile.delete()
+    }
+}
+
+test.dependsOn createTestResources
+test.finalizedBy removeTestResources

mockito-kotlin/publishing.gradle

@@ -40,6 +40,8 @@ uploadArchives {
                 )
             }
 
+            if (publishToLocal) repository(url: mavenLocal().url)
+
             pom.project {
                 name 'Mockito-Kotlin'
                 packaging 'jar'

mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/CreateInstance.kt

@@ -48,9 +48,9 @@ import java.lang.reflect.Array as JavaArray
 /**
  * Checks whether the resource file to enable mocking of final classes is present.
  */
-private var mockMakerInlineEnabled: Boolean? = null
+internal var mockMakerInlineEnabled: Boolean? = null
 
-private fun mockMakerInlineEnabled(jClass: Class<out Any>): Boolean {
+internal fun mockMakerInlineEnabled(jClass: Class<out Any>): Boolean {
     return mockMakerInlineEnabled ?:
             jClass.getResource("mockito-extensions/org.mockito.plugins.MockMaker")?.let {
                 mockMakerInlineEnabled = File(it.file).readLines().filter { it == "mock-maker-inline" }.isNotEmpty()

mockito-kotlin/src/test/kotlin/ArgumentCaptorTest.kt

@@ -3,7 +3,7 @@ import com.nhaarman.mockito_kotlin.*
 import org.junit.Test
 import java.util.*
 
-class ArgumentCaptorTest {
+class ArgumentCaptorTest : BaseTest() {
 
     @Test
     fun argumentCaptor_withSingleValue() {

mockito-kotlin/src/test/kotlin/BaseTest.kt

@@ -0,0 +1,16 @@
+import com.nhaarman.mockito_kotlin.mockMakerInlineEnabled
+import org.junit.After
+import org.junit.Before
+
+abstract class BaseTest {
+
+    @Before
+    open fun setup() {
+        mockMakerInlineEnabled = false
+    }
+
+    @After
+    open fun tearDown() {
+        mockMakerInlineEnabled = null
+    }
+}

mockito-kotlin/src/test/kotlin/CreateInstanceTest.kt

@@ -31,7 +31,7 @@ import org.junit.Test
 import java.util.*
 import kotlin.reflect.KClass
 
-class CreateInstanceTest {
+class CreateInstanceTest : BaseTest() {
 
     @Test
     fun byte() {
@@ -555,8 +555,8 @@ class CreateInstanceTest {
     }
 
     enum class MyEnum { VALUE, ANOTHER_VALUE }
+}
 
-    sealed class MySealedClass {
-        class MySealedClassMember : MySealedClass()
-    }
+sealed class MySealedClass {
+    class MySealedClassMember : MySealedClass()
 }

mockito-kotlin/src/test/kotlin/EqTest.kt

@@ -31,7 +31,7 @@ import org.junit.Before
 import org.junit.Test
 import org.mockito.Mockito
 
-class EqTest {
+class EqTest : BaseTest() {
 
     private val interfaceInstance: MyInterface = MyClass()
     private val openClassInstance: MyClass = MyClass()
@@ -40,13 +40,17 @@ class EqTest {
     private lateinit var doAnswer: Open
 
     @Before
-    fun setup() {
+    override fun setup() {
+        super.setup()
+
         /* Create a proper Mockito state */
         doAnswer = Mockito.doAnswer { }.`when`(mock())
     }
 
     @After
-    fun tearDown() {
+    override fun tearDown() {
+        super.tearDown()
+
         /* Close `any` Mockito state */
         doAnswer.go(0)
     }

mockito-kotlin/src/test/kotlin/MockTest.kt

@@ -28,10 +28,9 @@ import com.nhaarman.mockito_kotlin.mock
 import com.nhaarman.mockito_kotlin.whenever
 import org.junit.Test
 import org.mockito.Mockito.RETURNS_DEEP_STUBS
-import org.mockito.exceptions.base.MockitoException
 import java.util.*
 
-class MockTest {
+class MockTest : BaseTest() {
 
     private lateinit var propertyInterfaceVariable: MyInterface
     private lateinit var propertyClassVariable: MyClass
@@ -80,11 +79,6 @@ class MockTest {
         expect(instance).toNotBeNull()
     }
 
-    @Test(expected = MockitoException::class)
-    fun closedClass() {
-        mock<ClosedClass>()
-    }
-
     @Test
     fun deepStubs() {
         val cal: Calendar = mock(RETURNS_DEEP_STUBS)
@@ -94,6 +88,5 @@ class MockTest {
 
     private interface MyInterface
     private open class MyClass
-    private class ClosedClass
 }
 

mockito-kotlin/src/test/kotlin/MockitoKotlinTest.kt

@@ -28,7 +28,7 @@ import com.nhaarman.mockito_kotlin.*
 import org.junit.After
 import org.junit.Test
 
-class MockitoKotlinTest {
+class MockitoKotlinTest : BaseTest() {
 
     @After
     fun teardown() {

mockito-kotlin/src/test/kotlin/MockitoTest.kt

@@ -1,7 +1,9 @@
+
 import com.nhaarman.expect.expect
 import com.nhaarman.expect.expectErrorWithMessage
 import com.nhaarman.expect.fail
 import com.nhaarman.mockito_kotlin.*
+import org.junit.Assume.assumeTrue
 import org.junit.Test
 import org.mockito.exceptions.base.MockitoAssertionError
 import java.io.IOException
@@ -31,7 +33,7 @@ import java.io.IOException
  * THE SOFTWARE.
  */
 
-class MockitoTest {
+class MockitoTest : BaseTest() {
 
     @Test
     fun anyString() {
@@ -100,6 +102,8 @@ class MockitoTest {
     /** https://github.com/nhaarman/mockito-kotlin/issues/27 */
     @Test
     fun anyThrowableWithSingleThrowableConstructor() {
+        assumeTrue(mockMakerInlineEnabled(javaClass))
+
         mock<Methods>().apply {
             throwableClass(ThrowableClass(IOException()))
             verify(this).throwableClass(any())

mockito-kotlin/src/test/kotlin/SpyTest.kt

@@ -31,18 +31,18 @@ import org.mockito.Mockito
 import org.mockito.exceptions.base.MockitoException
 import java.util.*
 
-class SpyTest {
+class SpyTest : BaseTest() {
 
     private val interfaceInstance: MyInterface = MyClass()
     private val openClassInstance: MyClass = MyClass()
     private val closedClassInstance: ClosedClass = ClosedClass()
 
     @After
-    fun a() {
+    override fun tearDown() {
+        super.tearDown()
         Mockito.validateMockitoUsage()
     }
 
-
     @Test
     fun spyInterfaceInstance() {
         /* When */
@@ -61,12 +61,6 @@ class SpyTest {
         expect(result).toNotBeNull()
     }
 
-    @Test(expected = MockitoException::class)
-    fun spyClosedClassInstance() {
-        /* When */
-        spy(closedClassInstance)
-    }
-
     @Test
     fun doReturnWithSpy() {
         val date = spy(Date())

mockito-kotlin/src/testInlineMockito/kotlin/CreateInstanceInlineTest.kt renamed to mockito-kotlin/src/test/kotlin/inline/UsingMockMakerInlineTest.kt

@@ -25,11 +25,13 @@
 import com.nhaarman.expect.expect
 import com.nhaarman.expect.expectErrorWithMessage
 import com.nhaarman.mockito_kotlin.*
+import org.junit.Assume.assumeTrue
+import org.junit.Before
 import org.junit.Test
 import java.io.IOException
 import java.math.BigInteger
 
-class CreateInstanceInlineTest {
+class UsingMockMakerInlineTest {
 
     class ClassToBeMocked {
 
@@ -41,6 +43,12 @@ class CreateInstanceInlineTest {
         }
     }
 
+    @Before
+    fun setup() {
+        mockMakerInlineEnabled = null
+        assumeTrue(mockMakerInlineEnabled(javaClass))
+    }
+
     @Test
     fun mockClosedClass() {
         /* When */