From f2e95158ce5bae1c8ea42eb00fcae2c267d83734 Mon Sep 17 00:00:00 2001
From: Max Shaposhnik <mshaposh@redhat.com>
Date: Fri, 7 Feb 2020 12:00:28 +0200
Subject: [PATCH] Update testNG to more actual version (7.0.0)

---
 .../api/type/AbstractExhaustibleResourceTest.java         | 4 ++--
 tests/legacy-e2e/pom.xml                                  | 8 ++++++--
 .../che/api/workspace/server/WorkspaceManagerTest.java    | 7 +++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/type/AbstractExhaustibleResourceTest.java b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/type/AbstractExhaustibleResourceTest.java
index 431bdc4c5a..105c02d6fc 100644
--- a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/type/AbstractExhaustibleResourceTest.java
+++ b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/type/AbstractExhaustibleResourceTest.java
@@ -127,14 +127,14 @@ public class AbstractExhaustibleResourceTest {
     }
   }
 
-  @Test(expectedExceptions = IllegalArgumentException.class, dataProvider = "getResources")
+  @Test(expectedExceptions = IllegalArgumentException.class, dataProvider = "resources")
   public void
       shouldThrowIllegalArgumentExceptionWhenOneOfResourcesHasUnsupportedTypeOrUnitOnResourcesAggregation(
           ResourceImpl resourceA, ResourceImpl resourceB) {
     resourceType.aggregate(resourceA, resourceB);
   }
 
-  @Test(expectedExceptions = IllegalArgumentException.class, dataProvider = "getResources")
+  @Test(expectedExceptions = IllegalArgumentException.class, dataProvider = "resources")
   public void
       shouldThrowIllegalArgumentExceptionWhenOneOfResourcesHasUnsupportedTypeOrUnitOnResourcesDeduction(
           ResourceImpl resourceA, ResourceImpl resourceB) {
diff --git a/tests/legacy-e2e/pom.xml b/tests/legacy-e2e/pom.xml
index 73682f4aa5..64449a6808 100644
--- a/tests/legacy-e2e/pom.xml
+++ b/tests/legacy-e2e/pom.xml
@@ -28,12 +28,11 @@
         <module>che-selenium-core</module>
         <module>che-selenium-test</module>
     </modules>
-
     <properties>
         <!-- fix of conflict of seleniumhq 3.0.1 with guava 27.0.1-jre (https://github.com/eclipse/che/issues/12184) -->
         <com.google.guava.version>20.0</com.google.guava.version>
+        <org.testng.version>6.8.21</org.testng.version>
     </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -41,6 +40,11 @@
                 <artifactId>guava</artifactId>
                 <version>${com.google.guava.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <version>${org.testng.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceManagerTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceManagerTest.java
index e0c387c539..0cb5a16529 100644
--- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceManagerTest.java
+++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceManagerTest.java
@@ -35,14 +35,13 @@ import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyMap;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -836,8 +835,8 @@ public class WorkspaceManagerTest {
 
   private TestRuntime mockRuntime(WorkspaceImpl workspace, WorkspaceStatus status)
       throws Exception {
-    MachineImpl machine1 = spy(createMachine());
-    MachineImpl machine2 = spy(createMachine());
+    MachineImpl machine1 = createMachine();
+    MachineImpl machine2 = createMachine();
     Map<String, Machine> machines = new HashMap<>();
     machines.put("machine1", machine1);
     machines.put("machine2", machine2);