seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update testNG to more actual version (7.0.0)

7.20.x
Max Shaposhnik 2020-02-07 12:00:28 +02:00 committed by GitHub
parent 74ec92ca49
commit f2e95158ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/type/AbstractExhaustibleResourceTest.java
View File

@ -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) {

8
tests/legacy-e2e/pom.xml
View File

@ -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>

7
wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceManagerTest.java
View File

@ -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);