Author: mattmann
Date: Tue Apr 12 22:12:47 2011
New Revision: 1091582
URL: http://svn.apache.org/viewvc?rev=1091582&view=rev
Log:
- fix for OODT-174 TestAcquisitionDateVersioner fails in the later evening
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestAcquisitionDateVersioner.java
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1091582&r1=1091581&r2=1091582&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Tue Apr 12 22:12:47 2011
@@ -4,6 +4,8 @@ Apache OODT Change Log
Release 0.3-SNAPSHOT (in progress)
--------------------------------------------
+* OODT-174 TestAcquisitionDateVersioner fails in the later evening (bfoster
via mattmann)
+
* OODT-172 Improvements to the Filename Extractor (mattmann)
* OODT-170 cas-catalog shuffles query results . . . order is lost (bfoster)
Modified:
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestAcquisitionDateVersioner.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestAcquisitionDateVersioner.java?rev=1091582&r1=1091581&r2=1091582&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestAcquisitionDateVersioner.java
(original)
+++
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestAcquisitionDateVersioner.java
Tue Apr 12 22:12:47 2011
@@ -21,6 +21,7 @@ package org.apache.oodt.cas.filemgr.vers
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.TimeZone;
//OODT imports
import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
@@ -54,8 +55,10 @@ public class TestAcquisitionDateVersione
p.getProductReferences().add(r);
Metadata met = new Metadata();
met.addMetadata(CoreMetKeys.FILENAME, "file1.txt");
- String expectedDateTimeStr = new SimpleDateFormat(
- AcquisitionDateVersioner.ACQ_DATE_FORMAT).format(new Date());
+ SimpleDateFormat acqDateFormatter = new SimpleDateFormat(
+ AcquisitionDateVersioner.ACQ_DATE_FORMAT);
+ acqDateFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
+ String expectedDateTimeStr = acqDateFormatter.format(new Date());
String expectedPath = "file:/home/files/" + expectedDateTimeStr
+ "/file1.txt";
try {
