BAEL-809: Moved mockito-kotlin to existing mockito module (eugenp#2191)

* BAEL-809: Add Kotlin Mockito supporting code * BAEL-809: Add references to kotlin-mockito library * BAEL-809: Move kotlin-mockito to existing kotlin module Some unused java classes that were in the kotlin-mockito module were simply deleted instead of moved to the mockito module.
saihong · Jul 2, 2017 · 6e99424 · 6e99424
1 parent 37360b9
commit 6e99424
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 205 deletions.
diff --git a/kotlin-mockito/README.md b/kotlin-mockito/README.md
diff --git a/kotlin-mockito/pom.xml b/kotlin-mockito/pom.xml
diff --git a/kotlin-mockito/src/main/java/com/baeldung/java/ArrayExample.java b/kotlin-mockito/src/main/java/com/baeldung/java/ArrayExample.java
diff --git a/kotlin-mockito/src/main/java/com/baeldung/java/Customer.java b/kotlin-mockito/src/main/java/com/baeldung/java/Customer.java
diff --git a/kotlin-mockito/src/main/java/com/baeldung/java/StringUtils.java b/kotlin-mockito/src/main/java/com/baeldung/java/StringUtils.java
diff --git a/kotlin-mockito/src/test/java/com/baeldung/kotlin/JavaCallToKotlinUnitTest.java b/kotlin-mockito/src/test/java/com/baeldung/kotlin/JavaCallToKotlinUnitTest.java
diff --git a/kotlin/pom.xml b/kotlin/pom.xml
@@ -3,7 +3,6 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.baeldung</groupId>
     <artifactId>kotlin</artifactId>
     <version>1.0-SNAPSHOT</version>
 
@@ -13,15 +12,13 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-
     <repositories>
         <repository>
             <id>central</id>
             <url>http://jcenter.bintray.com</url>
         </repository>
     </repositories>
 
-
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
@@ -45,9 +42,14 @@
             <artifactId>kotlinx-coroutines-core</artifactId>
             <version>${kotlinx.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.nhaarman</groupId>
+            <artifactId>mockito-kotlin</artifactId>
+            <version>${mockito-kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>        
     </dependencies>
 
-
     <build>
         <plugins>
             <plugin>
@@ -123,6 +125,7 @@
         <kotlin-stdlib.version>1.1.2</kotlin-stdlib.version>
         <kotlin-reflect.version>1.1.2</kotlin-reflect.version>
         <kotlinx.version>0.15</kotlinx.version>
+        <mockito-kotlin.version>1.5.0</mockito-kotlin.version>
     </properties>
 
 </project>
diff --git a/...kotlin/com/baeldung/kotlin/BookService.kt → ...om/baeldung/kotlin/mockito/BookService.kt b/...kotlin/com/baeldung/kotlin/BookService.kt → ...om/baeldung/kotlin/mockito/BookService.kt
diff --git a/...in/com/baeldung/kotlin/LendBookManager.kt → ...aeldung/kotlin/mockito/LendBookManager.kt b/...in/com/baeldung/kotlin/LendBookManager.kt → ...aeldung/kotlin/mockito/LendBookManager.kt
diff --git a/...om/baeldung/kotlin/LendBookManagerTest.kt → ...ung/kotlin/mockito/LendBookManagerTest.kt b/...om/baeldung/kotlin/LendBookManagerTest.kt → ...ung/kotlin/mockito/LendBookManagerTest.kt
diff --git a/...otlin/LendBookManagerTestMockitoKotlin.kt → ...ckito/LendBookManagerTestMockitoKotlin.kt b/...otlin/LendBookManagerTestMockitoKotlin.kt → ...ckito/LendBookManagerTestMockitoKotlin.kt