KTLN-587 added tests

mipo256 · mipo256 · commit 1aa09b89e28e · 2024-09-22T16:53:00.000+03:00
diff --git a/kotlin-dsl/pom.xml b/kotlin-dsl/pom.xml
@@ -20,14 +20,20 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+    </dependency>
   </dependencies>
 
   <build>
     <sourceDirectory>src/main/kotlin</sourceDirectory>
-    <testSourceDirectory>src/test/kotlin</testSourceDirectory>
+    <testSourceDirectory>src/test/java</testSourceDirectory>
     <plugins>
       <plugin>
         <artifactId>kotlin-maven-plugin</artifactId>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <version>${kotlin.version}</version>
         <executions>
           <execution>
             <id>compile</id>
@@ -44,8 +50,6 @@
             </goals>
           </execution>
         </executions>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <version>${kotlin.version}</version>
         <configuration>
           <args>
             <arg>-Xjsr305=strict</arg>
diff --git a/kotlin-dsl/src/main/kotlin/com/baeldung/functionaldsl/beandeclaration/BeanDeclration.kt b/kotlin-dsl/src/main/kotlin/com/baeldung/functionaldsl/beandeclaration/BeanDeclration.kt
@@ -1,10 +1,10 @@
-package com.baeldung.functional_dsl.bean_declration
+package com.baeldung.functionaldsl.beandeclration
 
-import java.math.BigDecimal
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
 import org.springframework.context.support.BeanDefinitionDsl
 import org.springframework.context.support.beans
+import java.math.BigDecimal
 
 @SpringBootApplication
 open class Application
@@ -20,9 +20,9 @@ fun main(vararg args: String) {
                     isPrimary = false,
                     function = {
                         BigDecimal(1.0)
-                    }
+                    },
                 )
-            }
+            },
         )
     }
-}
+}
diff --git a/kotlin-dsl/src/main/kotlin/com/baeldung/functionaldsl/regularcontroller/RegularController.kt b/kotlin-dsl/src/main/kotlin/com/baeldung/functionaldsl/regularcontroller/RegularController.kt
@@ -1,7 +1,5 @@
-package com.baeldung.functional_dsl.regular_controller
+package com.baeldung.functionaldsl.regularcontroller
 
-import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.runApplication
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RequestHeader
@@ -10,17 +8,16 @@ import org.springframework.web.bind.annotation.RestController
 
 @RestController
 class RegularController {
-
     @GetMapping(path = ["/endpoint/{country}"])
     fun getPerson(
         @RequestParam name: String,
         @RequestHeader(name = "X-age") age: String,
-        @PathVariable country: String
+        @PathVariable country: String,
     ): Map<*, *> {
         return mapOf(
             "name" to name,
             "age" to age,
-            "country" to country
+            "country" to country,
         )
     }
-}
+}
diff --git a/kotlin-dsl/src/main/kotlin/com/baeldung/functionaldsl/routerfunction/RouterFunction.kt b/kotlin-dsl/src/main/kotlin/com/baeldung/functionaldsl/routerfunction/RouterFunction.kt
@@ -1,16 +1,14 @@
-package com.baeldung.functional_dsl.router_function
+package com.baeldung.functionaldsl.routerfunction
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
 import org.springframework.context.annotation.Bean
 import org.springframework.web.servlet.function.RouterFunction
 import org.springframework.web.servlet.function.RouterFunctions
-import org.springframework.web.servlet.function.ServerRequest
 import org.springframework.web.servlet.function.ServerResponse
 
 @SpringBootApplication
 open class Application {
-
     @Bean
     open fun configure(): RouterFunction<ServerResponse> {
         return RouterFunctions.route()
@@ -19,8 +17,8 @@ open class Application {
                     mapOf(
                         "name" to it.param("name"),
                         "age" to it.headers().header("X-age")[0],
-                        "country" to it.pathVariable("country")
-                    )
+                        "country" to it.pathVariable("country"),
+                    ),
                 )
             }
             .build()
@@ -29,4 +27,4 @@ open class Application {
 
 fun main(vararg args: String) {
     runApplication<Application>(*args)
-}
+}
diff --git a/kotlin-dsl/src/main/kotlin/com/baeldung/functionaldsl/routerfunctiondsl/RouterDsl.kt b/kotlin-dsl/src/main/kotlin/com/baeldung/functionaldsl/routerfunctiondsl/RouterDsl.kt
@@ -1,4 +1,4 @@
-package com.baeldung.functional_dsl.router_function_dsl
+package com.baeldung.functionaldsl.routerfunctiondsl
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
@@ -11,8 +11,7 @@ import org.springframework.web.servlet.function.router
 open class Application
 
 fun main(vararg args: String) {
-    runApplication<Application>(*args)
-    {
+    runApplication<Application>(*args) {
         addInitializers(
             beans {
                 bean {
@@ -22,13 +21,13 @@ fun main(vararg args: String) {
                                 mapOf(
                                     "name" to it.param("name"),
                                     "age" to it.headers().header("X-age")[0],
-                                    "country" to it.pathVariable("country")
-                                )
+                                    "country" to it.pathVariable("country"),
+                                ),
                             )
                         }
                     }
                 }
-            }
+            },
         )
     }
-}
+}
diff --git a/kotlin-dsl/src/test/java/com/baeldung/functionaldsl/regularcontroller/RegularControllerTest.java b/kotlin-dsl/src/test/java/com/baeldung/functionaldsl/regularcontroller/RegularControllerTest.java
@@ -0,0 +1,38 @@
+package com.baeldung.functionaldsl.regularcontroller;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+
+import com.baeldung.functionaldsl.regularcontroller.RegularController;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Map;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+
+@WebMvcTest(controllers = RegularController.class)
+@ContextConfiguration(classes = RegularController.class)
+public class RegularControllerTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    private ObjectMapper objectMapper = new ObjectMapper();
+
+    @Test
+    void test() throws Exception {
+        Map<String, Object> result = objectMapper.readValue(mockMvc
+          .perform(get("/endpoint/anything").header("X-age", 22).param("name", "Mikhail"))
+          .andExpect(MockMvcResultMatchers.status().is2xxSuccessful())
+          .andReturn()
+          .getResponse()
+          .getContentAsString(), new TypeReference<Map<String, Object>>() {
+        });
+
+        Assertions.assertThat(result).containsKeys("name", "age", "country");
+    }
+}
diff --git a/kotlin-dsl/src/test/java/com/baeldung/functionaldsl/router_function/RouterFunctionTest.java b/kotlin-dsl/src/test/java/com/baeldung/functionaldsl/router_function/RouterFunctionTest.java
@@ -0,0 +1,38 @@
+package com.baeldung.functionaldsl.routerfunction;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+
+import com.baeldung.functionaldsl.routerfunction.Application;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Map;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+
+@WebMvcTest(controllers = Application.class)
+@ContextConfiguration(classes = Application.class)
+public class RouterFunctionTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    private ObjectMapper objectMapper = new ObjectMapper();
+
+    @Test
+    void test() throws Exception {
+        Map<String, Object> result = objectMapper.readValue(mockMvc
+          .perform(get("/endpoint/anything").header("X-age", 22).param("name", "Mikhail"))
+          .andExpect(MockMvcResultMatchers.status().is2xxSuccessful())
+          .andReturn()
+          .getResponse()
+          .getContentAsString(), new TypeReference<Map<String, Object>>() {
+        });
+
+        Assertions.assertThat(result).containsKeys("name", "age", "country");
+    }
+}
diff --git a/kotlin-dsl/src/test/java/com/baeldung/functionaldsl/routerfunctiondsl/RouterDslTest.java b/kotlin-dsl/src/test/java/com/baeldung/functionaldsl/routerfunctiondsl/RouterDslTest.java
@@ -0,0 +1,38 @@
+package com.baeldung.functionaldsl.routerfunctiondsl;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+
+import com.baeldung.functionaldsl.routerfunctiondsl.Application;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Map;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+
+@WebMvcTest(controllers = Application.class)
+@ContextConfiguration(classes = Application.class)
+public class RouterDslTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    private ObjectMapper objectMapper = new ObjectMapper();
+
+    @Test
+    void test() throws Exception {
+        Map<String, Object> result = objectMapper.readValue(mockMvc
+          .perform(get("/endpoint/anything").header("X-age", 22).param("name", "Mikhail"))
+          .andExpect(MockMvcResultMatchers.status().is2xxSuccessful())
+          .andReturn()
+          .getResponse()
+          .getContentAsString(), new TypeReference<Map<String, Object>>() {
+        });
+
+        Assertions.assertThat(result).containsKeys("name", "age", "country");
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.baeldung.functional_dsl.router_function_dsl`
	`1`	`+package com.baeldung.functionaldsl.routerfunctiondsl`
`2`	`2`
`3`	`3`	`import org.springframework.boot.autoconfigure.SpringBootApplication`
`4`	`4`	`import org.springframework.boot.runApplication`
`@@ -11,8 +11,7 @@ import org.springframework.web.servlet.function.router`
`11`	`11`	`open class Application`
`12`	`12`
`13`	`13`	`fun main(vararg args: String) {`
`14`		`- runApplication<Application>(*args)`
`15`		`- {`
	`14`	`+ runApplication<Application>(*args) {`
`16`	`15`	`addInitializers(`
`17`	`16`	`beans {`
`18`	`17`	`bean {`
`@@ -22,13 +21,13 @@ fun main(vararg args: String) {`
`22`	`21`	`mapOf(`
`23`	`22`	`"name" to it.param("name"),`
`24`	`23`	`"age" to it.headers().header("X-age")[0],`
`25`		`- "country" to it.pathVariable("country")`
`26`		`- )`
	`24`	`+ "country" to it.pathVariable("country"),`
	`25`	`+ ),`
`27`	`26`	`)`
`28`	`27`	`}`
`29`	`28`	`}`
`30`	`29`	`}`
`31`		`- }`
	`30`	`+ },`
`32`	`31`	`)`
`33`	`32`	`}`
`34`		`-}`
	`33`	`+}`