From 90b529adb4c3eb781a0f0ba9ec5fcebdc9919432 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer
Date: Sat, 20 Jan 2024 19:16:52 +0100
Subject: refactor: move test class to related package
---
.../etl/processor/MtbFileRestControllerTest.kt | 156 --------------------
.../etl/processor/web/MtbFileRestControllerTest.kt | 157 +++++++++++++++++++++
2 files changed, 157 insertions(+), 156 deletions(-)
delete mode 100644 src/integrationTest/kotlin/dev/dnpm/etl/processor/MtbFileRestControllerTest.kt
create mode 100644 src/integrationTest/kotlin/dev/dnpm/etl/processor/web/MtbFileRestControllerTest.kt
(limited to 'src/integrationTest/kotlin/dev/dnpm/etl')
diff --git a/src/integrationTest/kotlin/dev/dnpm/etl/processor/MtbFileRestControllerTest.kt b/src/integrationTest/kotlin/dev/dnpm/etl/processor/MtbFileRestControllerTest.kt
deleted file mode 100644
index 0cab566..0000000
--- a/src/integrationTest/kotlin/dev/dnpm/etl/processor/MtbFileRestControllerTest.kt
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * This file is part of ETL-Processor
- *
- * Copyright (c) 2024 Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-
-package dev.dnpm.etl.processor
-
-import com.fasterxml.jackson.databind.ObjectMapper
-import de.ukw.ccc.bwhc.dto.*
-import dev.dnpm.etl.processor.config.AppSecurityConfiguration
-import dev.dnpm.etl.processor.services.RequestProcessor
-import dev.dnpm.etl.processor.services.TokenRepository
-import dev.dnpm.etl.processor.web.MtbFileRestController
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
-import org.mockito.ArgumentMatchers.anyString
-import org.mockito.junit.jupiter.MockitoExtension
-import org.mockito.kotlin.any
-import org.mockito.kotlin.never
-import org.mockito.kotlin.times
-import org.mockito.kotlin.verify
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
-import org.springframework.boot.test.mock.mockito.MockBean
-import org.springframework.http.MediaType
-import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.anonymous
-import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user
-import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.TestPropertySource
-import org.springframework.test.context.junit.jupiter.SpringExtension
-import org.springframework.test.web.servlet.MockMvc
-import org.springframework.test.web.servlet.delete
-import org.springframework.test.web.servlet.post
-
-@WebMvcTest(controllers = [MtbFileRestController::class])
-@ExtendWith(value = [MockitoExtension::class, SpringExtension::class])
-@ContextConfiguration(classes = [
- MtbFileRestController::class,
- AppSecurityConfiguration::class
-])
-@MockBean(TokenRepository::class, RequestProcessor::class)
-@TestPropertySource(
- properties = [
- "app.pseudonymize.generator=BUILDIN",
- "app.security.admin-user=admin",
- "app.security.admin-password={noop}very-secret",
- "app.security.enable-tokens=true"
- ]
-)
-class MtbFileRestControllerTest {
-
- private lateinit var mockMvc: MockMvc
-
- private lateinit var requestProcessor: RequestProcessor
-
- @BeforeEach
- fun setup(
- @Autowired mockMvc: MockMvc,
- @Autowired requestProcessor: RequestProcessor
- ) {
- this.mockMvc = mockMvc
- this.requestProcessor = requestProcessor
- }
-
- @Test
- fun testShouldGrantPermissionToSendMtbFile() {
- mockMvc.post("/mtbfile") {
- with(user("onkostarserver").roles("MTBFILE"))
- contentType = MediaType.APPLICATION_JSON
- content = ObjectMapper().writeValueAsString(mtbFile)
- }.andExpect {
- status { isAccepted() }
- }
-
- verify(requestProcessor, times(1)).processMtbFile(any())
- }
-
- @Test
- fun testShouldDenyPermissionToSendMtbFile() {
- mockMvc.post("/mtbfile") {
- with(anonymous())
- contentType = MediaType.APPLICATION_JSON
- content = ObjectMapper().writeValueAsString(mtbFile)
- }.andExpect {
- status { isUnauthorized() }
- }
-
- verify(requestProcessor, never()).processMtbFile(any())
- }
-
- @Test
- fun testShouldGrantPermissionToDeletePatientData() {
- mockMvc.delete("/mtbfile/12345678") {
- with(user("onkostarserver").roles("MTBFILE"))
- }.andExpect {
- status { isAccepted() }
- }
-
- verify(requestProcessor, times(1)).processDeletion(anyString())
- }
-
- @Test
- fun testShouldDenyPermissionToDeletePatientData() {
- mockMvc.delete("/mtbfile/12345678") {
- with(anonymous())
- }.andExpect {
- status { isUnauthorized() }
- }
-
- verify(requestProcessor, never()).processDeletion(anyString())
- }
-
- companion object {
-
- val mtbFile: MtbFile = MtbFile.builder()
- .withPatient(
- Patient.builder()
- .withId("PID")
- .withBirthDate("2000-08-08")
- .withGender(Patient.Gender.MALE)
- .build()
- )
- .withConsent(
- Consent.builder()
- .withId("1")
- .withStatus(Consent.Status.ACTIVE)
- .withPatient("PID")
- .build()
- )
- .withEpisode(
- Episode.builder()
- .withId("1")
- .withPatient("PID")
- .withPeriod(PeriodStart("2023-08-08"))
- .build()
- )
- .build()
-
- }
-
-}
diff --git a/src/integrationTest/kotlin/dev/dnpm/etl/processor/web/MtbFileRestControllerTest.kt b/src/integrationTest/kotlin/dev/dnpm/etl/processor/web/MtbFileRestControllerTest.kt
new file mode 100644
index 0000000..0ffee29
--- /dev/null
+++ b/src/integrationTest/kotlin/dev/dnpm/etl/processor/web/MtbFileRestControllerTest.kt
@@ -0,0 +1,157 @@
+/*
+ * This file is part of ETL-Processor
+ *
+ * Copyright (c) 2024 Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+package dev.dnpm.etl.processor.web
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import de.ukw.ccc.bwhc.dto.*
+import dev.dnpm.etl.processor.config.AppSecurityConfiguration
+import dev.dnpm.etl.processor.services.RequestProcessor
+import dev.dnpm.etl.processor.services.TokenRepository
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
+import org.mockito.ArgumentMatchers.anyString
+import org.mockito.junit.jupiter.MockitoExtension
+import org.mockito.kotlin.any
+import org.mockito.kotlin.never
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
+import org.springframework.boot.test.mock.mockito.MockBean
+import org.springframework.http.MediaType
+import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.anonymous
+import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user
+import org.springframework.test.context.ContextConfiguration
+import org.springframework.test.context.TestPropertySource
+import org.springframework.test.context.junit.jupiter.SpringExtension
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.delete
+import org.springframework.test.web.servlet.post
+
+@WebMvcTest(controllers = [MtbFileRestController::class])
+@ExtendWith(value = [MockitoExtension::class, SpringExtension::class])
+@ContextConfiguration(
+ classes = [
+ MtbFileRestController::class,
+ AppSecurityConfiguration::class
+ ]
+)
+@MockBean(TokenRepository::class, RequestProcessor::class)
+@TestPropertySource(
+ properties = [
+ "app.pseudonymize.generator=BUILDIN",
+ "app.security.admin-user=admin",
+ "app.security.admin-password={noop}very-secret",
+ "app.security.enable-tokens=true"
+ ]
+)
+class MtbFileRestControllerTest {
+
+ private lateinit var mockMvc: MockMvc
+
+ private lateinit var requestProcessor: RequestProcessor
+
+ @BeforeEach
+ fun setup(
+ @Autowired mockMvc: MockMvc,
+ @Autowired requestProcessor: RequestProcessor
+ ) {
+ this.mockMvc = mockMvc
+ this.requestProcessor = requestProcessor
+ }
+
+ @Test
+ fun testShouldGrantPermissionToSendMtbFile() {
+ mockMvc.post("/mtbfile") {
+ with(user("onkostarserver").roles("MTBFILE"))
+ contentType = MediaType.APPLICATION_JSON
+ content = ObjectMapper().writeValueAsString(mtbFile)
+ }.andExpect {
+ status { isAccepted() }
+ }
+
+ verify(requestProcessor, times(1)).processMtbFile(any())
+ }
+
+ @Test
+ fun testShouldDenyPermissionToSendMtbFile() {
+ mockMvc.post("/mtbfile") {
+ with(anonymous())
+ contentType = MediaType.APPLICATION_JSON
+ content = ObjectMapper().writeValueAsString(mtbFile)
+ }.andExpect {
+ status { isUnauthorized() }
+ }
+
+ verify(requestProcessor, never()).processMtbFile(any())
+ }
+
+ @Test
+ fun testShouldGrantPermissionToDeletePatientData() {
+ mockMvc.delete("/mtbfile/12345678") {
+ with(user("onkostarserver").roles("MTBFILE"))
+ }.andExpect {
+ status { isAccepted() }
+ }
+
+ verify(requestProcessor, times(1)).processDeletion(anyString())
+ }
+
+ @Test
+ fun testShouldDenyPermissionToDeletePatientData() {
+ mockMvc.delete("/mtbfile/12345678") {
+ with(anonymous())
+ }.andExpect {
+ status { isUnauthorized() }
+ }
+
+ verify(requestProcessor, never()).processDeletion(anyString())
+ }
+
+ companion object {
+
+ val mtbFile: MtbFile = MtbFile.builder()
+ .withPatient(
+ Patient.builder()
+ .withId("PID")
+ .withBirthDate("2000-08-08")
+ .withGender(Patient.Gender.MALE)
+ .build()
+ )
+ .withConsent(
+ Consent.builder()
+ .withId("1")
+ .withStatus(Consent.Status.ACTIVE)
+ .withPatient("PID")
+ .build()
+ )
+ .withEpisode(
+ Episode.builder()
+ .withId("1")
+ .withPatient("PID")
+ .withPeriod(PeriodStart("2023-08-08"))
+ .build()
+ )
+ .build()
+
+ }
+
+}
--
cgit v1.2.3