iSharkFly-Open/Java-Tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JAVA-3591: updating mockito-core to 4.1.0

Browse Source
This commit is contained in:
chaos2418
2021-12-18 13:40:53 +05:30
parent b6af089858
commit 000dcdf966
34 changed files with 48 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing-modules/junit-5/pom.xml
+19 -3
View File
@@ -16,6 +16,17 @@
<relativePath>../</relativePath>
</parent>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit.platform</groupId>
@@ -76,7 +87,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockito.junit.jupiter.version}</version>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -85,6 +96,11 @@
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
@@ -119,11 +135,11 @@
</build>
<properties>
<mockito.junit.jupiter.version>2.23.0</mockito.junit.jupiter.version>
<log4j2.version>2.8.2</log4j2.version>
<powermock.version>2.0.0</powermock.version>
<powermock.version>2.0.9</powermock.version>
<spring.version>5.0.1.RELEASE</spring.version>
<surefire.report.plugin>3.0.0-M3</surefire.report.plugin>
<mockito.version>3.3.0</mockito.version>
</properties>
</project>
testing-modules/mockito-2/pom.xml
-4
View File
@@ -29,8 +29,4 @@
</dependency>
</dependencies>
<properties>
<mockito.version>2.21.0</mockito.version>
</properties>
</project>
testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/UnemploymentServiceImplUnitTest.java
+1 -1
View File
@@ -11,7 +11,7 @@ import java.util.stream.Stream;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
testing-modules/mockito-3/pom.xml
-4
View File
@@ -24,8 +24,4 @@
</dependency>
</dependencies>
<properties>
<mockito.version>3.8.0</mockito.version>
</properties>
</project>
testing-modules/mockito/src/test/java/com/baeldung/mockito/MockitoConfigExamplesIntegrationTest.java
-2
View File
@@ -7,8 +7,6 @@ import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.*;
public class MockitoConfigExamplesIntegrationTest {
testing-modules/mockito/src/test/java/com/baeldung/mockito/MockitoConfigExamplesUnitTest.java
-2
View File
@@ -7,8 +7,6 @@ import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.*;
import com.baeldung.mockito.MyList;
testing-modules/mockito/src/test/java/com/baeldung/mockito/MockitoMockIntegrationTest.java
+2 -2
View File
@@ -4,7 +4,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.mockito.MockSettings;
import org.mockito.exceptions.verification.TooLittleActualInvocations;
import org.mockito.exceptions.verification.TooFewActualInvocations;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -42,7 +42,7 @@ public class MockitoMockIntegrationTest {
when(listMock.add(anyString())).thenReturn(false);
listMock.add(randomAlphabetic(6));
thrown.expect(TooLittleActualInvocations.class);
thrown.expect(TooFewActualInvocations.class);
thrown.expectMessage(containsString("myMock.add"));
verify(listMock, times(2)).add(anyString());
testing-modules/mockito/src/test/java/com/baeldung/mockito/MockitoMockUnitTest.java
+2 -4
View File
@@ -2,8 +2,6 @@ package com.baeldung.mockito;
import static org.mockito.Mockito.*;
import com.baeldung.mockito.MyList;
import static org.junit.Assert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.containsString;
@@ -13,7 +11,7 @@ import org.junit.Test;
import org.junit.Rule;
import org.junit.rules.ExpectedException;
import org.mockito.MockSettings;
import org.mockito.exceptions.verification.TooLittleActualInvocations;
import org.mockito.exceptions.verification.TooFewActualInvocations;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -45,7 +43,7 @@ public class MockitoMockUnitTest {
when(listMock.add(anyString())).thenReturn(false);
listMock.add(randomAlphabetic(6));
thrown.expect(TooLittleActualInvocations.class);
thrown.expect(TooFewActualInvocations.class);
thrown.expectMessage(containsString("myMock.add"));
verify(listMock, times(2)).add(anyString());
testing-modules/mockito/src/test/java/com/baeldung/mockito/MockitoVerifyExamplesIntegrationTest.java
+1 -2
View File
@@ -11,7 +11,6 @@ import java.util.List;
import static org.hamcrest.Matchers.hasItem;
import static org.junit.Assert.assertThat;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.*;
public class MockitoVerifyExamplesIntegrationTest {
@@ -35,7 +34,7 @@ public class MockitoVerifyExamplesIntegrationTest {
@Test
public final void givenNoInteractionWithMockOccurred_whenVerifyingInteractions_thenCorrect() {
final List<String> mockedList = mock(MyList.class);
verifyZeroInteractions(mockedList);
verifyNoInteractions(mockedList);
}
@Test
testing-modules/mockito/src/test/java/com/baeldung/mockito/MockitoVerifyExamplesUnitTest.java
+1 -3
View File
@@ -2,7 +2,6 @@ package com.baeldung.mockito;
import com.google.common.collect.Lists;
import com.baeldung.mockito.MyList;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.InOrder;
@@ -13,7 +12,6 @@ import java.util.List;
import static org.hamcrest.Matchers.hasItem;
import static org.junit.Assert.assertThat;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.*;
public class MockitoVerifyExamplesUnitTest {
@@ -37,7 +35,7 @@ public class MockitoVerifyExamplesUnitTest {
@Test
public final void givenNoInteractionWithMockOccurred_whenVerifyingInteractions_thenCorrect() {
final List<String> mockedList = mock(MyList.class);
verifyZeroInteractions(mockedList);
verifyNoInteractions(mockedList);
}
@Test
testing-modules/mocks/pom.xml
-7
View File
@@ -31,12 +31,6 @@
<version>${jukito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
@@ -53,7 +47,6 @@
<properties>
<javafaker.version>0.15</javafaker.version>
<jukito.version>1.5</jukito.version>
<mockito.version>2.21.0</mockito.version>
<easymock.version>3.5.1</easymock.version>
<jmockit.version>1.41</jmockit.version>
<jimf.version>1.1</jimf.version>
testing-modules/mocks/src/test/java/com/baeldung/mockito/LoginControllerIntegrationTest.java
+2 -2
View File
@@ -40,7 +40,7 @@ public class LoginControllerIntegrationTest {
public void assertThatNoMethodHasBeenCalled() {
loginController.login(null);
// no method called
Mockito.verifyZeroInteractions(loginService);
Mockito.verifyNoInteractions(loginService);
}
@Test
@@ -85,7 +85,7 @@ public class LoginControllerIntegrationTest {
Assert.assertEquals("ERROR", login);
Mockito.verify(loginService)
.login(userForm);
Mockito.verifyZeroInteractions(loginService);
Mockito.verifyNoInteractions(loginService);
}
@Test