diff --git a/testing-modules/mockito-simple/pom.xml b/testing-modules/mockito-simple/pom.xml index af0c63520a..6b056d09b5 100644 --- a/testing-modules/mockito-simple/pom.xml +++ b/testing-modules/mockito-simple/pom.xml @@ -29,35 +29,16 @@ spring-context ${spring-framework.version} - - org.springframework.data - spring-data-jpa - ${spring-data.version} - - - org.eclipse.persistence - javax.persistence - ${javax.persistence.version} - + org.apache.commons commons-lang3 ${commons-lang3.version} + - - org.springframework.boot - spring-boot-starter - ${spring-boot.version} - test - - - org.springframework.boot - spring-boot-starter-test - ${spring-boot.version} - test - + org.mockito mockito-junit-jupiter @@ -77,12 +58,10 @@ - 2.0.4.RELEASE - 5.0.8.RELEASE - 2.0.9.RELEASE + 2.6.4 + 5.3.20 - 2.0.2 - 2.1.1 + 4.6.1 diff --git a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockFinals.java b/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockFinals.java deleted file mode 100644 index 6ff791ae06..0000000000 --- a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockFinals.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.baeldung.mockito; - -import org.junit.Test; - -import static org.junit.Assert.assertNotEquals; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -public class MockFinals { - - @Test - public void whenMockFinalClassMockWorks() { - - FinalList finalList = new FinalList(); - - FinalList mock = mock(FinalList.class); - when(mock.size()).thenReturn(2); - - assertNotEquals(mock.size(), finalList.size()); - - } - - @Test - public void whenMockFinalMethodMockWorks() { - - MyList myList = new MyList(); - - MyList mock = mock(MyList.class); - when(mock.finalMethod()).thenReturn(1); - - assertNotEquals(mock.finalMethod(), myList.finalMethod()); - } - - - } diff --git a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockitoAnnotationUnitTest.java b/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockitoAnnotationUnitTest.java index 1d3d6b1428..bd68afac75 100644 --- a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockitoAnnotationUnitTest.java +++ b/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockitoAnnotationUnitTest.java @@ -1,16 +1,22 @@ package com.baeldung.mockito; -import org.junit.Before; -import org.junit.Test; -import org.mockito.*; +import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.Spy; +import org.mockito.junit.MockitoJUnitRunner; -//@RunWith(MockitoJUnitRunner.class) +@RunWith(MockitoJUnitRunner.class) public class MockitoAnnotationUnitTest { @Mock @@ -19,11 +25,14 @@ public class MockitoAnnotationUnitTest { @Spy private List spiedList = new ArrayList<>(); + // Use either @RunWith(MockitoJUnitRunner.class) or manually openMocks in the @Before method + /* @Before public void init() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); } - + */ + // tests @Test @@ -91,7 +100,7 @@ public class MockitoAnnotationUnitTest { ArgumentCaptor argCaptor; @Test - public void whenUseCaptorAnnotation_thenTheSam() { + public void whenUseCaptorAnnotation_thenTheSame() { mockedList.add("one"); Mockito.verify(mockedList).add(argCaptor.capture()); diff --git a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockitoInitWithMockitoJUnitRuleUnitTest.java b/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockitoAnnotationsInitWithMockitoJUnitRuleUnitTest.java similarity index 90% rename from testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockitoInitWithMockitoJUnitRuleUnitTest.java rename to testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockitoAnnotationsInitWithMockitoJUnitRuleUnitTest.java index 1bbe13ec84..88a9410101 100644 --- a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockitoInitWithMockitoJUnitRuleUnitTest.java +++ b/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockitoAnnotationsInitWithMockitoJUnitRuleUnitTest.java @@ -11,7 +11,7 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -public class MockitoInitWithMockitoJUnitRuleUnitTest { +public class MockitoAnnotationsInitWithMockitoJUnitRuleUnitTest { @Rule public MockitoRule initRule = MockitoJUnit.rule(); diff --git a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockitoInjectIntoSpyUnitTest.java b/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockitoAnnotationsInjectIntoSpyUnitTest.java similarity index 84% rename from testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockitoInjectIntoSpyUnitTest.java rename to testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockitoAnnotationsInjectIntoSpyUnitTest.java index d6a11bbc7d..9d3a00f8b9 100644 --- a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockitoInjectIntoSpyUnitTest.java +++ b/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockitoAnnotationsInjectIntoSpyUnitTest.java @@ -5,18 +5,17 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; import org.mockito.*; -import org.mockito.junit.MockitoJUnitRunner; import java.util.Map; import static org.junit.Assert.assertEquals; @RunWith(MockitoJUnitRunner.class) -public class MockitoInjectIntoSpyUnitTest { +public class MockitoAnnotationsInjectIntoSpyUnitTest { @Before public void init() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); spyDic = Mockito.spy(new MyDictionary(wordMap)); }