Refactor the tests

This commit primarily refactors the existing forced/soft update tests to reduce the generation of unnecessary reports during build time. Signed-off-by: Saeed Rezaee <[email protected]>
Kynetics · Mar 8, 2024 · 82bc8ef · 82bc8ef
1 parent cc584f3
commit 82bc8ef
Show file tree

Hide file tree

Showing 15 changed files with 432 additions and 563 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,4 +36,5 @@
 **/out/**
 
 local.properties
-detekt-baseline.xml
+detekt-baseline.xml
+gradle.properties
diff --git a/ddi-consumer/ddi-api/src/test/kotlin/org/eclipse/hara/ddi/api/model/SerializationTest.kt b/ddi-consumer/ddi-api/src/test/kotlin/org/eclipse/hara/ddi/api/model/SerializationTest.kt
@@ -22,7 +22,7 @@ class SerializationTest {
     @DataProvider(name = "Serialization")
     fun objectsToSerialize(): Array<Any> {
         val cfgDataReq = ConfigurationDataRequest.of(emptyMap(), ConfigurationDataRequest.Mode.merge)
-        return arrayOf(cfgDataReq.copy(data = mapOf("ciao" to "miao")))
+        return arrayOf(cfgDataReq.copy(data = mapOf("foo" to "bar")))
     }
 
     @Test(dataProvider = "Serialization")

diff --git a/src/test/kotlin/org/eclipse/hara/ddiclient/integrationtest/DdiClientHttpRequestsTest.kt b/src/test/kotlin/org/eclipse/hara/ddiclient/integrationtest/DdiClientHttpRequestsTest.kt
@@ -19,6 +19,7 @@ import org.eclipse.hara.ddiclient.api.MessageListener
 import org.eclipse.hara.ddiclient.api.MessageListener.Message.Event.Polling
 import org.eclipse.hara.ddiclient.api.MessageListener.Message.State.Idle
 import org.eclipse.hara.ddiclient.integrationtest.abstractions.AbstractHaraMessageTest
+import org.eclipse.hara.ddiclient.integrationtest.api.management.HawkbitTargetInfo
 import org.eclipse.hara.ddiclient.integrationtest.api.management.ServerSystemConfig
 import org.eclipse.hara.ddiclient.integrationtest.utils.TestUtils
 import org.eclipse.hara.ddiclient.integrationtest.utils.TestUtils.basic
@@ -33,7 +34,6 @@ import kotlin.time.Duration.Companion.seconds
 
 class DdiClientHttpRequestsTest : AbstractHaraMessageTest() {
 
-    override val targetId: String = "DoubleToken"
     private var expectedServerResponses = mutableListOf<ExpectedMessage>()
 
     override val expectedMessagesList: MutableList<MutableList<ExpectedMessage>> by lazy {
@@ -52,6 +52,7 @@ class DdiClientHttpRequestsTest : AbstractHaraMessageTest() {
     }
 
     companion object {
+        const val TARGET_ID = "DoubleToken"
         const val TEST_TARGET_SECURITY_TOKEN = "r2m3ixxc86a2v4q81wntpyhr78zy08we"
     }
 
@@ -63,6 +64,15 @@ class DdiClientHttpRequestsTest : AbstractHaraMessageTest() {
     override fun beforeTest() {
         super.beforeTest()
         setPollingTime("00:00:05")
+        createTestTarget()
+    }
+
+    private fun createTestTarget() {
+        runBlocking {
+            managementApi.createTarget(
+                basic, listOf(HawkbitTargetInfo(TARGET_ID,
+                    securityToken = TEST_TARGET_SECURITY_TOKEN)))
+        }
     }
 
     @AfterClass
@@ -95,7 +105,7 @@ class DdiClientHttpRequestsTest : AbstractHaraMessageTest() {
         return clientFromTargetId(
             okHttpClientBuilder = okHttpClient,
             targetToken = targetToken,
-            gatewayToken = gatewayToken).invoke(targetId)
+            gatewayToken = gatewayToken).invoke(TARGET_ID)
     }
 
     @Suppress("UNUSED_VARIABLE")

diff --git a/...test/HawkbitDownloadOnlyDeploymentTest.kt → ...grationtest/DeploymentDownloadOnlyTest.kt b/...test/HawkbitDownloadOnlyDeploymentTest.kt → ...grationtest/DeploymentDownloadOnlyTest.kt
@@ -18,16 +18,15 @@ import org.eclipse.hara.ddiclient.integrationtest.utils.TestUtils
 import org.eclipse.hara.ddiclient.integrationtest.utils.TestUtils.endMessagesOnSuccessUpdate
 import org.eclipse.hara.ddiclient.integrationtest.utils.TestUtils.messagesOnSoftUpdateAuthorization
 import org.eclipse.hara.ddiclient.integrationtest.utils.TestUtils.messagesOnSuccessfullyDownloadDistribution
-import org.eclipse.hara.ddiclient.integrationtest.utils.TestUtils.targetRetrievedUpdateAction
 import org.testng.annotations.BeforeClass
 import org.testng.annotations.Test
 
-class HawkbitDownloadOnlyDeploymentTest : AbstractDeploymentTest() {
+class DeploymentDownloadOnlyTest : AbstractDeploymentTest() {
 
     private var actionId: Int = 0
-    override val targetId: String = "DownloadOnlyTest"
 
     companion object {
+        const val TARGET_ID: String = "DownloadOnlyTest"
         const val DISTRIBUTION_ID = 3
     }
 
@@ -40,12 +39,12 @@ class HawkbitDownloadOnlyDeploymentTest : AbstractDeploymentTest() {
     @Test(enabled = true, timeOut = 60_000, priority = 14)
     fun testDownloadOnlyWhileWaitingForUpdateAuthorization() = runBlocking {
 
-        reCreateTestTargetOnServer()
+        reCreateTestTargetOnServer(TARGET_ID)
 
         assignDownloadOnlyDistribution()
 
         val client = createHaraClientWithAuthorizationPermissions(
-            downloadAllowed = false, updateAllowed = true)
+            TARGET_ID, downloadAllowed = false, updateAllowed = true)
 
         startTheTestAndWaitForResult(client,
             createTargetTestDeployment(expectedActionsAfterDownloadOnlyDeployment))
@@ -54,7 +53,7 @@ class HawkbitDownloadOnlyDeploymentTest : AbstractDeploymentTest() {
     private suspend fun assignDownloadOnlyDistribution() {
         val distribution = HawkbitAssignDistributionBody(DISTRIBUTION_ID,
             AssignDistributionType.DOWNLOAD_ONLY, 0)
-        actionId = assignDistributionToTheTarget(distribution)
+        actionId = assignDistributionToTheTarget(TARGET_ID, distribution)
     }
 
     private fun createTargetTestDeployment(
@@ -64,12 +63,11 @@ class HawkbitDownloadOnlyDeploymentTest : AbstractDeploymentTest() {
                 TestUtils.test1Artifact) to TestUtils.locationOfFileNamed("test1"))
 
         return TestUtils.TargetDeployments(
-            targetId = targetId,
+            targetId = TARGET_ID,
             targetToken = "",
             deploymentInfo = listOf(
                 TestUtils.TargetDeployments.DeploymentInfo(
                     actionId = actionId,
-                    actionStatusOnStart = expectedActionOnStart,
                     actionStatusOnFinish = actionsOnFinish,
                     filesDownloadedPairedWithServerFile = filesDownloadedPairedToServerFile
                 )
@@ -82,9 +80,8 @@ class HawkbitDownloadOnlyDeploymentTest : AbstractDeploymentTest() {
             *endMessagesOnSuccessUpdate,
             *messagesOnSoftUpdateAuthorization,
             *messagesOnSuccessfullyDownloadDistribution(
-                TestUtils.md5OfFileNamed("test1"), targetId,
+                TestUtils.md5OfFileNamed("test1"), TARGET_ID,
                 "1", "test_1"),
-            targetRetrievedUpdateAction,
-            TestUtils.firstActionWithAssignmentEntry
+            *TestUtils.firstActionsOnTargetDeployment
         ))
 }