AgeCalculator changes

marcos-lg · mikr · commit e257fc3a63e4 · 2020-04-28T22:56:25.000+02:00
diff --git a/core-java-modules/core-java-lang-2/src/test/java/com/baeldung/exceptions/RootCauseFinder.java b/core-java-modules/core-java-lang-2/src/test/java/com/baeldung/exceptions/RootCauseFinder.java
@@ -33,28 +33,28 @@ public static int calculateAge(String birthDate) throws CalculationException {
             }
 
             try {
-                return calculateDifference(birthDate).getYears();
+                return Period
+                  .between(parseDate(birthDate), LocalDate.now())
+                  .getYears();
             } catch (DateParseException ex) {
                 throw new CalculationException(ex);
             }
         }
 
-        private static Period calculateDifference(String birthDateAsString) throws DateParseException {
+        private static LocalDate parseDate(String birthDateAsString) throws DateParseException {
 
-            LocalDate birthDate = null;
+            LocalDate birthDate;
             try {
                 birthDate = LocalDate.parse(birthDateAsString);
             } catch (DateTimeParseException ex) {
                 throw new InvalidFormatException(birthDateAsString, ex);
             }
 
-            LocalDate today = LocalDate.now();
-
-            if (birthDate.isAfter(today)) {
+            if (birthDate.isAfter(LocalDate.now())) {
                 throw new DateOutOfRangeException(birthDateAsString);
             }
 
-            return Period.between(birthDate, today);
+            return birthDate;
         }
 
     }
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java
@@ -2,9 +2,12 @@
 
 import com.google.common.base.Throwables;
 import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import java.time.LocalDate;
 import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoUnit;
 
 import static com.baeldung.exceptions.RootCauseFinder.*;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -14,6 +17,19 @@
  */
 public class RootCauseFinderTest {
 
+    @Test
+    public void givenBirthDate_whenCalculatingAge_thenAgeReturned() {
+        try {
+            int age = AgeCalculator.calculateAge("1990-01-01");
+            Assertions.assertEquals(1990, LocalDate
+              .now()
+              .minus(age, ChronoUnit.YEARS)
+              .getYear());
+        } catch (CalculationException e) {
+            Assertions.fail(e.getMessage());
+        }
+    }
+
     @Test
     public void givenWrongFormatDate_whenFindingRootCauseUsingJava_thenRootCauseFound() {
         try {

Original file line number	Diff line number	Diff line change
`@@ -33,28 +33,28 @@ public static int calculateAge(String birthDate) throws CalculationException {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`try {`
`36`		`- return calculateDifference(birthDate).getYears();`
	`36`	`+ return Period`
	`37`	`+ .between(parseDate(birthDate), LocalDate.now())`
	`38`	`+ .getYears();`
`37`	`39`	`} catch (DateParseException ex) {`
`38`	`40`	`throw new CalculationException(ex);`
`39`	`41`	`}`
`40`	`42`	`}`
`41`	`43`
`42`		`- private static Period calculateDifference(String birthDateAsString) throws DateParseException {`
	`44`	`+ private static LocalDate parseDate(String birthDateAsString) throws DateParseException {`
`43`	`45`
`44`		`- LocalDate birthDate = null;`
	`46`	`+ LocalDate birthDate;`
`45`	`47`	`try {`
`46`	`48`	`birthDate = LocalDate.parse(birthDateAsString);`
`47`	`49`	`} catch (DateTimeParseException ex) {`
`48`	`50`	`throw new InvalidFormatException(birthDateAsString, ex);`
`49`	`51`	`}`
`50`	`52`
`51`		`- LocalDate today = LocalDate.now();`
`52`		`-`
`53`		`- if (birthDate.isAfter(today)) {`
	`53`	`+ if (birthDate.isAfter(LocalDate.now())) {`
`54`	`54`	`throw new DateOutOfRangeException(birthDateAsString);`
`55`	`55`	`}`
`56`	`56`
`57`		`- return Period.between(birthDate, today);`
	`57`	`+ return birthDate;`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`}`