Repository: oodt Updated Branches: refs/heads/avro_rpc 2b1dc2286 -> 6d4acafc7
OODT-781 add an extra test file to prevent removal breaking other tests Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/cb529446 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/cb529446 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/cb529446 Branch: refs/heads/avro_rpc Commit: cb52944658949a483f04da4fe1d70e2e024b9187 Parents: 8255ead Author: Tom Barber <t...@analytical-labs.com> Authored: Mon Dec 28 12:49:28 2015 +0000 Committer: Tom Barber <t...@analytical-labs.com> Committed: Mon Dec 28 12:49:28 2015 +0000 ---------------------------------------------------------------------- .../cas/filemgr/system/TestXmlRpcFileManagerClient.java | 6 +++--- filemgr/src/test/resources/ingest/test-delete.txt | 1 + filemgr/src/test/resources/ingest/test-delete.txt.met | 10 ++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/cb529446/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java index c864bd5..8ad4c70 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java @@ -144,12 +144,12 @@ public class TestXmlRpcFileManagerClient extends TestCase { public void testRemoveFile() throws Exception { URL ingestUrl = this.getClass().getResource("/ingest"); - URL refUrl = this.getClass().getResource("/ingest/test.txt"); + URL refUrl = this.getClass().getResource("/ingest/test-delete.txt"); Metadata prodMet = new Metadata(); prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File( ingestUrl.getFile()).getCanonicalPath()); - prodMet.addMetadata(CoreMetKeys.FILENAME, "test.txt"); + prodMet.addMetadata(CoreMetKeys.FILENAME, "test-delete.txt"); prodMet.addMetadata(CoreMetKeys.PRODUCT_NAME, "TestFile"); prodMet.addMetadata(CoreMetKeys.PRODUCT_TYPE, "GenericFile"); @@ -160,7 +160,7 @@ public class TestXmlRpcFileManagerClient extends TestCase { XmlRpcFileManagerClient fmc = new XmlRpcFileManagerClient(new URL( "http://localhost:" + FM_PORT)); Metadata m = fmc.getMetadata(fmc.getProductById(productId)); - assertEquals(m.getMetadata("Filename"), "test.txt"); + assertEquals(m.getMetadata("Filename"), "test-delete.txt"); String loc = m.getMetadata("FileLocation"); fmc.removeFile(loc+"/"+m.getMetadata("Filename")); http://git-wip-us.apache.org/repos/asf/oodt/blob/cb529446/filemgr/src/test/resources/ingest/test-delete.txt ---------------------------------------------------------------------- diff --git a/filemgr/src/test/resources/ingest/test-delete.txt b/filemgr/src/test/resources/ingest/test-delete.txt new file mode 100644 index 0000000..65cdb12 --- /dev/null +++ b/filemgr/src/test/resources/ingest/test-delete.txt @@ -0,0 +1 @@ +this is a test text file http://git-wip-us.apache.org/repos/asf/oodt/blob/cb529446/filemgr/src/test/resources/ingest/test-delete.txt.met ---------------------------------------------------------------------- diff --git a/filemgr/src/test/resources/ingest/test-delete.txt.met b/filemgr/src/test/resources/ingest/test-delete.txt.met new file mode 100644 index 0000000..6edb2fd --- /dev/null +++ b/filemgr/src/test/resources/ingest/test-delete.txt.met @@ -0,0 +1,10 @@ +<cas:metadata xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas"> +<keyval type="scalar"> + <key>Filename</key> + <val>test.txt</val> +</keyval> +<keyval type="scalar"> + <key>ProductType</key> + <val>GenericFile</val> +</keyval> +</cas:metadata>