Merge pull request #235 from nhaarman/2.x-testing

Move tests to separate module

Author: nhaarman

.travis.yml

@@ -9,13 +9,13 @@ matrix:
   - jdk: oraclejdk8
     env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1.61
   - jdk: oraclejdk8
-    env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.2.10
+    env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.2.20
   - jdk: oraclejdk8
     env: TERM=dumb KOTLIN_VERSION=1.0.7
   - jdk: oraclejdk8
     env: TERM=dumb KOTLIN_VERSION=1.1.61
   - jdk: oraclejdk8
-    env: TERM=dumb KOTLIN_VERSION=1.2.10
+    env: TERM=dumb KOTLIN_VERSION=1.2.20
 
 
 env:
@@ -26,7 +26,10 @@ install:
  - true
 
 script:
-  - ./gradlew test
+  - ops/mockMakerInline.sh
+  - ./gradlew clean
+  - ./gradlew assemble
+  - ./gradlew test -i
 
 notifications:
-  email: false
+  email: false

mockito-kotlin/build.gradle

@@ -3,7 +3,7 @@ apply from: '../publishing.gradle'
 apply plugin: 'org.jetbrains.dokka'
 
 buildscript {
-    ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.0.7'
+    ext.kotlin_version = "1.2.20"
 
     repositories {
         mavenCentral()
@@ -24,12 +24,8 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile "org.mockito:mockito-core:2.13.0"
-
-    /* Tests */
-    testCompile "junit:junit:4.12"
-    testCompile "com.nhaarman:expect.kt:1.0.0"
 }
 
 dokka {
@@ -43,26 +39,3 @@ 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/src/main/kotlin/com/nhaarman/mockitokotlin2/internal/MockMaker.kt

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -ev
+
+if [ ${MOCK_MAKER} = "mock-maker-inline" ]; then
+    mkdir -p tests/src/test/resources/mockito-extensions
+    cp ops/org.mockito.plugins.MockMaker tests/src/test/resources/mockito-extensions/
+fi
+
+exit 0;
+

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

@@ -0,0 +1 @@
+mock-maker-inline

ops/mockMakerInline.sh

@@ -1 +1,2 @@
 include 'mockito-kotlin'
+include 'tests'

ops/org.mockito.plugins.MockMaker

@@ -0,0 +1,7 @@
+Mockito-Kotlin tests
+====================
+
+Tests should be placed in this module.
+CI is set up to execute tests for all major versions of Kotlin,
+whilst keeping the library version on the latest version.  
+This ensures the library is backwards compatible for all Kotlin versions.

settings.gradle

@@ -0,0 +1,29 @@
+buildscript {
+    ext.kotlin_version = '1.2.20'
+    ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.0.7'
+
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+apply plugin: 'java'
+apply plugin: 'kotlin'
+
+repositories {
+    mavenCentral()
+    jcenter()
+}
+
+dependencies {
+    compile files("${rootProject.projectDir}/mockito-kotlin/build/libs/mockito-kotlin-${rootProject.ext.versionName}.jar")
+
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.mockito:mockito-core:2.13.0"
+
+    testCompile "junit:junit:4.12"
+    testCompile "com.nhaarman:expect.kt:1.0.0"
+}

tests/README.md

@@ -1,4 +1,6 @@
-package test/*
+package test
+
+/*
  * The MIT License
  *
  * Copyright (c) 2016 Niek Haarman
@@ -40,9 +42,7 @@ class EqTest : TestBase() {
     private lateinit var doAnswer: Open
 
     @Before
-    override fun setup() {
-        super.setup()
-
+    fun setup() {
         /* Create a proper Mockito state */
         doAnswer = Mockito.doAnswer { }.`when`(mock())
     }

tests/build.gradle

@@ -0,0 +1,10 @@
+package test
+
+import org.mockito.internal.configuration.plugins.Plugins
+import org.mockito.internal.creation.bytebuddy.InlineByteBuddyMockMaker
+
+
+internal var mockMakerInlineEnabled: Boolean? = null
+internal fun mockMakerInlineEnabled(): Boolean {
+    return mockMakerInlineEnabled ?: (Plugins.getMockMaker() is InlineByteBuddyMockMaker)
+}

mockito-kotlin/src/test/kotlin/test/ArgumentCaptorTest.kt renamed to tests/src/test/kotlin/test/ArgumentCaptorTest.kt

@@ -4,6 +4,7 @@ import com.nhaarman.expect.expect
 import com.nhaarman.expect.expectErrorWithMessage
 import com.nhaarman.expect.fail
 import com.nhaarman.mockitokotlin2.*
+import org.junit.Assume.assumeFalse
 import org.junit.Test
 import org.mockito.Mockito
 import org.mockito.stubbing.Answer
@@ -263,6 +264,7 @@ class OngoingStubbingTest : TestBase() {
 
     @Test
     fun doReturn_throwsNPE() {
+        assumeFalse(mockMakerInlineEnabled())
         expectErrorWithMessage("look at the stack trace below") on {
 
             /* When */

mockito-kotlin/src/test/kotlin/test/BDDMockitoTest.kt renamed to tests/src/test/kotlin/test/BDDMockitoTest.kt

@@ -0,0 +1,11 @@
+package test
+
+import org.junit.After
+
+abstract class TestBase {
+
+    @After
+    open fun tearDown() {
+        mockMakerInlineEnabled = null
+    }
+}

mockito-kotlin/src/test/kotlin/test/Classes.kt renamed to tests/src/test/kotlin/test/Classes.kt

@@ -23,15 +23,11 @@
  */
 
 import com.nhaarman.expect.expect
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.internal.mockMakerInlineEnabled
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.whenever
+import com.nhaarman.mockitokotlin2.*
 import org.junit.Assume.assumeTrue
 import org.junit.Before
 import org.junit.Test
+import test.mockMakerInlineEnabled
 import java.io.IOException
 import java.math.BigInteger