From f5a6fc886ea6dc56f881ddde47fc2c436e956785 Mon Sep 17 00:00:00 2001 From: Sirish Renukumar Date: Fri, 20 Oct 2017 22:38:42 +0530 Subject: [PATCH] Updated to make the code simpler to understand for PowerMock usage (#2772) --- .../powermockito/introduction/LuckyNumberGenerator.java | 9 +++++---- .../introduction/LuckyNumberGeneratorTest.java | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java b/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java index 7cb30b9fef..cfe406c112 100644 --- a/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java +++ b/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java @@ -4,23 +4,24 @@ class LuckyNumberGenerator { public int getLuckyNumber(String name) { - record(name); + saveIntoDatabase(name); if (name == null) { return getDefaultLuckyNumber(); } - return getLuckyNumber(name.length() + 1); + return getComputedLuckyNumber(name.length()); } - private void record(String name) { + private void saveIntoDatabase(String name) { + // Save the name into the database } private int getDefaultLuckyNumber() { return 100; } - private int getLuckyNumber(int length) { + private int getComputedLuckyNumber(int length) { return length < 5 ? 5 : 10000; } diff --git a/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java b/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java index a66df02a29..2836bcd317 100644 --- a/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java +++ b/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java @@ -31,7 +31,7 @@ public class LuckyNumberGeneratorTest { public final void givenPrivateMethodWithArgumentAndReturn_whenUsingPowerMockito_thenCorrect() throws Exception { LuckyNumberGenerator mock = spy(new LuckyNumberGenerator()); - doReturn(1).when(mock, "getLuckyNumber", ArgumentMatchers.anyInt()); + doReturn(1).when(mock, "getComputedLuckyNumber", ArgumentMatchers.anyInt()); int result = mock.getLuckyNumber("Jack"); @@ -44,7 +44,7 @@ public class LuckyNumberGeneratorTest { int result = mock.getLuckyNumber("Tyranosorous"); - verifyPrivate(mock).invoke("record", ArgumentMatchers.anyString()); + verifyPrivate(mock).invoke("saveIntoDatabase", ArgumentMatchers.anyString()); assertEquals(10000, result); }