test: Fix test conflicts

eclipse-kuksa · Oct 16, 2023 · a043d0f · a043d0f
1 parent 2f411f8
commit a043d0f
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 132 deletions.
diff --git a/app/src/main/kotlin/org/eclipse/kuksa/testapp/extension/UriExtension.kt b/app/src/main/kotlin/org/eclipse/kuksa/testapp/extension/UriExtension.kt
@@ -22,10 +22,6 @@ package org.eclipse.kuksa.testapp.extension
 import android.content.Context
 import android.net.Uri
 import android.provider.OpenableColumns
-import android.content.res.AssetManager
-import org.eclipse.kuksa.testapp.databroker.model.Certificate
-import java.io.IOException
-import java.io.InputStream
 
 fun Uri.fetchFileName(context: Context): String? {
     var fileName: String? = null

diff --git a/app/src/test/kotlin/org/eclipse/kuksa/testapp/model/ConnectionInfoTest.kt b/app/src/test/kotlin/org/eclipse/kuksa/testapp/model/ConnectionInfoTest.kt
@@ -24,6 +24,9 @@ import io.kotest.matchers.shouldBe
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.eclipse.kuksa.test.kotest.Unit
+import org.eclipse.kuksa.testapp.databroker.model.Certificate
+import org.eclipse.kuksa.testapp.databroker.model.ConnectionInfo
+import org.eclipse.kuksa.testapp.databroker.model.ConnectionInfoSerializer
 import java.io.File
 import java.io.FileWriter
 

diff --git a/kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/DataBrokerConnectionTest.kt b/kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/DataBrokerConnectionTest.kt
@@ -28,13 +28,11 @@ import io.mockk.slot
 import io.mockk.verify
 import kotlinx.coroutines.runBlocking
 import org.eclipse.kuksa.databroker.DataBrokerConnectorProvider
-import org.eclipse.kuksa.kotest.Integration
 import org.eclipse.kuksa.model.Property
 import org.eclipse.kuksa.proto.v1.Types
 import org.eclipse.kuksa.proto.v1.Types.Datapoint
-import org.eclipse.kuksa.vssSpecification.VssDriver
-import org.eclipse.kuksa.test.databroker.DataBrokerConnectorProvider
 import org.eclipse.kuksa.test.kotest.Integration
+import org.eclipse.kuksa.vssSpecification.VssDriver
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue

diff --git a/kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/DataBrokerConnectorSecureTest.kt b/kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/DataBrokerConnectorSecureTest.kt
@@ -20,7 +20,7 @@
 package org.eclipse.kuksa
 
 import io.kotest.core.spec.style.BehaviorSpec
-import org.eclipse.kuksa.test.databroker.DataBrokerConnectorProvider
+import org.eclipse.kuksa.databroker.DataBrokerConnectorProvider
 import org.eclipse.kuksa.test.kotest.Integration
 import org.eclipse.kuksa.test.kotest.Secure
 import org.junit.jupiter.api.Assertions

diff --git a/kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/DataBrokerConnectorTest.kt b/kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/DataBrokerConnectorTest.kt
@@ -21,10 +21,10 @@ package org.eclipse.kuksa
 
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.style.BehaviorSpec
-import org.eclipse.kuksa.test.databroker.DataBrokerConnectorProvider
+import io.kotest.matchers.shouldNotBe
+import org.eclipse.kuksa.databroker.DataBrokerConnectorProvider
 import org.eclipse.kuksa.test.kotest.Insecure
 import org.eclipse.kuksa.test.kotest.Integration
-import org.junit.jupiter.api.Assertions
 
 class DataBrokerConnectorTest : BehaviorSpec({
     tags(Integration, Insecure)

diff --git a/kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/databroker/DataBrokerConfig.kt b/kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/databroker/DataBrokerConfig.kt
@@ -17,11 +17,7 @@
  *
  */
 
-<<<<<<<< HEAD:kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/databroker/DataBrokerConfig.kt
 package org.eclipse.kuksa.databroker
-========
-package org.eclipse.kuksa.test.databroker
->>>>>>>> Eclipse/main:kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/test/databroker/DataBrokerConfig.kt
 
 import java.util.concurrent.TimeUnit
 

diff --git a/kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/databroker/DataBrokerConnectorProvider.kt b/kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/databroker/DataBrokerConnectorProvider.kt
@@ -19,11 +19,7 @@
  *
  */
 
-<<<<<<<< HEAD:kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/databroker/DataBrokerConnectorProvider.kt
 package org.eclipse.kuksa.databroker
-========
-package org.eclipse.kuksa.test.databroker
->>>>>>>> Eclipse/main:kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/test/databroker/DataBrokerConnectorProvider.kt
 
 import io.grpc.ChannelCredentials
 import io.grpc.Grpc

diff --git a/kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/test/databroker/DataBrokerConfig.kt b/kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/test/databroker/DataBrokerConfig.kt
diff --git a/kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/test/databroker/DataBrokerConnectorProvider.kt b/kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/test/databroker/DataBrokerConnectorProvider.kt
diff --git a/kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/vssSpecification/VssSpecificationCopyTest.kt b/kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/vssSpecification/VssSpecificationCopyTest.kt
@@ -25,9 +25,9 @@ import io.kotest.matchers.shouldBe
 import io.kotest.matchers.string.shouldStartWith
 import org.eclipse.kuksa.extension.copy
 import org.eclipse.kuksa.extension.deepCopy
-import org.eclipse.kuksa.kotest.Unit
 import org.eclipse.kuksa.proto.v1.Types
 import org.eclipse.kuksa.proto.v1.Types.BoolArray
+import org.eclipse.kuksa.test.kotest.Unit
 
 class VssSpecificationCopyTest : BehaviorSpec({
     tags(Unit)