various unit test modifications and accounting for UTC timezone on YAML cases

Signed-off-by: Neal Ensor <[email protected]>

Author: nensor

src/main/java/gov/osti/services/Validation.java

@@ -16,7 +16,6 @@
 import gov.osti.repository.SubversionRepository;
 import java.io.IOException;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -60,7 +59,7 @@ public ApiResponse() {
      * @return the isValid
      */
     public Boolean isValid() {
-        return isValid;
+        return (null==isValid) ? false : isValid;
     }
 
     /**
@@ -102,7 +101,7 @@ public class Validation {
     // API host for servicing external validation calls
     private static final String API_HOST = DoeServletContextListener.getConfigurationProperty("api.host");
     // a JSON mapper
-    private static final ObjectMapper mapper = new ObjectMapper();
+    protected static final ObjectMapper mapper = new ObjectMapper();
     // static DOI resolution prefix
     private static final String DOI_BASE_URL = "https://doi.org/";
 

src/test/java/gov/osti/connectors/MetadataYamlTest.java

@@ -17,6 +17,8 @@
 import java.io.File;
 import java.io.FileReader;
 import java.text.SimpleDateFormat;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
 import org.junit.After;
@@ -215,10 +217,12 @@ public void testYamlToMetadata() throws Exception {
         assertTrue  ("Should be DOE", reorg.isDOE());
 
         Date issue_date = metadata.getReleaseDate();
-        SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy");
 
         assertNotNull("Date is missing", issue_date);
-        assertEquals ("Date is wrong", "06/02/1999", sdf.format(issue_date));
+        assertEquals ("Date is wrong", "06/02/1999", 
+                DateTimeFormatter.ofPattern("MM/dd/yyyy")
+                        .withZone(ZoneId.of("UTC"))
+                        .format(issue_date.toInstant()));
 
         log.info("Writing back out:");
         log.info(HttpUtil.writeMetadataYaml(metadata));

src/test/java/gov/osti/services/ValidationTest.java

@@ -2,6 +2,7 @@
  */
 package gov.osti.services;
 
+import java.io.IOException;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -51,6 +52,18 @@ public void testIsValidEmail() {
         }
     }
 
+    /**
+     * Test for specific failing Boolean conversions in API responses.
+     * 
+     * @throws IOException on unexpected errors
+     */
+    @Test
+    public void testApiResponse() throws IOException {
+        ApiResponse response = Validation.mapper.readValue("{}", ApiResponse.class);
+        
+        assertFalse ("Empty JSON should be invalid", response.isValid());
+    }
+    
     /**
      * Test of isValidUrl method, of class Validation.
      */