fix: fixed unit-tests

Signed-off-by: Andre Dietisheim <[email protected]>

Author: adietish

src/main/kotlin/com/redhat/devtools/intellij/kubernetes/editor/util/ResourceEditorUtils.kt

@@ -65,8 +65,8 @@ fun hasKubernetesResource(file: VirtualFile?, project: Project): Boolean {
  * @param resourceInfo the resource info to inspect
  */
 fun isKubernetesResource(resourceInfo: KubernetesResourceInfo?): Boolean {
-    return resourceInfo?.typeInfo?.apiGroup?.isNotBlank() ?: false
-            && resourceInfo?.typeInfo?.kind?.isNotBlank() ?: false
+    return resourceInfo?.apiGroup?.isNotBlank() ?: false
+            && resourceInfo?.kind?.isNotBlank() ?: false
 }
 
 fun isKubernetesResource(kind: String, info: KubernetesTypeInfo?): Boolean {
@@ -95,49 +95,6 @@ fun getKubernetesResourceInfo(file: VirtualFile?, project: Project): KubernetesR
     }
 }
 
-fun getChildren(document: YAMLDocument): List<YAMLPsiElement> {
-    val topLevelValue: YAMLValue = document.topLevelValue ?: return emptyList()
-
-    return when (topLevelValue) {
-        is YAMLMapping ->
-            topLevelValue.keyValues.toList()
-        is YAMLSequence ->
-            topLevelValue.items
-        else ->
-            emptyList()
-    }
-}
-
-fun getChildren(file: JsonFile): List<JsonElement> {
-    return file.allTopLevelValues
-}
-
-/**
- * Returns the [PsiElement] named "metadata" within the children of the given [PsiElement].
- * Only [YAMLKeyValue] and [JsonProperty] are supported. Returns `null` otherwise.
- *
- * @param element the PsiElement whose "metadata" child should be found.
- * @return the PsiElement named "metadata"
- */
-private fun getMetadata(parent: PsiElement): PsiElement? {
-    return getElement(KEY_METADATA, parent)
-}
-
-private fun getElement(key: String, parent: PsiElement): PsiElement? {
-    return when (parent) {
-        is YAMLValue ->
-            parent.children
-                .filterIsInstance<YAMLKeyValue>()
-                .find { it.name == key }
-        is JsonValue ->
-            parent.children.toList()
-                .filterIsInstance<JsonProperty>()
-                .find { it.name == key }
-        else ->
-            null
-    }
-}
-
 /**
  * Returns the [PsiElement] named "data" within the children of the given [PsiElement].
  * Only [YAMLKeyValue] and [JsonProperty] are supported. Returns `null` otherwise.

src/main/kotlin/com/redhat/devtools/intellij/kubernetes/telemetry/TelemetryService.kt

@@ -56,7 +56,7 @@ object TelemetryService {
     }
 
     fun sendTelemetry(info: KubernetesResourceInfo?, telemetry: TelemetryMessageBuilder.ActionMessage) {
-        telemetry.property(PROP_RESOURCE_KIND, kindOrUnknown(info?.typeInfo)).send()
+        telemetry.property(PROP_RESOURCE_KIND, kindOrUnknown(info?.kind, info?.apiGroup)).send()
     }
 
     fun getKinds(resources: Collection<HasMetadata>): String {
@@ -69,16 +69,13 @@ object TelemetryService {
     }
 
     private fun kindOrUnknown(kind: ResourceKind<*>?): String {
-        return if (kind != null) {
-            "${kind.version}/${kind.kind}"
-        } else {
-            "unknown"
-        }
+        return kindOrUnknown(kind?.kind, kind?.version);
     }
 
-    private fun kindOrUnknown(info: KubernetesTypeInfo?): String {
-        return if (info != null) {
-            "${info.apiGroup}/${info.kind}"
+    private fun kindOrUnknown(kind: String?, apiGroup: String?): String {
+        return if (kind != null
+            && apiGroup != null) {
+            "${kind}/${apiGroup}"
         } else {
             "unknown"
         }

src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/mocks/Mocks.kt

@@ -198,11 +198,16 @@ object Mocks {
     }
 
     fun kubernetesResourceInfo(name: String?, namespace: String?, typeInfo: KubernetesTypeInfo): KubernetesResourceInfo {
-        return mock {
-            on { this.name } doReturn name
-            on { this.namespace } doReturn namespace
-            on { this.typeInfo } doReturn typeInfo
-        }
+        val mock = mock<KubernetesResourceInfo>()
+        whenever(mock.name)
+            .thenReturn(name)
+        whenever(mock.namespace)
+            .thenReturn(namespace)
+        whenever(mock.kind)
+            .thenAnswer { typeInfo.kind } // avoid unfinished stubbing error in mockito
+        whenever(mock.apiGroup)
+            .thenAnswer { typeInfo.apiGroup } // avoid unfinished stubbing error in mockito
+        return mock
     }
 
     fun clientConfig(currentContext: NamedContext?, allContexts: List<NamedContext>): ClientConfig {