[commons-beanutils] 02/02: Update test framework method for java.sql.Date.

[gg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git

commit 0fbc23ff1ba7945d3c06403396f932c3dc6a915d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri May 6 16:26:55 2022 -0400

    Update test framework method for java.sql.Date.
---
 .../beanutils2/converters/DateConverterTestBase.java        | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java b/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
index f6435fc6..70ff839e 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
@@ -29,6 +29,7 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Locale;
+import java.util.Objects;
 
 import org.apache.commons.beanutils2.ConversionException;
 import org.apache.commons.beanutils2.Converter;
@@ -57,11 +58,15 @@ public abstract class DateConverterTestBase<T> extends TestCase {
     protected abstract Class<T> getExpectedType();
 
     /**
-     * Convert a Date or Calendar objects to the time in milliseconds
+     * Converts a Date or Calendar objects to the time in milliseconds
      * @param date The date or calendar object
      * @return The time in milliseconds
      */
     long getTimeInMillis(final Object date) {
+        if (date instanceof java.sql.Date) {
+            return ((java.sql.Date) date).getTime();
+        }
+
         if (date instanceof java.sql.Timestamp) {
             return ((java.sql.Timestamp) date).getTime();
         }
@@ -85,7 +90,11 @@ public abstract class DateConverterTestBase<T> extends TestCase {
         if (date instanceof Calendar) {
             return ((Calendar) date).getTime().getTime();
         }
-        return ((Date) date).getTime();
+
+        if (date instanceof Date) {
+            return ((Date) date).getTime();
+        }
+        throw new IllegalArgumentException(Objects.toString(date));
     }
 
     /**