Author: pramirez
Date: Sun Mar 11 20:34:25 2012
New Revision: 1299442
URL: http://svn.apache.org/viewvc?rev=1299442&view=rev
Log:
Updated unit tests to check that multivalued keys are persisted and retrieved
Added:
oodt/trunk/filemgr/src/testdata/ingest/test-file-3.txt (with props)
oodt/trunk/filemgr/src/testdata/ingest/test-file-3.txt.met (with props)
Modified:
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
Modified:
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java?rev=1299442&r1=1299441&r2=1299442&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
(original)
+++
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
Sun Mar 11 20:34:25 2012
@@ -133,6 +133,29 @@ public class TestXmlRpcFileManagerClient
assertEquals(m.getMetadata("Filename"), "test.txt");
deleteAllFiles("/tmp/test-type");
}
+
+ /**
+ * @since OODT-404
+ *
+ */
+ public void testMetadataPersistence() throws Exception {
+ Metadata prodMet = null;
+ StdIngester ingester = new StdIngester(transferServiceFacClass);
+ prodMet = new SerializableMetadata(new FileInputStream(
+ "./src/testdata/ingest/test-file-3.txt.met"));
+ // now add the right file location
+ prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(
+ "./src/testdata/ingest").getCanonicalPath());
+ String productId = ingester.ingest(new URL("http://localhost:"; +
FM_PORT), new File(
+ "./src/testdata/ingest/test-file-3.txt"), prodMet);
+ XmlRpcFileManagerClient fmc = new XmlRpcFileManagerClient(new URL(
+ "http://localhost:"; + FM_PORT));
+
+ Metadata m = fmc.getMetadata(fmc.getProductById(productId));
+ assertEquals(m.getAllMetadata("TestElement").size(), 4);
+ assertEquals(m.getMetadata("TestElement"), "fe");
+ }
+
public void testComplexQuery() throws Exception {
StdIngester ingester = new StdIngester(transferServiceFacClass);
Added: oodt/trunk/filemgr/src/testdata/ingest/test-file-3.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/testdata/ingest/test-file-3.txt?rev=1299442&view=auto
==============================================================================
--- oodt/trunk/filemgr/src/testdata/ingest/test-file-3.txt (added)
+++ oodt/trunk/filemgr/src/testdata/ingest/test-file-3.txt Sun Mar 11 20:34:25
2012
@@ -0,0 +1 @@
+This is just a file to test metadata
Propchange: oodt/trunk/filemgr/src/testdata/ingest/test-file-3.txt
------------------------------------------------------------------------------
svn:keywords = Id Revision
Added: oodt/trunk/filemgr/src/testdata/ingest/test-file-3.txt.met
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/testdata/ingest/test-file-3.txt.met?rev=1299442&view=auto
==============================================================================
--- oodt/trunk/filemgr/src/testdata/ingest/test-file-3.txt.met (added)
+++ oodt/trunk/filemgr/src/testdata/ingest/test-file-3.txt.met Sun Mar 11
20:34:25 2012
@@ -0,0 +1,17 @@
+<cas:metadata xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas";>
+<keyval type="scalar">
+ <key>Filename</key>
+ <val>test-file-3.txt</val>
+</keyval>
+<keyval type="scalar">
+ <key>ProductType</key>
+ <val>TestType</val>
+</keyval>
+<keyval type="scalar">
+ <key>TestElement</key>
+ <val>fe</val>
+ <val>fi</val>
+ <val>fo</val>
+ <val>fum</val>
+</keyval>
+</cas:metadata>
Propchange: oodt/trunk/filemgr/src/testdata/ingest/test-file-3.txt.met
------------------------------------------------------------------------------
svn:keywords = Id Revision
