Clearing the notification auth test database at last

RADAR-base · Jan 14, 2025 · 49be0ec · 49be0ec
1 parent 91d319b
commit 49be0ec
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 19 deletions.
diff --git a/src/integrationTest/java/org/radarbase/appserver/auth/NotificationEndpointAuthTest.kt b/src/integrationTest/java/org/radarbase/appserver/auth/NotificationEndpointAuthTest.kt
@@ -29,11 +29,14 @@ import org.radarbase.appserver.dto.ProjectDto
 import org.radarbase.appserver.dto.fcm.FcmNotificationDto
 import org.radarbase.appserver.dto.fcm.FcmNotifications
 import org.radarbase.appserver.dto.fcm.FcmUserDto
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.web.client.TestRestTemplate
 import org.springframework.boot.test.web.server.LocalServerPort
 import org.springframework.http.*
+import org.springframework.jdbc.core.JdbcTemplate
 import org.springframework.test.context.junit.jupiter.SpringExtension
+import org.springframework.test.jdbc.JdbcTestUtils
 import org.springframework.web.client.ResourceAccessException
 import java.time.Duration
 import java.time.Instant
@@ -315,5 +318,12 @@ class NotificationEndpointAuthTest {
             AUTH_HEADER = HttpHeaders()
             AUTH_HEADER!!.setBearerAuth(oAuthHelper.getAccessToken())
         }
+
+        @AfterAll
+        @JvmStatic
+        fun clearDatabase(@Autowired jdbcTemplate: JdbcTemplate) {
+            JdbcTestUtils.deleteFromTables(jdbcTemplate, "notifications", "users", "projects")
+        }
+
     }
 }
diff --git a/src/integrationTest/java/org/radarbase/appserver/auth/ProjectEndpointAuthTest.kt b/src/integrationTest/java/org/radarbase/appserver/auth/ProjectEndpointAuthTest.kt
@@ -26,7 +26,6 @@ import org.junit.jupiter.api.extension.ExtendWith
 import org.radarbase.appserver.auth.common.MPOAuthHelper
 import org.radarbase.appserver.auth.common.OAuthHelper
 import org.radarbase.appserver.dto.ProjectDto
-import org.radarbase.appserver.dto.ProjectDtos
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.web.client.TestRestTemplate
 import org.springframework.boot.test.web.server.LocalServerPort

diff --git a/src/integrationTest/java/org/radarbase/appserver/auth/UserEndpointAuthTest.kt b/src/integrationTest/java/org/radarbase/appserver/auth/UserEndpointAuthTest.kt
@@ -46,23 +46,6 @@ import org.springframework.web.client.RestTemplate
 @TestMethodOrder(OrderAnnotation::class)
 class UserEndpointAuthTest {
 
-    companion object {
-        const val USER_PATH = "/users"
-        const val DEFAULT_PROJECT = "/radar"
-        private val HEADERS = HttpHeaders()
-        private lateinit var AUTH_HEADER: HttpHeaders
-        private val restTemplate = TestRestTemplate()
-
-        @JvmStatic
-        @BeforeAll
-        fun init() {
-            val oAuthHelper = MPOAuthHelper()
-            AUTH_HEADER = HttpHeaders().apply {
-                setBearerAuth(oAuthHelper.getAccessToken())
-            }
-        }
-    }
-
     private val userDto = FcmUserDto().apply {
         projectId = "radar"
         language = "en"
@@ -207,4 +190,21 @@ class UserEndpointAuthTest {
     private fun createURLWithPort(port: Int, path: String): String {
         return "http://localhost:$port$path"
     }
+
+    companion object {
+        const val USER_PATH = "/users"
+        const val DEFAULT_PROJECT = "/radar"
+        private val HEADERS = HttpHeaders()
+        private lateinit var AUTH_HEADER: HttpHeaders
+        private val restTemplate = TestRestTemplate()
+
+        @JvmStatic
+        @BeforeAll
+        fun init() {
+            val oAuthHelper = MPOAuthHelper()
+            AUTH_HEADER = HttpHeaders().apply {
+                setBearerAuth(oAuthHelper.getAccessToken())
+            }
+        }
+    }
 }
diff --git a/src/test/java/org/radarbase/appserver/service/scheduler/NotificationSchedulerServiceTest.kt b/src/test/java/org/radarbase/appserver/service/scheduler/NotificationSchedulerServiceTest.kt
@@ -107,7 +107,7 @@ class NotificationSchedulerServiceTest {
     @Test
     fun `update scheduled notification`() {
         val jobDetail = MessageSchedulerService.getJobDetailForMessage(notification, MessageType.NOTIFICATION)
-        val triggerFactoryBean = MessageSchedulerService.getTriggerForMessage(notification, jobDetail.`object`)
+        val triggerFactoryBean = MessageSchedulerService.getTriggerForMessage(notification, jobDetail.`object`!!)
         scheduler.scheduleJob(jobDetail.`object`, triggerFactoryBean.`object`)
 
         val updatedNotification = Notification.NotificationBuilder(notification)