From 191c16ba9d2c13c0d2d2abfe7294a1405d18cd14 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Wed, 1 Feb 2023 15:09:42 +0100
Subject: [PATCH] test: more testing of tests
---
.../java/info/textgrid/middleware/OaipmhUtilities.java | 6 +-----
.../textgrid/middleware/test/TestOaipmhUtilities.java | 8 +++++---
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhUtilities.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhUtilities.java
index 7615bcbd..65a3c1a6 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhUtilities.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhUtilities.java
@@ -132,12 +132,8 @@ public class OaipmhUtilities {
GregorianCalendar greg = new GregorianCalendar();
greg.setTimeInMillis(System.currentTimeMillis());
- // Format UTC string.
- OAIDC_UTC_TIME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
- String utcString = OAIDC_UTC_TIME_FORMAT.format(greg.getTime());
-
// Get result.
- result = DatatypeFactory.newInstance().newXMLGregorianCalendar(utcString);
+ result = DatatypeFactory.newInstance().newXMLGregorianCalendar(greg).normalize();
log.fine("outgoing utc date (now): " + result);
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/test/TestOaipmhUtilities.java b/oaipmh-core/src/test/java/info/textgrid/middleware/test/TestOaipmhUtilities.java
index 79d9df5e..0f2839a7 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/test/TestOaipmhUtilities.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/test/TestOaipmhUtilities.java
@@ -190,8 +190,8 @@ public class TestOaipmhUtilities {
@Test
public void testGetUTCDatestampAsString() throws ParseException {
- String expectedUTCDate = "1970-12-10T17:30:00Z";
- String tgDateStamp = "1970-12-10T18:30:00.000";
+ String tgDateStamp = "2012-02-10T23:45:00.507+01:00";
+ String expectedUTCDate = "2012-02-10T22:45:00Z";
String utcDate = OaipmhUtilities.getUTCDatestampAsString(tgDateStamp);
@@ -276,7 +276,9 @@ public class TestOaipmhUtilities {
XMLGregorianCalendar currentDate = OaipmhUtilities.getCurrentUTCDate();
- System.out.println(currentDate);
+ if (!currentDate.isValid()) {
+ assertTrue(currentDate + " is not a valid date!", false);
+ }
}
}
--
GitLab