Repository: oodt Updated Branches: refs/heads/development e43c6c007 -> 423444cb9
Fix for OODT-954: CAS-PGE FileManagerFileStager has NPE b/c it does not set Product Structure Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/44c15555 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/44c15555 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/44c15555 Branch: refs/heads/development Commit: 44c1555543ff912a907c592d225b5e69564a6a52 Parents: ffd8ad0 Author: Chris Mattmann <[email protected]> Authored: Wed Jul 19 10:43:10 2017 -0700 Committer: Chris Mattmann <[email protected]> Committed: Wed Jul 19 10:43:10 2017 -0700 ---------------------------------------------------------------------- .../cas/pge/staging/FileManagerFileStager.java | 1 + .../pge/staging/TestFileManagerFileStager.java | 41 ++++++++++++++++++++ 2 files changed, 42 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/44c15555/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileManagerFileStager.java ---------------------------------------------------------------------- diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileManagerFileStager.java b/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileManagerFileStager.java index 629b9fb..dbf6602 100644 --- a/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileManagerFileStager.java +++ b/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileManagerFileStager.java @@ -88,6 +88,7 @@ public class FileManagerFileStager extends FileStager { @VisibleForTesting static Product createProduct(URI path) { Product product = new Product(); + product.setProductStructure(Product.STRUCTURE_FLAT); //TODO: only support flat prods for now Reference reference = new Reference(); reference.setDataStoreReference(path.toString()); product.setProductReferences(Lists.newArrayList(reference)); http://git-wip-us.apache.org/repos/asf/oodt/blob/44c15555/pge/src/test/java/org/apache/oodt/cas/pge/staging/TestFileManagerFileStager.java ---------------------------------------------------------------------- diff --git a/pge/src/test/java/org/apache/oodt/cas/pge/staging/TestFileManagerFileStager.java b/pge/src/test/java/org/apache/oodt/cas/pge/staging/TestFileManagerFileStager.java new file mode 100644 index 0000000..e74c6b8 --- /dev/null +++ b/pge/src/test/java/org/apache/oodt/cas/pge/staging/TestFileManagerFileStager.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.oodt.cas.pge.staging; + +import java.net.URI; +import java.net.URISyntaxException; + +import org.apache.oodt.cas.filemgr.structs.Product; + +import junit.framework.TestCase; + +public class TestFileManagerFileStager extends TestCase { + + public void testProductStructure(){ + FileManagerFileStager stager = new FileManagerFileStager(); + try { + Product p = stager.createProduct(new URI("file://tmp/test.txt")); + assertNotNull(p); + assertEquals(Product.STRUCTURE_FLAT, p.getProductStructure()); + } catch (URISyntaxException e) { + e.printStackTrace(); + fail(e.getLocalizedMessage()); + } + + } +}
