svn commit: r1592135 - in /oodt/trunk/filemgr/src: main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/DateTimeExpandMetExtractor.java test/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestDateTimeExpandMetExtractor.java

[bfoster]

Author: bfoster
Date: Sat May  3 01:06:01 2014
New Revision: 1592135

URL: http://svn.apache.org/r1592135
Log:
- Forgot MetExtractors need to handle there own merge... OODT-679

Modified:
    
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/DateTimeExpandMetExtractor.java
    
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestDateTimeExpandMetExtractor.java

Modified: 
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/DateTimeExpandMetExtractor.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/DateTimeExpandMetExtractor.java?rev=1592135&r1=1592134&r2=1592135&view=diff
==============================================================================
--- 
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/DateTimeExpandMetExtractor.java
 (original)
+++ 
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/DateTimeExpandMetExtractor.java
 Sat May  3 01:06:01 2014
@@ -69,14 +69,13 @@ public class DateTimeExpandMetExtractor 
   public Metadata doExtract(Product product, Metadata metadata) throws 
MetExtractionException {
     String fullDateTime = getFullDateTime(metadata);
 
-    Metadata extractMetadata = new Metadata();
-    createDateField(extractMetadata, yearKey, fullDateTime, 
fullDateTimeFormat, "yyyy");
-    createDateField(extractMetadata, monthKey, fullDateTime, 
fullDateTimeFormat, "MM");
-    createDateField(extractMetadata, dayKey, fullDateTime, fullDateTimeFormat, 
"dd");
-    createDateField(extractMetadata, hourKey, fullDateTime, 
fullDateTimeFormat, "HH");
-    createDateField(extractMetadata, minuteKey, fullDateTime, 
fullDateTimeFormat, "mm");
-    createDateField(extractMetadata, secondKey, fullDateTime, 
fullDateTimeFormat, "ss");
-    return extractMetadata;
+    createDateField(metadata, yearKey, fullDateTime, fullDateTimeFormat, 
"yyyy");
+    createDateField(metadata, monthKey, fullDateTime, fullDateTimeFormat, 
"MM");
+    createDateField(metadata, dayKey, fullDateTime, fullDateTimeFormat, "dd");
+    createDateField(metadata, hourKey, fullDateTime, fullDateTimeFormat, "HH");
+    createDateField(metadata, minuteKey, fullDateTime, fullDateTimeFormat, 
"mm");
+    createDateField(metadata, secondKey, fullDateTime, fullDateTimeFormat, 
"ss");
+    return metadata;
   }
 
   private String getKey(String key) {

Modified: 
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestDateTimeExpandMetExtractor.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestDateTimeExpandMetExtractor.java?rev=1592135&r1=1592134&r2=1592135&view=diff
==============================================================================
--- 
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestDateTimeExpandMetExtractor.java
 (original)
+++ 
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestDateTimeExpandMetExtractor.java
 Sat May  3 01:06:01 2014
@@ -51,8 +51,8 @@ public class TestDateTimeExpandMetExtrac
   @Rule public ExpectedException expectedException = ExpectedException.none();
 
   @Mock private Properties configuration;
-  @Mock private Metadata metadata;
 
+  private Metadata metadata;
   private DateTimeExpandMetExtractor extractor;
 
   @Before
@@ -68,7 +68,8 @@ public class TestDateTimeExpandMetExtrac
     when(configuration.getProperty("MinuteKey")).thenReturn("StartMinute");
     when(configuration.getProperty("SecondKey")).thenReturn("StartSecond");
 
-    when(metadata.getMetadata("StartDateTime")).thenReturn("2013-05-23 
03:02:01");
+    metadata = new Metadata();
+    metadata.addMetadata("StartDateTime", "2013-05-23 03:02:01");
 
     extractor = new DateTimeExpandMetExtractor();
   }