basic tests

Author: samgst-amazon

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationPollingService.kt

@@ -57,6 +57,7 @@ object ETagState : PersistentStateComponent<ETagState.State> {
 
 @Service(Service.Level.APP)
 class NotificationPollingService : Disposable {
+    private val firstPollDone = AtomicBoolean(false)
     private val observers = mutableListOf<() -> Unit>()
     private val alarm = AlarmFactory.getInstance().create(Alarm.ThreadToUse.POOLED_THREAD, this)
     private val pollingIntervalMs = Duration.ofMinutes(10).toMillis()
@@ -90,7 +91,7 @@ class NotificationPollingService : Disposable {
             try {
                 val newETag = getNotificationETag()
                 if (newETag == ETagState.getState().etag) {
-                    if (firstPoll.compareAndSet(false, true)) {
+                    if (firstPollDone.compareAndSet(false, true)) {
                         notifyObservers()
                     }
                     return false
@@ -119,7 +120,7 @@ class NotificationPollingService : Disposable {
         HttpRequests.request(NOTIFICATION_ENDPOINT)
             .userAgent("AWS Toolkit for JetBrains")
             .connect { request ->
-                request.connection.headerFields["ETag"]?.firstOrNull() ?: ""
+                request.connection.headerFields["ETag"]?.firstOrNull().orEmpty()
             }
 
     private fun emitFailureMetric(e: Exception?) {
@@ -146,7 +147,6 @@ class NotificationPollingService : Disposable {
     }
 
     companion object {
-        private val firstPoll = AtomicBoolean(false)
         private val LOG = getLogger<NotificationPollingService>()
         fun getInstance(): NotificationPollingService =
             ApplicationManager.getApplication().getService(NotificationPollingService::class.java)

plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/notifications/NotificationPollingServiceImplTest.kt

@@ -0,0 +1,103 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.core.notifications
+
+import com.intellij.util.io.HttpRequests
+import io.mockk.*
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import software.aws.toolkits.core.utils.RemoteResourceResolver
+import software.aws.toolkits.jetbrains.core.RemoteResourceResolverProvider
+import java.nio.file.Path
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.atomic.AtomicBoolean
+
+class NotificationPollingServiceTest {
+    private lateinit var sut: NotificationPollingService
+    private lateinit var mockResolver: RemoteResourceResolver
+    private lateinit var mockProvider: RemoteResourceResolverProvider
+    private lateinit var observer: () -> Unit
+    private val testPath = Path.of("/test/path")
+
+    @BeforeEach
+    fun setUp() {
+        sut = NotificationPollingService()
+
+        mockResolver = mockk<RemoteResourceResolver> {
+            every { resolve(any()) } returns CompletableFuture.completedFuture(testPath)
+        }
+
+        mockProvider = mockk<RemoteResourceResolverProvider> {
+            every { get() } returns mockResolver
+        }
+
+        val providerField = NotificationPollingService::class.java
+            .getDeclaredField("resourceResolver")
+        providerField.isAccessible = true
+        providerField.set(sut, mockProvider)
+
+        // Create mock observers
+        observer = mockk<() -> Unit>()
+        every { observer.invoke() } just Runs
+
+        val observersField = NotificationPollingService::class.java
+            .getDeclaredField("observers")
+            .apply { isAccessible = true }
+
+        observersField.set(sut, mutableListOf(observer))
+    }
+
+    @AfterEach
+    fun tearDown() {
+        sut.dispose()
+    }
+
+    @Test
+    fun `test pollForNotifications when ETag matches - no new notifications`() {
+        ETagState.getState().etag = "same"
+        val firstPollField = NotificationPollingService::class.java
+            .getDeclaredField("firstPollDone")
+            .apply { isAccessible = true }
+        firstPollField.set(sut, AtomicBoolean(true))
+
+        mockkStatic(HttpRequests::class) {
+            every {
+                HttpRequests.request(any<String>())
+                    .userAgent(any())
+                    .connect<String>(any())
+            } returns "same"
+            sut.startPolling()
+        }
+        verify(exactly = 0) { observer.invoke() }
+    }
+
+    @Test
+    fun `test pollForNotifications when ETag matches on startup - notify observers`() {
+        ETagState.getState().etag = "same"
+        mockkStatic(HttpRequests::class) {
+            every {
+                HttpRequests.request(any<String>())
+                    .userAgent(any())
+                    .connect<String>(any())
+            } returns "same"
+            sut.startPolling()
+        }
+        verify(exactly = 1) { observer.invoke() }
+    }
+
+    @Test
+    fun `test pollForNotifications when ETag different - notify observers`() {
+        ETagState.getState().etag = "oldETag"
+        mockkStatic(HttpRequests::class) {
+            every {
+                HttpRequests.request(any<String>())
+                    .userAgent(any())
+                    .connect<String>(any())
+            } returns "newEtag"
+            sut.startPolling()
+        }
+        verify(exactly = 1) { observer.invoke() }
+    }
+}