HW-52174. Changed due to the review

Author: azakrevska-epam

ui/src/main/java/com/hyperwallet/android/ui/view/widget/DateParseException.java

@@ -26,7 +26,6 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.Locale;
 
 /**
@@ -51,18 +50,13 @@ public DateUtil() {
      *
      * @param serverDate Date from server
      * @return String date in the format by BestDateTimePattern or dd MMMM yyyy otherwise
-     * @throws DateParseException unable to convert server date to widget format
      */
     @NonNull
-    String convertDateFromServerToWidgetFormat(@Nullable final String serverDate) throws DateParseException {
-        try {
-            if (isServerDateValid(serverDate)) {
-                final Calendar calendar = Calendar.getInstance();
-                calendar.setTime(mServerDateFormat.parse(serverDate));
-                return mWidgetDateFormat.format(calendar.getTime());
-            }
-        } catch (NumberFormatException | ParseException | IndexOutOfBoundsException e) {
-            throw new DateParseException("Unable to convert date from server to widget format", e.getCause());
+    String convertDateFromServerToWidgetFormat(@Nullable final String serverDate) throws ParseException {
+        if (!TextUtils.isEmpty(serverDate)) {
+            final Calendar calendar = Calendar.getInstance();
+            calendar.setTime(mServerDateFormat.parse(serverDate));
+            return mWidgetDateFormat.format(calendar.getTime());
         }
         return "";
     }
@@ -87,32 +81,14 @@ public String buildDateFromDateDialogToServerFormat(final int year, final int mo
      *
      * @param serverDate Date from server
      * @return Calendar with date from server
-     * @throws DateParseException unable to convert server date to calendar format
      */
     @NonNull
-    public Calendar convertDateFromServerFormatToCalendar(@Nullable final String serverDate) throws DateParseException {
+    public Calendar convertDateFromServerFormatToCalendar(@Nullable final String serverDate) throws ParseException {
         final Calendar calendar = Calendar.getInstance();
-        try {
-            if (isServerDateValid(serverDate)) {
-                calendar.setTime(mServerDateFormat.parse(serverDate));
-            }
-        } catch (ParseException e) {
-            throw new DateParseException("Unable to convert server date to calendar format", e.getCause());
+        if (!TextUtils.isEmpty(serverDate)) {
+            calendar.setTime(mServerDateFormat.parse(serverDate));
         }
         return calendar;
     }
 
-    private boolean isServerDateValid(@Nullable final String serverDate) throws DateParseException {
-        Date date = null;
-        if (!TextUtils.isEmpty(serverDate)) {
-            SimpleDateFormat formatter = new SimpleDateFormat(SERVER_DATE_PATTERN, Locale.getDefault());
-            formatter.setLenient(Boolean.FALSE); // make it strict
-            try {
-                date = formatter.parse(serverDate);
-            } catch (ParseException e) {
-                throw new DateParseException("Unable to parse server date to date format", e.getCause());
-            }
-        }
-        return date != null;
-    }
 }

ui/src/main/java/com/hyperwallet/android/ui/view/widget/DateUtil.java

@@ -33,6 +33,8 @@
 import com.hyperwallet.android.hyperwallet_ui.R;
 import com.hyperwallet.android.model.meta.field.HyperwalletField;
 
+import java.text.ParseException;
+
 public class DateWidget extends AbstractWidget implements DateChangedListener {
 
     private final DateUtil mDateUtil;
@@ -67,7 +69,7 @@ public View getView(@NonNull final ViewGroup viewGroup) {
             try {
                 mEditText.setText(mDateUtil.convertDateFromServerToWidgetFormat(
                         TextUtils.isEmpty(mDefaultValue) ? mValue = mField.getValue() : mDefaultValue));
-            } catch (DateParseException e) {
+            } catch (ParseException e) {
                 mEditText.setText("");
             }
             setIdFromFieldLabel(mTextInputLayout);
@@ -115,7 +117,7 @@ public void onUpdate(@Nullable final String selectedDate) {
                 mEditText.setText(mDateUtil.convertDateFromServerToWidgetFormat(selectedDate));
                 mListener.saveTextChanged(getName(), getValue());
                 mListener.valueChanged();
-            } catch (DateParseException e) {
+            } catch (ParseException e) {
                 mEditText.setText(selectedDate);
             }
         }

ui/src/main/java/com/hyperwallet/android/ui/view/widget/DateWidget.java

@@ -3,63 +3,59 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
+import java.text.ParseException;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collection;
-import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
 public class DateUtilTest {
     private final DateUtil mDateUtil = new DateUtil();
 
+    @Rule
+    public final ExpectedException mThrown = ExpectedException.none();
 
     @Test
-    public void testParseIncorrectDateFromServerToWidget() throws Exception {
-        final List<String> inputParamList = buildParamsDateFromServerToWidget();
-        for (String serverDate : inputParamList) {
-            boolean isIncorrect = false;
-            try {
-                mDateUtil.convertDateFromServerToWidgetFormat(serverDate);
-            } catch (DateParseException e) {
-                isIncorrect = true;
-            }
-            assertThat(isIncorrect, is(true));
-        }
-    }
-
-    @Test
-    public void testParseCorrectDateFromServerToWidget() throws Exception {
+    public void testConvertDateFromServerToWidgetFormat() throws Exception {
         String serverDate = "2005-05-23";
         String widgetDate = "23 May 2005";
         assertThat(mDateUtil.convertDateFromServerToWidgetFormat(serverDate), is(widgetDate));
+    }
+
+    @Test
+    public void testBuildParamsDateFromServerToWidget_whenIncorrectDate() throws Exception {
+        mThrown.expect(ParseException.class);
+        mDateUtil.convertDateFromServerToWidgetFormat("1990-01");
+    }
+
+    @Test
+    public void testConvertDateFromServerToWidgetFormat_whenDateIsNullOrEmpty() throws Exception {
         assertThat(mDateUtil.convertDateFromServerToWidgetFormat(""), is(""));
         assertThat(mDateUtil.convertDateFromServerToWidgetFormat(null), is(""));
     }
 
     @Test
-    public void testParseIncorrectDateFromServerToCalendar() throws Exception {
-        List<String> inputParamList = buildParamsDateFromServerToCalendar();
-        for (String serverDate : inputParamList) {
-            boolean isIncorrect = false;
-            try {
-                mDateUtil.convertDateFromServerFormatToCalendar(serverDate).getTime();
-            } catch (DateParseException e) {
-                isIncorrect = true;
-            }
-            assertThat(isIncorrect, is(true));
-        }
+    public void testBuildParamsDateFromServerToCalendar_whenIncorrectDate() throws Exception {
+        mThrown.expect(ParseException.class);
+        mDateUtil.convertDateFromServerFormatToCalendar("123-32").getTime();
     }
 
     @Test
-    public void testParseCorrectDateFromServerToCalendar() throws DateParseException {
+    public void testConvertDateFromServerFormatToCalendar_whenDateIsNullOrEmpty() throws ParseException {
         assertThat(mDateUtil.convertDateFromServerFormatToCalendar(null).getTime().toString(),
                 is(Calendar.getInstance().getTime().toString()));
         assertThat(mDateUtil.convertDateFromServerFormatToCalendar("").getTime().toString(),
                 is(Calendar.getInstance().getTime().toString()));
+    }
+
+    @Test
+    public void testConvertDateFromServerFormatToCalendar() throws ParseException {
         String serverDate = "2005-05-23";
         final Calendar mayCalendar = Calendar.getInstance();
         mayCalendar.set(2005, 4, 23, 0, 0, 0);
@@ -68,7 +64,7 @@ public void testParseCorrectDateFromServerToCalendar() throws DateParseException
     }
 
     @Test
-    public void testParseDateFromDialogToServerFormat() {
+    public void testBuildDateFromDateDialogToServerFormat() {
         String widgetDate;
         int year;
         int month;
@@ -83,34 +79,6 @@ public void testParseDateFromDialogToServerFormat() {
         }
     }
 
-    private List<String> buildParamsDateFromServerToWidget() {
-        return Arrays.asList(
-                "0",
-                "1990-01",
-                "1990-03-111",
-                "10-20-1",
-                "2190-13-1",
-                "2190-00-1",
-                "2190-01-00",
-                "2190-01-0",
-                "2190-01-32"
-        );
-    }
-
-    private List<String> buildParamsDateFromServerToCalendar() {
-        return Arrays.asList(
-                "0",
-                "1990-01",
-                "1990-03-111",
-                "10-20-1",
-                "19-1102-1",
-                "2190-13-1",
-                "2190-00-1",
-                "2190-01-00",
-                "2190-01-0"
-        );
-    }
-
     private Collection<Object[]> buildParamsFromDialogToServer() {
         return Arrays.asList(new Object[][]{
                 {1900, 0, 1, "1900-01-01"},