From 73971c4d01f75242344017d8a1a4cc2bd61f8634 Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Sat, 3 Jun 2017 10:22:33 +0200
Subject: [PATCH] spring-boot-kotlin refactor (#1979)

---
 spring-boot-kotlin/pom.xml                    | 14 +++++++++++
 ...> KotlinDemoApplicationIntegrationTest.kt} | 23 ++++++++++---------
 2 files changed, 26 insertions(+), 11 deletions(-)
 rename spring-boot-kotlin/src/test/kotlin/springbootkotlin/{KotlinDemoApplicationTests.kt => KotlinDemoApplicationIntegrationTest.kt} (68%)

diff --git a/spring-boot-kotlin/pom.xml b/spring-boot-kotlin/pom.xml
index c882daa816..d254531082 100644
--- a/spring-boot-kotlin/pom.xml
+++ b/spring-boot-kotlin/pom.xml
@@ -93,6 +93,20 @@
                 </dependency>
             </dependencies>
         </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>${maven-surefire-plugin.version}</version>
+            <configuration>
+                <excludes>
+                    <exclude>**/*IntegrationTest.java</exclude>
+                    <exclude>**/*LongRunningUnitTest.java</exclude>
+                    <exclude>**/*ManualTest.java</exclude>
+                    <exclude>**/JdbcTest.java</exclude>
+                    <exclude>**/*LiveTest.java</exclude>
+                </excludes>
+            </configuration>
+        </plugin>
     </plugins>
 </build>
 
diff --git a/spring-boot-kotlin/src/test/kotlin/springbootkotlin/KotlinDemoApplicationTests.kt b/spring-boot-kotlin/src/test/kotlin/springbootkotlin/KotlinDemoApplicationIntegrationTest.kt
similarity index 68%
rename from spring-boot-kotlin/src/test/kotlin/springbootkotlin/KotlinDemoApplicationTests.kt
rename to spring-boot-kotlin/src/test/kotlin/springbootkotlin/KotlinDemoApplicationIntegrationTest.kt
index e0d427e52f..fbe83926ef 100644
--- a/spring-boot-kotlin/src/test/kotlin/springbootkotlin/KotlinDemoApplicationTests.kt
+++ b/spring-boot-kotlin/src/test/kotlin/springbootkotlin/KotlinDemoApplicationIntegrationTest.kt
@@ -2,7 +2,8 @@ package springbootkotlin
 
 import com.baeldung.springbootkotlin.HelloDto
 import com.baeldung.springbootkotlin.KotlinDemoApplication
-import org.junit.Assert
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.springframework.beans.factory.annotation.Autowired
@@ -13,7 +14,7 @@ import org.springframework.test.context.junit4.SpringRunner
 
 @RunWith(SpringRunner::class)
 @SpringBootTest(classes = arrayOf(KotlinDemoApplication::class), webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-class KotlinDemoApplicationTests {
+class KotlinDemoApplicationIntegrationTest {
 
 	@Autowired
 	val testRestTemplate: TestRestTemplate? = null
@@ -26,27 +27,27 @@ class KotlinDemoApplicationTests {
 	fun testHelloController() {
 		val result = testRestTemplate?.getForEntity("/hello", String::class.java)
 
-		Assert.assertNotNull(result)
-		Assert.assertEquals(result?.statusCode, HttpStatus.OK)
-		Assert.assertEquals(result?.body, "hello world")
+		assertNotNull(result)
+		assertEquals(result?.statusCode, HttpStatus.OK)
+		assertEquals(result?.body, "hello world")
 	}
 
 	@Test
 	fun testHelloService() {
 		val result = testRestTemplate?.getForEntity("/hello-service", String::class.java)
 
-		Assert.assertNotNull(result)
-		Assert.assertEquals(result?.statusCode, HttpStatus.OK)
-		Assert.assertEquals(result?.body, "hello service")
+		assertNotNull(result)
+		assertEquals(result?.statusCode, HttpStatus.OK)
+		assertEquals(result?.body, "hello service")
 	}
 
 	@Test
 	fun testHelloDto() {
 		val result = testRestTemplate?.getForEntity("/hello-dto", HelloDto::class.java)
 
-		Assert.assertNotNull(result)
-		Assert.assertEquals(result?.statusCode, HttpStatus.OK)
-		Assert.assertEquals(result?.body, HelloDto("Hello from the dto"))
+		assertNotNull(result)
+		assertEquals(result?.statusCode, HttpStatus.OK)
+		assertEquals(result?.body, HelloDto("Hello from the dto"))
 	}
 
 }