From 0522b91f3dbd9cc7690c60a2dacd4fec41da7aa4 Mon Sep 17 00:00:00 2001 From: priyeshmashelkar Date: Thu, 12 Jul 2018 12:11:00 +0100 Subject: [PATCH 1/4] Renamed test methods as per naming convention --- .../java/org/baeldung/mockito/MockAnnotationUnitTest.java | 4 ++-- .../baeldung/mockito/MockBeanAnnotationIntegrationTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java index 5d565fea88..8b58b8c40b 100644 --- a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java +++ b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java @@ -15,7 +15,7 @@ public class MockAnnotationUnitTest { UserRepository mockRepository; @Test - public void testMockAnnotation() { + public void whenCountMethodIsMocked_ThenMockedValueIsReturned() { Mockito.when(mockRepository.count()).thenReturn(123L); long userCount = mockRepository.count(); Assert.assertEquals(123L, userCount); @@ -23,7 +23,7 @@ public class MockAnnotationUnitTest { } @Test - public void testMockitoMockMethod() { + public void whenLocalMockVariableIsUsed_ThenMockedValueFromLocalMockVariableIsReturned() { UserRepository localMockRepository = Mockito.mock(UserRepository.class); Mockito.when(localMockRepository.count()).thenReturn(111L); long userCount = localMockRepository.count(); diff --git a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java index 008e674696..769713c753 100644 --- a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java +++ b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java @@ -20,7 +20,7 @@ public class MockBeanAnnotationIntegrationTest { ApplicationContext context; @Test - public void testMockBean() { + public void whenCountMethodIsMocked_ThenMockedValueIsReturned() { Mockito.when(mockRepository.count()).thenReturn(123L); UserRepository userRepoFromContext = context.getBean(UserRepository.class); long userCount = userRepoFromContext.count(); From 4b46635ac7fc2e0d7bfbef148a2c801cc3fef3ab Mon Sep 17 00:00:00 2001 From: priyeshmashelkar Date: Tue, 17 Jul 2018 10:52:19 +0100 Subject: [PATCH 2/4] Renamed test methods to use BDD style --- .../java/org/baeldung/mockito/MockAnnotationUnitTest.java | 8 ++++++-- .../mockito/MockBeanAnnotationIntegrationTest.java | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java index 8b58b8c40b..fcc646e8ea 100644 --- a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java +++ b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java @@ -15,18 +15,22 @@ public class MockAnnotationUnitTest { UserRepository mockRepository; @Test - public void whenCountMethodIsMocked_ThenMockedValueIsReturned() { + public void givenCountMethodMocked_WhenCountInvoked_ThenMockValueReturned() { Mockito.when(mockRepository.count()).thenReturn(123L); + long userCount = mockRepository.count(); + Assert.assertEquals(123L, userCount); Mockito.verify(mockRepository).count(); } @Test - public void whenLocalMockVariableIsUsed_ThenMockedValueFromLocalMockVariableIsReturned() { + public void givenCountMethodOfLocalMockVariableMocked_WhenCountInvoked_ThenMockedValueReturned() { UserRepository localMockRepository = Mockito.mock(UserRepository.class); Mockito.when(localMockRepository.count()).thenReturn(111L); + long userCount = localMockRepository.count(); + Assert.assertEquals(111L, userCount); Mockito.verify(localMockRepository).count(); } diff --git a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java index 769713c753..fd9236fe13 100644 --- a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java +++ b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java @@ -20,10 +20,12 @@ public class MockBeanAnnotationIntegrationTest { ApplicationContext context; @Test - public void whenCountMethodIsMocked_ThenMockedValueIsReturned() { + public void givenCountMethodMocked_WhenCountInvokedOnBeanFromContext_ThenMockValueReturned() { Mockito.when(mockRepository.count()).thenReturn(123L); + UserRepository userRepoFromContext = context.getBean(UserRepository.class); long userCount = userRepoFromContext.count(); + Assert.assertEquals(123L, userCount); Mockito.verify(mockRepository).count(); } From 225cf6d2f4453f171bfb1d43dc772441b017a8d6 Mon Sep 17 00:00:00 2001 From: priyeshmashelkar Date: Fri, 20 Jul 2018 10:45:03 +0100 Subject: [PATCH 3/4] BAEL-1907 Created new module spring-testing --- testing-modules/spring-testing/README.md | 2 + testing-modules/spring-testing/pom.xml | 75 +++++++++++++++++++ .../org/baeldung/mockito/repository/User.java | 0 .../mockito/repository/UserRepository.java | 0 .../mockito/MockAnnotationUnitTest.java | 0 .../MockBeanAnnotationIntegrationTest.java | 2 +- 6 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 testing-modules/spring-testing/README.md create mode 100644 testing-modules/spring-testing/pom.xml rename testing-modules/{mockito => spring-testing}/src/main/java/org/baeldung/mockito/repository/User.java (100%) rename testing-modules/{mockito => spring-testing}/src/main/java/org/baeldung/mockito/repository/UserRepository.java (100%) rename testing-modules/{mockito => spring-testing}/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java (100%) rename testing-modules/{mockito => spring-testing}/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java (90%) diff --git a/testing-modules/spring-testing/README.md b/testing-modules/spring-testing/README.md new file mode 100644 index 0000000000..a96ddccabb --- /dev/null +++ b/testing-modules/spring-testing/README.md @@ -0,0 +1,2 @@ +### Relevant Articles: + diff --git a/testing-modules/spring-testing/pom.xml b/testing-modules/spring-testing/pom.xml new file mode 100644 index 0000000000..be05373822 --- /dev/null +++ b/testing-modules/spring-testing/pom.xml @@ -0,0 +1,75 @@ + + 4.0.0 + org.baeldung + spring-testing + 0.1-SNAPSHOT + spring-testing + + + com.baeldung + parent-java + 0.0.1-SNAPSHOT + ../../parent-java + + + + + + + org.hamcrest + java-hamcrest + ${hamcrest.version} + + + + org.springframework.boot + spring-boot-starter + LATEST + test + + + org.springframework.boot + spring-boot-starter-test + LATEST + test + + + org.springframework + spring-core + LATEST + + + org.springframework + spring-context + LATEST + + + org.eclipse.persistence + javax.persistence + 2.1.1 + + + org.springframework.data + spring-data-jpa + LATEST + + + + + spring-testing + + + src/main/resources + true + + + + + + + + 2.0.0.0 + + + \ No newline at end of file diff --git a/testing-modules/mockito/src/main/java/org/baeldung/mockito/repository/User.java b/testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/User.java similarity index 100% rename from testing-modules/mockito/src/main/java/org/baeldung/mockito/repository/User.java rename to testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/User.java diff --git a/testing-modules/mockito/src/main/java/org/baeldung/mockito/repository/UserRepository.java b/testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/UserRepository.java similarity index 100% rename from testing-modules/mockito/src/main/java/org/baeldung/mockito/repository/UserRepository.java rename to testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/UserRepository.java diff --git a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java b/testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java similarity index 100% rename from testing-modules/mockito/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java rename to testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java diff --git a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java b/testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java similarity index 90% rename from testing-modules/mockito/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java rename to testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java index fd9236fe13..3a7e58fb48 100644 --- a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java +++ b/testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java @@ -20,7 +20,7 @@ public class MockBeanAnnotationIntegrationTest { ApplicationContext context; @Test - public void givenCountMethodMocked_WhenCountInvokedOnBeanFromContext_ThenMockValueReturned() { + public void givenCountMethodMocked_WhenCountInvoked_ThenMockValueReturned() { Mockito.when(mockRepository.count()).thenReturn(123L); UserRepository userRepoFromContext = context.getBean(UserRepository.class); From 76a4a86ab26f2c2dc12a9553a0eb118585bd5f8c Mon Sep 17 00:00:00 2001 From: priyeshmashelkar Date: Fri, 20 Jul 2018 11:57:31 +0100 Subject: [PATCH 4/4] BAEL-1907 Corrected formatting --- testing-modules/spring-testing/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing-modules/spring-testing/pom.xml b/testing-modules/spring-testing/pom.xml index be05373822..a137bc8d33 100644 --- a/testing-modules/spring-testing/pom.xml +++ b/testing-modules/spring-testing/pom.xml @@ -9,8 +9,8 @@ com.baeldung parent-java - 0.0.1-SNAPSHOT - ../../parent-java + 0.0.1-SNAPSHOT + ../../parent-java