diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 130d2b0cd..e6d4abf60 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,14 +3,14 @@ kubernetes-client = "7.3.0" devtools-common = "1.9.11-SNAPSHOT" jackson-core = "2.19.0" -commons-lang3 = "3.12.0" +commons-lang3 = "3.17.0" assertj-core = "3.22.0" mockito = "5.12.0" -mockito-kotlin = "2.2.0" -devtools-common-ui-test = "0.4.4-SNAPSHOT" -junit-platform = "1.11.3" -junit-jupiter = "5.11.3" -gson = "2.8.9" +mockito-kotlin = "5.4.0" +devtools-common-ui-test = "0.4.5-SNAPSHOT" +junit-platform = "1.12.2" +junit-jupiter = "5.12.2" +gson = "2.10.1" snakeyaml = "2.2" json = "20250517" everit-json-schema = "1.14.6" @@ -31,7 +31,7 @@ commons-lang3 = { group = "org.apache.commons", name = "commons-lang3", version. kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlinJvm" } assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertj-core" } mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" } -mockito-kotlin = { group = "com.nhaarman.mockitokotlin2", name = "mockito-kotlin", version.ref = "mockito-kotlin" } +mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref = "mockito-kotlin" } devtools-common-ui-test = { group = "com.redhat.devtools.intellij", name = "intellij-common-ui-test-library", version.ref = "devtools-common-ui-test" } junit-platform-launcher = { group = "org.junit.platform", name = "junit-platform-launcher", version.ref = "junit-platform" } junit-platform-suite = { group = "org.junit.platform", name = "junit-platform-suite", version.ref = "junit-platform" } diff --git a/scripts/build_local.sh b/scripts/build_local.sh index 6328f19c7..a878d3115 100644 --- a/scripts/build_local.sh +++ b/scripts/build_local.sh @@ -1,10 +1,12 @@ - #!/usr/bin/env bash +#!/usr/bin/env bash # Note: run from root # This is used to run and connect minikube cluster pgrep -f "[m]inikube" >/dev/null || minikube start || { echo 'Cannot start minikube.'; exit 1; } -eval "$(minikube docker-env)" || { echo 'Cannot switch to minikube docker'; exit 1; } +eval "$(./minikube docker-env)" || { echo 'Cannot switch to minikube docker'; exit 1; } +kubectl create deployment hello-minikube --image=kicbase/echo-server:1.0 +kubectl expose deployment hello-minikube --type=NodePort --port=8080 kubectl config use-context minikube # Check if cluster is in config, if not - here will be the empty labels diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/BasicTests.java b/src/it/java/org/jboss/tools/intellij/kubernetes/BasicTests.java index 95217ef72..996496da2 100644 --- a/src/it/java/org/jboss/tools/intellij/kubernetes/BasicTests.java +++ b/src/it/java/org/jboss/tools/intellij/kubernetes/BasicTests.java @@ -14,23 +14,28 @@ import com.intellij.remoterobot.fixtures.ComponentFixture; import com.intellij.remoterobot.fixtures.dataExtractor.RemoteText; import com.redhat.devtools.intellij.commonuitest.UITestRunner; +import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.FlatWelcomeFrame; +import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.toolwindowspane.ToolWindowPane; +import com.redhat.devtools.intellij.commonuitest.utils.constants.XPathDefinitions; import com.redhat.devtools.intellij.commonuitest.utils.project.CreateCloseUtils; import com.redhat.devtools.intellij.commonuitest.utils.runner.IntelliJVersion; -import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.toolwindowspane.ToolWindowPane; +import com.redhat.devtools.intellij.commonuitest.utils.testextension.ScreenshotAfterTestFailExtension; import org.jboss.tools.intellij.kubernetes.fixtures.mainidewindow.KubernetesToolsFixture; +import org.jboss.tools.intellij.kubernetes.tests.ClusterConnectedTest; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import static com.intellij.remoterobot.search.locators.Locators.byXpath; import static com.intellij.remoterobot.stepsProcessing.StepWorkerKt.step; import static com.intellij.remoterobot.utils.RepeatUtilsKt.waitFor; -import org.jboss.tools.intellij.kubernetes.tests.ClusterConnectedTest; import org.jboss.tools.intellij.kubernetes.tests.CreateResourceByEditTest; import org.jboss.tools.intellij.kubernetes.tests.OpenResourceEditorTest; import org.jboss.tools.intellij.kubernetes.tests.EditResourceTest; import org.jboss.tools.intellij.kubernetes.tests.CreateAnotherTypeResourceByEditTest; +import org.junit.jupiter.api.extension.ExtendWith; import java.time.Duration; import java.util.List; @@ -40,14 +45,21 @@ * * @author olkornii@redhat.com */ +@ExtendWith(ScreenshotAfterTestFailExtension.class) public class BasicTests { private static RemoteRobot robot; private static ComponentFixture kubernetesViewTree; + private static final String CLUSTER_NAME = "minikube"; @BeforeAll public static void connect() { - robot = UITestRunner.runIde(IntelliJVersion.COMMUNITY_V_2024_1, 8580); + robot = UITestRunner.runIde(IntelliJVersion.COMMUNITY_V_2023_1, 8580); + + FlatWelcomeFrame flatWelcomeFrame = robot.find(FlatWelcomeFrame.class, Duration.ofSeconds(10)); + flatWelcomeFrame.disableNotifications(); + flatWelcomeFrame.preventTipDialogFromOpening(); + CreateCloseUtils.createEmptyProject(robot, "test-project"); openKubernetesTab(); @@ -58,39 +70,42 @@ public static void connect() { @AfterAll public static void closeIde() { + CreateCloseUtils.closeProject(robot); + FlatWelcomeFrame flatWelcomeFrame = robot.find(FlatWelcomeFrame.class, Duration.ofSeconds(10)); + flatWelcomeFrame.clearWorkspace(); UITestRunner.closeIde(); } @Test public void checkClusterConnected() { - step("New Empty Project", () -> ClusterConnectedTest.checkClusterConnected(kubernetesViewTree)); + step("New Empty Project", () -> new ClusterConnectedTest(CLUSTER_NAME, kubernetesViewTree, robot).checkClusterConnected()); } @Test public void openResourceEditor() { - step("open Resource Editor", () -> OpenResourceEditorTest.checkResourceEditor(robot, kubernetesViewTree)); + step("Open Resource Editor", () -> new OpenResourceEditorTest(CLUSTER_NAME, kubernetesViewTree, robot).checkResourceEditor()); } @Test public void editResource() { - step("edit Resource", () -> EditResourceTest.editResource(robot, kubernetesViewTree)); + step("Edit Resource", () -> new EditResourceTest(CLUSTER_NAME, kubernetesViewTree, robot).editResource()); } @Test public void createResourceByEdit() { - step("create Resource", () -> CreateResourceByEditTest.createResourceByEdit(robot, kubernetesViewTree)); + step("Create Resource", () -> new CreateResourceByEditTest(CLUSTER_NAME, kubernetesViewTree, robot).createResourceByEdit()); - step("delete Resource", () -> CreateResourceByEditTest.deleteResource(robot, kubernetesViewTree)); + step("Delete Resource", () -> new CreateResourceByEditTest(CLUSTER_NAME, kubernetesViewTree, robot).deleteResource()); } - // @Test + @Test public void createAnotherResourceTypeByEdit() { - step("create another type of Resource", () -> CreateAnotherTypeResourceByEditTest.createAnotherTypeResourceByEdit(robot, kubernetesViewTree)); + step("Create another type of Resource", () -> new CreateAnotherTypeResourceByEditTest(CLUSTER_NAME, kubernetesViewTree, robot).createAnotherTypeResourceByEdit()); } private static void openKubernetesTab(){ - final ToolWindowPane toolWindowPane = robot.find(ToolWindowPane.class, Duration.ofSeconds(5)); - toolWindowPane.stripeButton("Kubernetes", false).click(); + ToolWindowPane toolWindowToolbar = robot.find(ToolWindowPane.class, Duration.ofSeconds(10)); + toolWindowToolbar.button(byXpath(XPathDefinitions.label("Kubernetes"))).click(); } private static boolean isKubernetesViewTreeAvailable(){ diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/AbstractKubernetesTest.java b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/AbstractKubernetesTest.java index 8575d6b49..eec20fc7a 100644 --- a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/AbstractKubernetesTest.java +++ b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/AbstractKubernetesTest.java @@ -14,162 +14,113 @@ import com.intellij.remoterobot.fixtures.ComponentFixture; import com.intellij.remoterobot.fixtures.dataExtractor.RemoteText; import com.intellij.remoterobot.utils.Keyboard; -import com.intellij.remoterobot.utils.WaitForConditionTimeoutException; -import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.errors.IdeFatalErrorsDialog; import org.assertj.swing.core.MouseButton; -import org.jboss.tools.intellij.kubernetes.fixtures.mainidewindow.IdeStatusBarFixture; - -import java.awt.*; -import java.awt.datatransfer.Clipboard; import java.awt.event.KeyEvent; import java.time.Duration; import java.util.List; +import java.util.Optional; import static com.intellij.remoterobot.search.locators.Locators.byXpath; import static com.intellij.remoterobot.utils.RepeatUtilsKt.waitFor; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * @author olkornii@redhat.com */ public abstract class AbstractKubernetesTest { - public static void openResourceContentList(String[] path, ComponentFixture kubernetesViewTree){ - openClusterContent(kubernetesViewTree); - for (String resourceForOpen : path){ - kubernetesViewTree.findText(resourceForOpen).doubleClick(MouseButton.LEFT_BUTTON); // open Nodes content - try { - Thread.sleep(3000); // sleep for few seconds, cluster need some time to reload nodes - } catch (InterruptedException e) { - e.printStackTrace(); - } - waitFor(Duration.ofSeconds(15), Duration.ofSeconds(1), "Resources is not available.", () -> isResourcesLoaded(kubernetesViewTree)); - } - } + protected static final String NODES = "Nodes"; + protected static final String resourceName = "hello-minikube"; // resource created in script + protected final ComponentFixture kubernetesViewTree; + protected final RemoteRobot robot; + protected final String clusterName; - public static boolean isResourcesLoaded(ComponentFixture kubernetesViewTree){ - List allTextFromTree = kubernetesViewTree.findAllText(); - for (RemoteText actualText : allTextFromTree){ - if (actualText.getText().contains("loading...")){ - return false; - } - } - return true; + AbstractKubernetesTest(String clusterName, ComponentFixture kubernetesViewTree, RemoteRobot remoteRobot) { + this.clusterName = clusterName; + this.kubernetesViewTree = kubernetesViewTree; + this.robot = remoteRobot; } - public static void openClusterContent(ComponentFixture kubernetesViewTree){ - List kubernetesToolsText = kubernetesViewTree.findAllText(); - boolean needClickOnMinikube = true; - for (RemoteText findNodes : kubernetesToolsText){ - if (findNodes.getText().contains("Nodes")){ - needClickOnMinikube = false; - break; + public void openResourceContentList(String[] path){ + for (String resourceToOpen : path){ + List findings = kubernetesViewTree.findAllText(resourceToOpen); + if (findings.isEmpty()){ + fail("Can't find resource " + resourceToOpen); } + kubernetesViewTree.findText(resourceToOpen).doubleClick(MouseButton.LEFT_BUTTON); // open resource content + waitFor(Duration.ofSeconds(15), Duration.ofSeconds(1), "Resource to be available.", this::isResourcesLoaded); } - if (needClickOnMinikube){ - String clusterText = kubernetesViewTree.findAllText().get(0).getText(); - kubernetesViewTree.findText(clusterText).doubleClick(MouseButton.LEFT_BUTTON); - } - waitFor(Duration.ofSeconds(15), Duration.ofSeconds(1), "Kubernetes Tree View is not available.", () -> isNodesOpened(kubernetesViewTree)); } - public static boolean isNodesOpened(ComponentFixture kubernetesViewTree){ - List allTextFromTree = kubernetesViewTree.findAllText(); - for (RemoteText actualText : allTextFromTree){ - if (actualText.getText().contains("Nodes")){ - return true; - } - } - return false; + public boolean isResourcesLoaded(){ + return kubernetesViewTree.findAllText().stream().noneMatch(remoteText -> remoteText.getText().contains("loading...")); } - public static RemoteText getResourceByIdInParent(String parentName, int id, ComponentFixture kubernetesViewTree){ - List kubernetesToolsText = kubernetesViewTree.findAllText(); - int parentId = 0; - for (RemoteText findParent : kubernetesToolsText){ - if (findParent.getText().contains(parentName)){ - break; - } - parentId++; - } - return kubernetesViewTree.findAllText().get(parentId + id + 1); + protected void openClusterContent(){ + kubernetesViewTree.findText(clusterName).doubleClick(MouseButton.LEFT_BUTTON); + waitFor(Duration.ofSeconds(15), Duration.ofSeconds(1), "Kubernetes Tree View to be available.", this::isNodesOpened); } - public static void hideClusterContent(ComponentFixture kubernetesViewTree){ - String clusterText = kubernetesViewTree.findAllText().get(0).getText(); - kubernetesViewTree.findText(clusterText).doubleClick(); // hide cluster content + public boolean isNodesOpened(){ + return kubernetesViewTree.findAllText().stream().anyMatch(remoteText -> remoteText.getText().equals(NODES)); } - public static boolean isResourceCreated(ComponentFixture kubernetesViewTree, String resourceName, boolean hardCompare){ - List kubernetesToolsText = kubernetesViewTree.findAllText(); + public RemoteText getFirstResourceInNodes(){ + openClusterContent(); + openResourceContentList(new String[]{NODES}); + List allVisibleElements = kubernetesViewTree.findAllText(); + Optional resourceText = allVisibleElements.stream().filter(remoteText -> remoteText.getText().equals(NODES)).findFirst(); + assertTrue(resourceText.isPresent()); + return allVisibleElements.get(allVisibleElements.indexOf(resourceText.get())+1); + } - if (hardCompare){ - for (RemoteText findNewResource : kubernetesToolsText){ - if (resourceName.equals(findNewResource.getText())){ - return true; - } - } - } else { - for (RemoteText findNewResource : kubernetesToolsText){ - if (findNewResource.getText().contains(resourceName)){ - return true; - } - } - } - return false; + /** + * open a resource under the 'Nodes' item + * @param resourceName the resource to open + * @return the remoteText found with that name + */ + public RemoteText getNamedResourceInNodes(String resourceName){ + openClusterContent(); + openResourceContentList(new String[]{NODES}); + return getResource(resourceName); } - public static boolean isResourceDeleted(ComponentFixture kubernetesViewTree, String resourceName){ - List kubernetesToolsText = kubernetesViewTree.findAllText(); - for (RemoteText findNewResource : kubernetesToolsText){ - if (resourceName.equals(findNewResource.getText())){ - return false; - } - } - return true; + protected RemoteText getResource(String resourceName){ + waitFor(Duration.ofSeconds(15), Duration.ofSeconds(1), "Resource to be available.", () -> kubernetesViewTree.findAllText().stream().anyMatch(remoteText -> remoteText.getText().startsWith(resourceName))); + List allVisibleElements = kubernetesViewTree.findAllText(); + Optional resourceText = allVisibleElements.stream().filter(remoteText -> remoteText.getText().startsWith(resourceName)).findFirst(); + assertTrue(resourceText.isPresent()); + assertTrue(allVisibleElements.contains(resourceText.get())); + assertTrue(allVisibleElements.lastIndexOf(resourceText.get()) < allVisibleElements.size()); + return allVisibleElements.get(allVisibleElements.indexOf(resourceText.get())); } - public static boolean isError(RemoteRobot robot){ - IdeStatusBarFixture ideStatusBar = robot.find(IdeStatusBarFixture.class); - try { - ideStatusBar.ideErrorsIcon(); - } catch (WaitForConditionTimeoutException e) { - return false; - } - return true; + public void hideClusterContent(){ + kubernetesViewTree.findText(clusterName).doubleClick(MouseButton.LEFT_BUTTON); } - public static void clearErrors(RemoteRobot robot){ - IdeStatusBarFixture statusBar = robot.find(IdeStatusBarFixture.class); - try { - statusBar.ideErrorsIcon().click(); - } catch (WaitForConditionTimeoutException e) { - e.printStackTrace(); + public boolean isResourceCreated(String resourceName, boolean hardCompare){ + List kubernetesToolsText = kubernetesViewTree.findAllText(); + + Optional resourceText; + if (hardCompare){ + resourceText = kubernetesToolsText.stream().filter(remoteText -> remoteText.getText().equals(resourceName)).findFirst(); + } else { + resourceText = kubernetesToolsText.stream().filter(remoteText -> remoteText.getText().contains(resourceName)).findFirst(); } - IdeFatalErrorsDialog ideErrorsDialog = robot.find(IdeFatalErrorsDialog.class); - ideErrorsDialog.clearAll(); + return resourceText.isPresent(); } - public static Clipboard getSystemClipboard() - { - Toolkit defaultToolkit = Toolkit.getDefaultToolkit(); - return defaultToolkit.getSystemClipboard(); + public boolean isResourceDeleted(String resourceName){ + return kubernetesViewTree.findAllText().stream().noneMatch(remoteText -> remoteText.getText().equals(resourceName)); } - public static void scrollToVisible(String text, RemoteRobot robot) { + public void scrollToVisible(String text) { Keyboard myKeyboard = new Keyboard(robot); myKeyboard.hotKey(KeyEvent.VK_CONTROL, KeyEvent.VK_F); robot.find(ComponentFixture.class, byXpath("//div[@class='SearchTextArea']")).click(); - - clearSearchField(robot); - myKeyboard.enterText(text); } - private static void clearSearchField(RemoteRobot robot) { - try { - robot.find(ComponentFixture.class, byXpath("//div[@myaction='null (null)']")).click(); - } catch (WaitForConditionTimeoutException e) { - e.printStackTrace(); - } - } } diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/ClusterConnectedTest.java b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/ClusterConnectedTest.java index 6638be06b..1f8612bef 100644 --- a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/ClusterConnectedTest.java +++ b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/ClusterConnectedTest.java @@ -10,16 +10,25 @@ ******************************************************************************/ package org.jboss.tools.intellij.kubernetes.tests; +import com.intellij.remoterobot.RemoteRobot; import com.intellij.remoterobot.fixtures.ComponentFixture; +import org.assertj.swing.core.MouseButton; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author olkornii@redhat.com */ public class ClusterConnectedTest extends AbstractKubernetesTest{ - public static void checkClusterConnected(ComponentFixture kubernetesViewTree){ - String clusterText = kubernetesViewTree.findAllText().get(0).getText(); - assertTrue(clusterText.contains("minikube")); + + public ClusterConnectedTest(String clusterName, ComponentFixture kubernetesViewTree, RemoteRobot remoteRobot) { + super(clusterName, kubernetesViewTree, remoteRobot); + } + + public void checkClusterConnected(){ + assertNotNull(kubernetesViewTree.findText(clusterName)); + kubernetesViewTree.findText(clusterName).doubleClick(MouseButton.LEFT_BUTTON); + assertNotNull(kubernetesViewTree.findText(NODES)); + hideClusterContent(); } } diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/CreateAnotherTypeResourceByEditTest.java b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/CreateAnotherTypeResourceByEditTest.java index 28a78cf56..9e69ce3ad 100644 --- a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/CreateAnotherTypeResourceByEditTest.java +++ b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/CreateAnotherTypeResourceByEditTest.java @@ -14,20 +14,17 @@ import com.intellij.remoterobot.fixtures.ComponentFixture; import com.intellij.remoterobot.fixtures.dataExtractor.RemoteText; import com.intellij.remoterobot.utils.Keyboard; -import org.assertj.swing.core.MouseButton; -import org.jboss.tools.intellij.kubernetes.fixtures.dialogs.IdeFatalErrorsDialogFixture; import org.jboss.tools.intellij.kubernetes.fixtures.mainidewindow.EditorsSplittersFixture; -import org.jboss.tools.intellij.kubernetes.fixtures.mainidewindow.IdeStatusBarFixture; import org.jboss.tools.intellij.kubernetes.fixtures.menus.ActionToolbarMenu; import org.jboss.tools.intellij.kubernetes.fixtures.menus.RightClickMenu; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.StringSelection; import java.awt.event.KeyEvent; import java.time.Duration; +import java.util.Optional; +import static com.intellij.remoterobot.search.locators.Locators.byXpath; import static com.intellij.remoterobot.utils.RepeatUtilsKt.waitFor; -import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author olkornii@redhat.com @@ -36,86 +33,91 @@ public class CreateAnotherTypeResourceByEditTest extends AbstractKubernetesTest{ private static final String newResourceName = "newresourcename2"; - public static void createAnotherTypeResourceByEdit(RemoteRobot robot, ComponentFixture kubernetesViewTree){ - clearErrors(robot); + public CreateAnotherTypeResourceByEditTest(String clusterName, ComponentFixture kubernetesViewTree, RemoteRobot remoteRobot) { + super(clusterName, kubernetesViewTree, remoteRobot); + } - openResourceContentList(new String[]{"Nodes"}, kubernetesViewTree); - RemoteText selectedResource = getResourceByIdInParent("Nodes", 0, kubernetesViewTree); - selectedResource.doubleClick(); + public void createAnotherTypeResourceByEdit(){ + getNamedResourceInNodes(resourceName).doubleClick(); EditorsSplittersFixture editorSplitter = robot.find(EditorsSplittersFixture.class); - Keyboard myKeyboard = new Keyboard(robot); - setupNewPod(robot, myKeyboard); - - clearErrors(robot); + setupNewPod(); ActionToolbarMenu toolbarMenu = robot.find(ActionToolbarMenu.class); toolbarMenu.pushToCluster(); - checkErrors(robot); - editorSplitter.closeEditor(); // close editor - hideClusterContent(kubernetesViewTree); - openResourceContentList(new String[] {"Workloads", "Pods"}, kubernetesViewTree); - waitFor(Duration.ofSeconds(15), Duration.ofSeconds(1), "New resource was not been created.", () -> isResourceCreated(kubernetesViewTree, newResourceName, false)); - hideClusterContent(kubernetesViewTree); - } - - private static void setupNewPod(RemoteRobot robot, Keyboard myKeyboard){ - Clipboard clipboard = getSystemClipboard(); - - String text = "apiVersion: apps/v1\n" + - "kind: Deployment\n" + - "metadata:\n" + - " name: " + newResourceName + "\n" + - "spec:\n" + - " replicas: 2\n" + - " selector:\n" + - " matchLabels:\n" + - " app: sise\n" + - " template:\n" + - " metadata:\n" + - " labels:\n" + - " app: sise\n" + - " spec:\n" + - " containers:\n" + - " - name: sise\n" + - " image: quay.io/openshiftlabs/simpleservice:0.5.0\n" + - " ports:\n" + - " - containerPort: 9876\n" + - " env:\n" + - " - name: SIMPLE_SERVICE_VERSION\n" + - " value: \"0.9\""; - - clipboard.setContents(new StringSelection(text), null); + hideClusterContent(); - EditorsSplittersFixture editorSplitter = robot.find(EditorsSplittersFixture.class); - ComponentFixture textFixture = editorSplitter.getEditorTextFixture(); - RemoteText remoteText = textFixture.findAllText().get(0); - - myKeyboard.hotKey(KeyEvent.VK_CONTROL, KeyEvent.VK_A); - remoteText.click(MouseButton.RIGHT_BUTTON); + openClusterContent(); + openResourceContentList(new String[] {"Workloads", "Deployments"}); + waitFor(Duration.ofSeconds(15), Duration.ofSeconds(1), "New resource was not been created.", () -> isResourceCreated(newResourceName, false)); + //delete pod to refresh label + Optional deploymentResource = kubernetesViewTree.findAllText().stream().filter(remoteText -> remoteText.getText().contains(newResourceName)).findFirst(); + assertTrue(deploymentResource.isPresent()); + deploymentResource.get().rightClick(); RightClickMenu rightClickMenu = robot.find(RightClickMenu.class); - rightClickMenu.select("Paste"); - try { - Thread.sleep(3000); - } catch (InterruptedException e) { - e.printStackTrace(); - } + rightClickMenu.select("Delete"); + robot.find(ComponentFixture.class, byXpath("//div[@text='Yes']")).click(); + hideClusterContent(); } - private static void checkErrors(RemoteRobot robot){ - StringBuilder errorMessage = new StringBuilder(); - boolean isErrorAfterPush = isError(robot); - if (isErrorAfterPush){ - robot.find(IdeStatusBarFixture.class).ideErrorsIcon().click(); - IdeFatalErrorsDialogFixture ideErrorsDialog = robot.find(IdeFatalErrorsDialogFixture.class); - for (RemoteText remoteText: ideErrorsDialog.exceptionDescriptionJTextArea().findAllText()){ - errorMessage.append(remoteText.getText()); - } - } - assertFalse(isErrorAfterPush, errorMessage.toString()); + private void setupNewPod(){ + Keyboard myKeyboard = new Keyboard(robot); + + myKeyboard.hotKey(KeyEvent.VK_CONTROL, KeyEvent.VK_A); + myKeyboard.backspace(); + + // enter text + myKeyboard.enterText("apiVersion: apps/v1"); + myKeyboard.enter(); + myKeyboard.enterText("kind: Deployment"); + myKeyboard.enter(); + myKeyboard.enterText("metadata:"); + myKeyboard.enter(); + myKeyboard.enterText("name: " + newResourceName); + myKeyboard.enter(); + myKeyboard.enterText("labels:"); + myKeyboard.enter(); + myKeyboard.enterText("app: nginx"); + myKeyboard.enter(); + myKeyboard.backspace(); + myKeyboard.backspace(); + myKeyboard.enterText("spec:"); + myKeyboard.enter(); + myKeyboard.enterText("replicas: 2"); + myKeyboard.enter(); + myKeyboard.enterText("selector:"); + myKeyboard.enter(); + myKeyboard.enterText("matchLabels:"); + myKeyboard.enter(); + myKeyboard.enterText("app: nginx"); + myKeyboard.enter(); + myKeyboard.backspace(); + myKeyboard.backspace(); + myKeyboard.enterText("template:"); + myKeyboard.enter(); + myKeyboard.enterText("metadata:"); + myKeyboard.enter(); + myKeyboard.enterText("labels:"); + myKeyboard.enter(); + myKeyboard.enterText("app: nginx"); + myKeyboard.enter(); + myKeyboard.backspace(); + myKeyboard.backspace(); + myKeyboard.enterText("spec:"); + myKeyboard.enter(); + myKeyboard.enterText("containers:"); + myKeyboard.enter(); + myKeyboard.enterText("- name: nginx"); + myKeyboard.enter(); + myKeyboard.enterText("image: nginx:1.14.2"); + myKeyboard.enter(); + myKeyboard.enterText("ports:"); + myKeyboard.enter(); + myKeyboard.enterText("- containerPort: 80"); } + } diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/CreateResourceByEditTest.java b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/CreateResourceByEditTest.java index ed5206f0c..5395e846d 100644 --- a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/CreateResourceByEditTest.java +++ b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/CreateResourceByEditTest.java @@ -22,6 +22,7 @@ import java.time.Duration; import java.util.List; +import java.util.Optional; import static com.intellij.remoterobot.search.locators.Locators.byXpath; import static com.intellij.remoterobot.utils.RepeatUtilsKt.waitFor; @@ -35,62 +36,57 @@ public class CreateResourceByEditTest extends AbstractKubernetesTest{ private static final String newResourceName = "newresourcename1"; - public static void createResourceByEdit(RemoteRobot robot, ComponentFixture kubernetesViewTree){ - openResourceContentList(new String[]{"Nodes"}, kubernetesViewTree); - RemoteText selectedResource = getResourceByIdInParent("Nodes", 0, kubernetesViewTree); - selectedResource.doubleClick(); + public CreateResourceByEditTest(String clusterName, ComponentFixture kubernetesViewTree, RemoteRobot remoteRobot) { + super(clusterName, kubernetesViewTree, remoteRobot); + } + + public void createResourceByEdit(){ + getFirstResourceInNodes().doubleClick(MouseButton.LEFT_BUTTON); EditorsSplittersFixture editorSplitter = robot.find(EditorsSplittersFixture.class); Keyboard myKeyboard = new Keyboard(robot); String text = "\"" + newResourceName; - RemoteText namePlace = findResourceNamePosition(robot, editorSplitter); - namePlace.doubleClick(); + RemoteText namePlace = findResourceNamePosition(editorSplitter); + namePlace.doubleClick(MouseButton.LEFT_BUTTON); myKeyboard.enterText(text); // replace with new name ActionToolbarMenu toolbarMenu = robot.find(ActionToolbarMenu.class); toolbarMenu.pushToCluster(); - waitFor(Duration.ofSeconds(15), Duration.ofSeconds(1), "New resource was not been created.", () -> isResourceCreated(kubernetesViewTree, newResourceName, true)); // wait 15 seconds for Nodes load + waitFor(Duration.ofSeconds(15), Duration.ofSeconds(1), "New resource was not been created.", () -> isResourceCreated(newResourceName, true)); // wait 15 seconds for Nodes load editorSplitter.closeEditor(); // close editor - hideClusterContent(kubernetesViewTree); + hideClusterContent(); } - public static void deleteResource(RemoteRobot robot, ComponentFixture kubernetesViewTree){ - openResourceContentList(new String[]{"Nodes"}, kubernetesViewTree); - kubernetesViewTree.findText(newResourceName).click(MouseButton.RIGHT_BUTTON); + public void deleteResource(){ + kubernetesViewTree.findText(clusterName).rightClick(); RightClickMenu rightClickMenu = robot.find(RightClickMenu.class); + rightClickMenu.select("Refresh"); + RemoteText toDelete = getNamedResourceInNodes(newResourceName); + toDelete.click(MouseButton.RIGHT_BUTTON); + rightClickMenu = robot.find(RightClickMenu.class); rightClickMenu.select("Delete"); // delete the resource - waitFor(Duration.ofSeconds(15), Duration.ofSeconds(1), "Delete dialog did not appear.", () -> acceptDeleteDialog(robot)); - waitFor(Duration.ofSeconds(15), Duration.ofSeconds(1), "New resource was not been deleted.", () -> isResourceDeleted(kubernetesViewTree, newResourceName)); - hideClusterContent(kubernetesViewTree); + waitFor(Duration.ofSeconds(15), Duration.ofSeconds(1), "Delete dialog did not appear.", this::acceptDeleteDialog); + waitFor(Duration.ofSeconds(15), Duration.ofSeconds(1), "New resource was not been deleted.", () -> isResourceDeleted(newResourceName)); + hideClusterContent(); } - private static RemoteText findResourceNamePosition(RemoteRobot robot, EditorsSplittersFixture editorSplitter){ - scrollToVisible(" name:", robot); + private RemoteText findResourceNamePosition(EditorsSplittersFixture editorSplitter){ + scrollToVisible(" name:"); ComponentFixture textFixture = editorSplitter.getEditorTextFixture(); - List remoteText = textFixture.findAllText(); - - int nameId = 0; - boolean nameFound = false; - for (RemoteText actual_remote_text : remoteText){ - if ("name".equals(actual_remote_text.getText())){ - nameFound = true; - break; - } - nameId++; - } - - assertTrue(nameFound, "Resource name not found."); - return remoteText.get(nameId+3); // +1 because we need the next one, +1 because between every 2 real elements is space, +1 because here is the ":" + List allVisibleElements = textFixture.findAllText(); + Optional resourceText = allVisibleElements.stream().filter(remoteText -> remoteText.getText().equals("name")).findFirst(); + assertTrue(resourceText.isPresent()); + return allVisibleElements.get(allVisibleElements.indexOf(resourceText.get())+3); // +1 because we need the next one, +1 because between every 2 real elements is space, +1 because here is the ":" } - private static boolean acceptDeleteDialog(RemoteRobot robot){ + private boolean acceptDeleteDialog(){ try { robot.find(ComponentFixture.class, byXpath("//div[@text='Yes']")).click(); return true; diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/EditResourceTest.java b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/EditResourceTest.java index f586cadfd..672830570 100644 --- a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/EditResourceTest.java +++ b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/EditResourceTest.java @@ -14,79 +14,76 @@ import com.intellij.remoterobot.fixtures.ComponentFixture; import com.intellij.remoterobot.fixtures.dataExtractor.RemoteText; import com.intellij.remoterobot.utils.Keyboard; +import org.assertj.swing.core.MouseButton; import org.jboss.tools.intellij.kubernetes.fixtures.mainidewindow.EditorsSplittersFixture; import org.jboss.tools.intellij.kubernetes.fixtures.menus.ActionToolbarMenu; +import org.jboss.tools.intellij.kubernetes.fixtures.menus.RightClickMenu; +import java.awt.event.KeyEvent; import java.util.List; +import java.util.Optional; +import static com.intellij.remoterobot.search.locators.Locators.byXpath; import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author olkornii@redhat.com */ public class EditResourceTest extends AbstractKubernetesTest{ - public static void editResource(RemoteRobot robot, ComponentFixture kubernetesViewTree){ + + public EditResourceTest(String clusterName, ComponentFixture kubernetesViewTree, RemoteRobot remoteRobot) { + super(clusterName, kubernetesViewTree, remoteRobot); + } + + public void editResource(){ String yodaLabel = "yoda_label"; String yodaText = "yoda_text"; - openResourceContentList(new String[]{"Nodes"}, kubernetesViewTree); - RemoteText selectedResource = getResourceByIdInParent("Nodes", 0, kubernetesViewTree); - selectedResource.doubleClick(); + getNamedResourceInNodes("hello-minikube").doubleClick(); EditorsSplittersFixture editorSplitter = robot.find(EditorsSplittersFixture.class); - RemoteText placeForNewLabel = getPlaceForNewLabel(editorSplitter); - placeForNewLabel.click(); - - String text = " " + yodaLabel +": \"" + yodaText; + String text = yodaLabel +": \"" + yodaText; Keyboard myKeyboard = new Keyboard(robot); + RemoteText placeForNewLabel = getPlaceForNewLabel(editorSplitter); + placeForNewLabel.click(); + myKeyboard.key(KeyEvent.VK_RIGHT); myKeyboard.enter(); // create empty line - placeForNewLabel.click(); // focus on the empty line myKeyboard.enterText(text); // enter text ActionToolbarMenu toolbarMenu = robot.find(ActionToolbarMenu.class); toolbarMenu.pushToCluster(); editorSplitter.closeEditor(); - hideClusterContent(kubernetesViewTree); - - openResourceContentList(new String[]{"Nodes"}, kubernetesViewTree); + hideClusterContent(); - selectedResource.doubleClick(); + RemoteText resource = getNamedResourceInNodes("hello-minikube"); + resource.doubleClick(); ComponentFixture textFixtureNew = editorSplitter.getEditorTextFixture(); - scrollToVisible(yodaLabel, robot); - List remoteTextNew = textFixtureNew.findAllText(); - boolean labelExist = false; - for (RemoteText actual_remote_text : remoteTextNew){ - if (actual_remote_text.getText().contains(yodaText)){ - labelExist = true; - break; - } - } - - editorSplitter.closeEditor(); // close editor - hideClusterContent(kubernetesViewTree); - - assertTrue(labelExist, "Label '" + yodaLabel + "' not found."); + Optional label = textFixtureNew.findAllText().stream().filter(remoteText -> remoteText.getText().contains(yodaText)).findFirst(); + assertTrue( + label.isPresent(), + "Label '" + yodaLabel + "' not found."); + + editorSplitter.closeEditor(); + + //delete pod to refresh label + resource.click(MouseButton.RIGHT_BUTTON); + RightClickMenu rightClickMenu = robot.find(RightClickMenu.class); + rightClickMenu.select("Delete"); + robot.find(ComponentFixture.class, byXpath("//div[@text='Yes']")).click(); + + hideClusterContent(); } - private static RemoteText getPlaceForNewLabel (EditorsSplittersFixture editorSplitter) { + private RemoteText getPlaceForNewLabel (EditorsSplittersFixture editorSplitter) { ComponentFixture textFixture = editorSplitter.getEditorTextFixture(); - List remoteText = textFixture.findAllText(); - - int labelsId = 0; - boolean labelsFound = false; - for (RemoteText actual_remote_text : remoteText){ - if ("labels".equals(actual_remote_text.getText())){ - labelsFound = true; - break; - } - labelsId++; - } - assertTrue(labelsFound, "Labels not found in resource."); + List allVisibleElements = textFixture.findAllText(); + Optional resourceText = allVisibleElements.stream().filter(remoteText -> remoteText.getText().equals("labels")).findFirst(); + assertTrue(resourceText.isPresent()); - return remoteText.get(labelsId+2); // +1 because we need the next one, +1 because between every 2 real elements is space + return allVisibleElements.get(allVisibleElements.indexOf(resourceText.get())+1); } } diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/OpenResourceEditorTest.java b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/OpenResourceEditorTest.java index c59b20008..bb0964b0f 100644 --- a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/OpenResourceEditorTest.java +++ b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/OpenResourceEditorTest.java @@ -28,21 +28,25 @@ * @author olkornii@redhat.com */ public class OpenResourceEditorTest extends AbstractKubernetesTest{ - public static void checkResourceEditor(RemoteRobot robot, ComponentFixture kubernetesViewTree){ - openResourceContentList(new String[]{"Nodes"}, kubernetesViewTree); - RemoteText selectedResource = getResourceByIdInParent("Nodes", 0, kubernetesViewTree); // get the resource with id 0 + + public OpenResourceEditorTest(String clusterName, ComponentFixture kubernetesViewTree, RemoteRobot remoteRobot) { + super(clusterName, kubernetesViewTree, remoteRobot); + } + + public void checkResourceEditor(){ + RemoteText selectedResource = getNamedResourceInNodes(resourceName); selectedResource.click(MouseButton.RIGHT_BUTTON); // select the resource RightClickMenu rightClickMenu = robot.find(RightClickMenu.class); // open the yml editor rightClickMenu.select("Edit..."); // open the yml editor EditorsSplittersFixture editorSplitter = robot.find(EditorsSplittersFixture.class); - waitFor(Duration.ofSeconds(15), Duration.ofSeconds(1), "Editor is not available.", () -> isEditorOpened(robot)); // wait 15 seconds for editor + waitFor(Duration.ofSeconds(15), Duration.ofSeconds(1), "Editor is not available.", this::isEditorOpened); // wait 15 seconds for editor editorSplitter.closeEditor(); // close editor - hideClusterContent(kubernetesViewTree); + hideClusterContent(); } - private static boolean isEditorOpened(RemoteRobot robot){ + private boolean isEditorOpened(){ try { robot.find(ComponentFixture.class, byXpath("//div[@class='EditorComponentImpl']")); } catch (WaitForConditionTimeoutException e) { diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/console/ConsoleOutputStreamTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/console/ConsoleOutputStreamTest.kt index dffd2d2e6..4260e5306 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/console/ConsoleOutputStreamTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/console/ConsoleOutputStreamTest.kt @@ -11,13 +11,13 @@ package com.redhat.devtools.intellij.kubernetes.console import com.intellij.terminal.TerminalExecutionConsole -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.spy -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.any +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.spy +import org.mockito.kotlin.times +import org.mockito.kotlin.verify import org.junit.Before import org.junit.Test diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/console/FailureCallbackOutputStreamTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/console/FailureCallbackOutputStreamTest.kt index 34e83aa43..24188461e 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/console/FailureCallbackOutputStreamTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/console/FailureCallbackOutputStreamTest.kt @@ -11,10 +11,10 @@ package com.redhat.devtools.intellij.kubernetes.console import com.intellij.execution.ui.ConsoleView -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.any +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.verify import org.junit.Test class FailureCallbackOutputStreamTest { diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ClusterResourceTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ClusterResourceTest.kt index e8429b7c8..b02d61150 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ClusterResourceTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ClusterResourceTest.kt @@ -10,15 +10,15 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.editor -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.doThrow -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.doThrow +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.model.ResourceModelObservable import com.redhat.devtools.intellij.kubernetes.model.ResourceWatch import com.redhat.devtools.intellij.kubernetes.model.context.IActiveContext diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/EditorResourceStateTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/EditorResourceStateTest.kt index de3371bc6..5ea818eca 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/EditorResourceStateTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/EditorResourceStateTest.kt @@ -10,8 +10,8 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.editor -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock import io.fabric8.kubernetes.api.model.HasMetadata import io.fabric8.kubernetes.api.model.PodBuilder import org.assertj.core.api.Assertions.assertThat diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/EditorResourceTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/EditorResourceTest.kt index 03e38a477..fc36e5b83 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/EditorResourceTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/EditorResourceTest.kt @@ -10,13 +10,13 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.editor -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.doThrow -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.doThrow +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever +import org.mockito.kotlin.never import com.redhat.devtools.intellij.kubernetes.model.IResourceModel import com.redhat.devtools.intellij.kubernetes.model.IResourceModelListener import com.redhat.devtools.intellij.kubernetes.model.context.IActiveContext diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/EditorResourcesTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/EditorResourcesTest.kt index 43d27cd3f..b2fd826be 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/EditorResourcesTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/EditorResourcesTest.kt @@ -10,17 +10,17 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.editor -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.atLeast -import com.nhaarman.mockitokotlin2.clearInvocations -import com.nhaarman.mockitokotlin2.doAnswer -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.atLeast +import org.mockito.kotlin.clearInvocations +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.model.IResourceModel import com.redhat.devtools.intellij.kubernetes.model.IResourceModelListener import com.redhat.devtools.intellij.kubernetes.model.context.IActiveContext diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ResourceEditorFactoryTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ResourceEditorFactoryTest.kt index 2ad71216a..3a317e5e0 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ResourceEditorFactoryTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ResourceEditorFactoryTest.kt @@ -16,13 +16,13 @@ import com.intellij.openapi.fileEditor.FileEditorManager import com.intellij.openapi.project.Project import com.intellij.openapi.project.ProjectManager import com.intellij.openapi.vfs.VirtualFile -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.editor.ResourceEditor.Companion.KEY_RESOURCE_EDITOR import com.redhat.devtools.intellij.kubernetes.model.util.createResource import com.redhat.devtools.intellij.telemetry.core.service.TelemetryMessageBuilder diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ResourceEditorTabTitleProviderTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ResourceEditorTabTitleProviderTest.kt index f71b6ab09..f713c5a2f 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ResourceEditorTabTitleProviderTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ResourceEditorTabTitleProviderTest.kt @@ -13,7 +13,7 @@ package com.redhat.devtools.intellij.kubernetes.editor import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile -import com.nhaarman.mockitokotlin2.* +import org.mockito.kotlin.* import com.redhat.devtools.intellij.common.validation.KubernetesResourceInfo import com.redhat.devtools.intellij.kubernetes.editor.ResourceEditorTabTitleProvider.Companion.TITLE_UNKNOWN_NAME import com.redhat.devtools.intellij.kubernetes.model.mocks.Mocks.kubernetesResourceInfo diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ResourceEditorTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ResourceEditorTest.kt index 9830c83d5..c5390f3e9 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ResourceEditorTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ResourceEditorTest.kt @@ -20,19 +20,18 @@ import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiFile import com.intellij.psi.util.PsiUtilCore import com.intellij.util.messages.MessageBusConnection -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.argWhere -import com.nhaarman.mockitokotlin2.clearInvocations -import com.nhaarman.mockitokotlin2.doAnswer -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.doThrow -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.spy -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.argWhere +import org.mockito.kotlin.clearInvocations +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.doThrow +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.spy +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.common.validation.KubernetesResourceInfo import com.redhat.devtools.intellij.common.validation.KubernetesTypeInfo import com.redhat.devtools.intellij.kubernetes.editor.notification.Notifications diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ResourceFileTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ResourceFileTest.kt index 885acdb86..887429112 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ResourceFileTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ResourceFileTest.kt @@ -15,14 +15,14 @@ import com.intellij.openapi.fileTypes.FileType import com.intellij.openapi.fileTypes.PlainTextFileType import com.intellij.openapi.vfs.VirtualFile import com.intellij.util.SystemProperties -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.spy -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.spy +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.common.editor.AllowNonProjectEditing import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks.POD3 import java.io.ByteArrayInputStream diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/inlay/Base64PresentationsTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/inlay/Base64PresentationsTest.kt index abf4145a6..3d4106233 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/inlay/Base64PresentationsTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/inlay/Base64PresentationsTest.kt @@ -14,10 +14,10 @@ import com.intellij.codeInsight.hints.InlayHintsSink import com.intellij.codeInsight.hints.presentation.PresentationFactory import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.any +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.verify import com.redhat.devtools.intellij.common.validation.KubernetesTypeInfo import com.redhat.devtools.intellij.kubernetes.editor.inlay.base64.Base64Presentations import com.redhat.devtools.intellij.kubernetes.editor.mocks.createYAMLKeyValue diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/inlay/Base64ValueAdapterTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/inlay/Base64ValueAdapterTest.kt index 360d578cf..3d5a025e2 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/inlay/Base64ValueAdapterTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/inlay/Base64ValueAdapterTest.kt @@ -12,10 +12,10 @@ package com.redhat.devtools.intellij.kubernetes.editor.inlay import com.intellij.json.psi.JsonProperty import com.intellij.psi.PsiElement -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.any +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify import com.redhat.devtools.intellij.kubernetes.editor.inlay.base64.Base64ValueAdapter import com.redhat.devtools.intellij.kubernetes.editor.mocks.createJsonObject import com.redhat.devtools.intellij.kubernetes.editor.mocks.createJsonProperty diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/mocks/PsiElementMocks.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/mocks/PsiElementMocks.kt index 3653c98cc..9dba537e9 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/mocks/PsiElementMocks.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/mocks/PsiElementMocks.kt @@ -21,11 +21,11 @@ import com.intellij.psi.PsiElementVisitor import com.intellij.psi.PsiFile import com.intellij.psi.PsiFileFactory import com.intellij.psi.PsiNamedElement -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doAnswer -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.common.validation.KubernetesTypeInfo import org.jetbrains.yaml.YAMLElementGenerator import org.jetbrains.yaml.psi.YAMLDocument diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/mocks/ResourcePsiElementMocks.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/mocks/ResourcePsiElementMocks.kt index 45307cc07..5374b606f 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/mocks/ResourcePsiElementMocks.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/mocks/ResourcePsiElementMocks.kt @@ -12,9 +12,9 @@ package com.redhat.devtools.intellij.kubernetes.editor.mocks import com.intellij.json.psi.JsonObject import com.intellij.json.psi.JsonProperty -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.editor.util.getSelector import org.jetbrains.yaml.psi.YAMLDocument import org.jetbrains.yaml.psi.YAMLFile diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/notification/NotificationsTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/notification/NotificationsTest.kt index 6edca1514..2b737c8ea 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/notification/NotificationsTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/notification/NotificationsTest.kt @@ -12,15 +12,15 @@ package com.redhat.devtools.intellij.kubernetes.editor.notification import com.intellij.openapi.fileEditor.FileEditor import com.intellij.openapi.project.Project -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.argWhere -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.argWhere +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.editor.Created import com.redhat.devtools.intellij.kubernetes.editor.DeletedOnCluster import com.redhat.devtools.intellij.kubernetes.editor.EditorResource diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/util/PersistentEditorValueTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/util/PersistentEditorValueTest.kt index e138e96ef..a92894c50 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/util/PersistentEditorValueTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/util/PersistentEditorValueTest.kt @@ -13,12 +13,12 @@ package com.redhat.devtools.intellij.kubernetes.editor.util import com.intellij.openapi.fileEditor.FileEditor import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.newvfs.FileAttribute -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.times +import org.mockito.kotlin.verify import com.redhat.devtools.intellij.kubernetes.editor.PersistentEditorValue import org.assertj.core.api.Assertions.assertThat import org.junit.Test diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/util/ResourceEditorUtilsTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/util/ResourceEditorUtilsTest.kt index 82079f481..c10292491 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/util/ResourceEditorUtilsTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/util/ResourceEditorUtilsTest.kt @@ -10,7 +10,7 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.editor.util -import com.nhaarman.mockitokotlin2.mock +import org.mockito.kotlin.mock import com.redhat.devtools.intellij.common.validation.KubernetesResourceInfo import com.redhat.devtools.intellij.common.validation.KubernetesTypeInfo import com.redhat.devtools.intellij.kubernetes.model.mocks.Mocks.kubernetesResourceInfo diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/util/ResourcePsiElementUtilsTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/util/ResourcePsiElementUtilsTest.kt index 516dd1915..a3e276b22 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/util/ResourcePsiElementUtilsTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/util/ResourcePsiElementUtilsTest.kt @@ -15,9 +15,9 @@ import com.intellij.json.psi.JsonObject import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.xml.XmlFile -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.common.validation.KubernetesTypeInfo import com.redhat.devtools.intellij.kubernetes.editor.mocks.createJobTemplate import com.redhat.devtools.intellij.kubernetes.editor.mocks.createJsonObject diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/util/SelectorPsiElementUtilsTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/util/SelectorPsiElementUtilsTest.kt index 3b72a51df..9b9222d0e 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/util/SelectorPsiElementUtilsTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/util/SelectorPsiElementUtilsTest.kt @@ -10,7 +10,7 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.editor.util -import com.nhaarman.mockitokotlin2.mock +import org.mockito.kotlin.mock import com.redhat.devtools.intellij.kubernetes.editor.mocks.createYAMLKeyValue import com.redhat.devtools.intellij.kubernetes.editor.mocks.createMatchExpressions import com.redhat.devtools.intellij.kubernetes.editor.mocks.createMatchLabels diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/AllContextsTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/AllContextsTest.kt index 2ff394305..07564e4ea 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/AllContextsTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/AllContextsTest.kt @@ -10,17 +10,17 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.argThat -import com.nhaarman.mockitokotlin2.clearInvocations -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.doThrow -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.argThat +import org.mockito.kotlin.clearInvocations +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.doThrow +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.model.client.ClientAdapter import com.redhat.devtools.intellij.kubernetes.model.context.IActiveContext import com.redhat.devtools.intellij.kubernetes.model.context.IContext @@ -205,7 +205,7 @@ class AllContextsTest { allContexts.all // create all contexts val activeContext = activeContext(resource(newCurrentContext.namespace!!), namedContext1) /** - * Trying to use {@code com.nhaarman.mockitokotlin2.doReturn} leads to + * Trying to use {@code org.mockito.kotlin.doReturn} leads to * "Overload Resolution Ambiguity" with {@code org.mockito.Mockito.doReturn} in intellij. * Gradle compiles it just fine * diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/ProcessWatchesTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/ProcessWatchesTest.kt index daf6d8144..3e127ed2c 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/ProcessWatchesTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/ProcessWatchesTest.kt @@ -10,13 +10,13 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.isNull -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.eq +import org.mockito.kotlin.isNull +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify import com.redhat.devtools.intellij.kubernetes.model.client.ClientAdapter import com.redhat.devtools.intellij.kubernetes.model.client.KubeClientAdapter import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/ResourceModelObservableTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/ResourceModelObservableTest.kt index 081046f12..cf33bef9c 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/ResourceModelObservableTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/ResourceModelObservableTest.kt @@ -10,7 +10,7 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model -import com.nhaarman.mockitokotlin2.mock +import org.mockito.kotlin.mock import com.redhat.devtools.intellij.kubernetes.model.context.IActiveContext import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks.resource import io.fabric8.kubernetes.api.model.Namespace diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/ResourceModelTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/ResourceModelTest.kt index 8dd8bf999..a7d2720cb 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/ResourceModelTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/ResourceModelTest.kt @@ -10,13 +10,13 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.clearInvocations -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.clearInvocations +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.model.context.IActiveContext import com.redhat.devtools.intellij.kubernetes.model.context.IActiveContext.ResourcesIn import com.redhat.devtools.intellij.kubernetes.model.context.IContext diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/ResourceWatchTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/ResourceWatchTest.kt index b597b20e9..d2b1e4449 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/ResourceWatchTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/ResourceWatchTest.kt @@ -10,19 +10,18 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.spy -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.spy +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks.resource import com.redhat.devtools.intellij.kubernetes.model.resource.ResourceKind import io.fabric8.kubernetes.api.model.HasMetadata import io.fabric8.kubernetes.api.model.Namespace import io.fabric8.kubernetes.api.model.Pod -import io.fabric8.kubernetes.api.model.apps.Deployment import io.fabric8.kubernetes.client.KubernetesClientException import io.fabric8.kubernetes.client.Watch import io.fabric8.kubernetes.client.Watcher diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/client/ClientAdapterTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/client/ClientAdapterTest.kt index 9cb80750d..a9da92917 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/client/ClientAdapterTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/client/ClientAdapterTest.kt @@ -10,11 +10,11 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model.client -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks.config import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks.namedContext import io.fabric8.kubernetes.client.Config diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/client/ClientConfigTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/client/ClientConfigTest.kt index 660d24751..48c176284 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/client/ClientConfigTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/client/ClientConfigTest.kt @@ -10,13 +10,13 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model.client -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.mock +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.never +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks.config import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks.namedContext import io.fabric8.kubernetes.api.model.ConfigBuilder diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/client/KubeConfigAdapterTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/client/KubeConfigAdapterTest.kt index 0328db55b..a1bc2d40b 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/client/KubeConfigAdapterTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/client/KubeConfigAdapterTest.kt @@ -10,10 +10,10 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model.client -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.verify import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks.namedContext import io.fabric8.kubernetes.api.model.Config import org.assertj.core.api.Assertions.assertThat diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/context/KubernetesContextTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/context/KubernetesContextTest.kt index 170dd92fb..5cef827e8 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/context/KubernetesContextTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/context/KubernetesContextTest.kt @@ -10,11 +10,10 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model.context -import com.nhaarman.mockitokotlin2.* +import org.mockito.kotlin.* import com.redhat.devtools.intellij.kubernetes.model.Notification import com.redhat.devtools.intellij.kubernetes.model.ResourceModelObservable import com.redhat.devtools.intellij.kubernetes.model.ResourceWatch -import com.redhat.devtools.intellij.kubernetes.model.client.ClientAdapter import com.redhat.devtools.intellij.kubernetes.model.client.KubeClientAdapter import com.redhat.devtools.intellij.kubernetes.model.context.IActiveContext.ResourcesIn import com.redhat.devtools.intellij.kubernetes.model.dashboard.IDashboard diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/context/LazyOpenShiftContextTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/context/LazyOpenShiftContextTest.kt index 9309dedab..7cb371538 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/context/LazyOpenShiftContextTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/context/LazyOpenShiftContextTest.kt @@ -10,12 +10,12 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model.context -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.model.IResourceModelObservable import com.redhat.devtools.intellij.kubernetes.model.client.KubeClientAdapter import com.redhat.devtools.intellij.kubernetes.model.client.OSClientAdapter diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/dashboard/KubernetesDashboardTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/dashboard/KubernetesDashboardTest.kt index a5d58b96e..3ead1b22f 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/dashboard/KubernetesDashboardTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/dashboard/KubernetesDashboardTest.kt @@ -10,12 +10,12 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model.dashboard -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.doThrow -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.doThrow +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks.NAMESPACE1 import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks.NAMESPACE2 import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks.NAMESPACE3 diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/mocks/ClientMocks.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/mocks/ClientMocks.kt index 6709cdd96..3bd4b1b94 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/mocks/ClientMocks.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/mocks/ClientMocks.kt @@ -10,10 +10,10 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model.mocks -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.model.util.getApiVersion import com.redhat.devtools.intellij.kubernetes.model.util.getHighestPriorityVersion import io.fabric8.kubernetes.api.Pluralize diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/mocks/Mocks.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/mocks/Mocks.kt index a397ff328..5b2099373 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/mocks/Mocks.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/mocks/Mocks.kt @@ -10,12 +10,12 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model.mocks -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.doAnswer -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.common.validation.KubernetesResourceInfo import com.redhat.devtools.intellij.common.validation.KubernetesTypeInfo import com.redhat.devtools.intellij.kubernetes.model.IResourceModel @@ -62,7 +62,7 @@ object Mocks { : (ClientAdapter, IResourceModelObservable) -> IActiveContext { return mock { /** - * Trying to use {@code com.nhaarman.mockitokotlin2.doReturn} leads to + * Trying to use {@code org.mockito.kotlin.doReturn} leads to * "Overload Resolution Ambiguity" with {@code org.mockito.Mockito.doReturn} in intellij. * Gradle compiles it just fine * diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/mocks/PodMocks.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/mocks/PodMocks.kt index c77e2e395..5507dd8bd 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/mocks/PodMocks.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/mocks/PodMocks.kt @@ -10,9 +10,9 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model.mocks -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import io.fabric8.kubernetes.api.model.ContainerState import io.fabric8.kubernetes.api.model.ContainerStateRunning import io.fabric8.kubernetes.api.model.ContainerStateTerminated diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/APIResourcesTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/APIResourcesTest.kt index 6b8d7fefb..d6ac73521 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/APIResourcesTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/APIResourcesTest.kt @@ -10,10 +10,10 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model.resource -import com.nhaarman.mockitokotlin2.argThat -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.argThat +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.model.client.ClientAdapter import com.redhat.devtools.intellij.kubernetes.model.client.KubeClientAdapter import io.fabric8.kubernetes.api.model.APIResourceBuilder diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/NonCachingSingleResourceOperatorTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/NonCachingSingleResourceOperatorTest.kt index 62fffd1b5..52a6646cc 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/NonCachingSingleResourceOperatorTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/NonCachingSingleResourceOperatorTest.kt @@ -10,17 +10,17 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model.resource -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.argThat -import com.nhaarman.mockitokotlin2.clearInvocations -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.spy -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.argThat +import org.mockito.kotlin.clearInvocations +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.spy +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.model.client.KubeClientAdapter import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks.clusterScopedApiResource import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks.namespacedApiResource diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/KubernetesReplicasTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/KubernetesReplicasTest.kt index be58ae1a1..6bf026d42 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/KubernetesReplicasTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/KubernetesReplicasTest.kt @@ -10,10 +10,10 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model.resource.kubernetes -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.model.context.IActiveContext import com.redhat.devtools.intellij.kubernetes.model.resource.NonCachingSingleResourceOperator import com.redhat.devtools.intellij.kubernetes.model.resource.ResourceKind diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/NamespacedPodsOperatorTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/NamespacedPodsOperatorTest.kt index d7f33a73b..7773a12df 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/NamespacedPodsOperatorTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/NamespacedPodsOperatorTest.kt @@ -10,15 +10,15 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model.resource.kubernetes -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.argumentCaptor -import com.nhaarman.mockitokotlin2.clearInvocations -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.spy -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.clearInvocations +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.spy +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.model.client.ClientAdapter import com.redhat.devtools.intellij.kubernetes.model.client.KubeClientAdapter import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/NamespacesOperatorTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/NamespacesOperatorTest.kt index f2587224d..e78ae8689 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/NamespacesOperatorTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/NamespacesOperatorTest.kt @@ -10,7 +10,7 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model.resource.kubernetes -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.verify import com.redhat.devtools.intellij.kubernetes.model.client.KubeClientAdapter import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks.NAMESPACE1 import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks.NAMESPACE2 diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/OpenShiftReplicasTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/OpenShiftReplicasTest.kt index 3c14cfd4e..d201d2ff7 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/OpenShiftReplicasTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/OpenShiftReplicasTest.kt @@ -10,10 +10,10 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model.resource.kubernetes -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.model.context.IActiveContext import com.redhat.devtools.intellij.kubernetes.model.resource.NonCachingSingleResourceOperator import com.redhat.devtools.intellij.kubernetes.model.resource.ResourceKind diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/OpenShiftReplicatorTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/OpenShiftReplicatorTest.kt index d83ea3d76..c80df78c9 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/OpenShiftReplicatorTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/OpenShiftReplicatorTest.kt @@ -10,9 +10,9 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model.resource.kubernetes -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify import com.redhat.devtools.intellij.kubernetes.model.resource.openshift.OpenShiftReplicas.OpenShiftReplicator import io.fabric8.openshift.api.model.DeploymentConfig import io.fabric8.openshift.api.model.DeploymentConfigBuilder diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/ReplicatorTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/ReplicatorTest.kt index dee7191a1..40314224f 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/ReplicatorTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/ReplicatorTest.kt @@ -10,9 +10,9 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model.resource.kubernetes -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify import com.redhat.devtools.intellij.kubernetes.model.resource.kubernetes.KubernetesReplicas.Replicator import io.fabric8.kubernetes.api.model.ReplicationController import io.fabric8.kubernetes.api.model.ReplicationControllerBuilder diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/custom/NamespacedCustomResourceOperatorTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/custom/NamespacedCustomResourceOperatorTest.kt index 814b2f304..1da59ef5f 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/custom/NamespacedCustomResourceOperatorTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/custom/NamespacedCustomResourceOperatorTest.kt @@ -10,12 +10,12 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model.resource.kubernetes.custom -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.spy -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.spy +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks.NAMESPACE1 import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks.NAMESPACE2 import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks.NAMESPACE3 diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/util/PodUtilsTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/util/PodUtilsTest.kt index 0e81c359a..6abfbffe9 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/util/PodUtilsTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/util/PodUtilsTest.kt @@ -10,8 +10,8 @@ ******************************************************************************/ package com.redhat.devtools.intellij.kubernetes.model.util -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.model.mocks.ClientMocks.resource import com.redhat.devtools.intellij.kubernetes.model.mocks.PodMockBuilder import com.redhat.devtools.intellij.kubernetes.model.mocks.podStatus diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/tree/DescriptorTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/tree/DescriptorTest.kt index 676079f97..3da3ffd9b 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/tree/DescriptorTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/tree/DescriptorTest.kt @@ -11,7 +11,7 @@ package com.redhat.devtools.intellij.kubernetes.tree import com.intellij.openapi.project.Project -import com.nhaarman.mockitokotlin2.mock +import org.mockito.kotlin.mock import com.redhat.devtools.intellij.kubernetes.model.IResourceModel import com.redhat.devtools.intellij.kubernetes.model.mocks.Fakes.pod import com.redhat.devtools.intellij.kubernetes.tree.TreeStructure.ResourceDescriptor diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/tree/TreeStructureExtensionTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/tree/TreeStructureExtensionTest.kt index aed34f976..6e70764ac 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/tree/TreeStructureExtensionTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/tree/TreeStructureExtensionTest.kt @@ -12,14 +12,14 @@ package com.redhat.devtools.intellij.kubernetes.tree import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.project.Project -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doAnswer -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.model.IResourceModel import com.redhat.devtools.intellij.kubernetes.model.mocks.Mocks.resourceModel import org.assertj.core.api.Assertions.assertThat diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/tree/TreeUpdaterTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/tree/TreeUpdaterTest.kt index 09f662120..c03f7d24f 100644 --- a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/tree/TreeUpdaterTest.kt +++ b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/tree/TreeUpdaterTest.kt @@ -15,17 +15,17 @@ import com.intellij.ide.util.treeView.NodeDescriptor import com.intellij.ui.tree.StructureTreeModel import com.intellij.ui.tree.TreePathUtil import com.intellij.util.concurrency.Invoker -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.argThat -import com.nhaarman.mockitokotlin2.argumentCaptor -import com.nhaarman.mockitokotlin2.doAnswer -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.argThat +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import com.redhat.devtools.intellij.kubernetes.actions.getDescriptor import com.redhat.devtools.intellij.kubernetes.actions.getElement import com.redhat.devtools.intellij.kubernetes.model.IResourceModel