----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/23870/ -----------------------------------------------------------
(Updated July 23, 2014, 11:33 p.m.) Review request for oodt, Lewis McGibbney, Chris Mattmann, and Paul Ramirez. Bugs: OODT-685 https://issues.apache.org/jira/browse/OODT-685 Repository: oodt Description (updated) ------- After changes in the file manager directory structure for OODT-685, some of the file manager unit tests required updating to point to the new location for test resources (src/testdata moved to src/test/resources). This patch updates several of the file manager unit tests that referred to src/testdata to point to src/test/resources instead. It also removes duplicate XML from the following test resources in src/test/resources: cmd-line-actions.xml, cmd-line-options.xml and product-types.xml. After applying the patch, there are still some issues when running file manager tests (one test error and one test failure), see below for details. Diffs ----- /trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java 1612886 /trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestMappedDataSourceCatalog.java 1612886 /trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestOrderedDataSourceCatalog.java 1612886 /trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/TestFileManagerCli.java 1612886 /trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/datatransfer/TestLocalDataTransferer.java 1612886 /trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java 1612886 /trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java 1612886 /trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java 1612886 /trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java 1612886 /trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java 1612886 /trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java 1612886 /trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java 1612886 /trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java 1612886 /trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java 1612886 /trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java 1612886 /trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlRpcStructFactory.java 1612886 /trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java 1612886 /trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestBasicVersioner.java 1612886 /trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDateTimeVersioner.java 1612886 /trunk/filemgr/src/test/resources/cmd-line-actions.xml 1612886 /trunk/filemgr/src/test/resources/cmd-line-options.xml 1612886 /trunk/filemgr/src/test/resources/xmlrpc-struct-factory/product-types.xml 1612886 Diff: https://reviews.apache.org/r/23870/diff/ Testing ------- Before applying the patch, the majority of file manager tests fail, as shown by the results below: Tests run: 189, Failures: 74, Errors: 30, Skipped: 0 After applying the patch, the majority of file manager tests pass, except for the following (1 failure, 1 error): Results : Failed tests: testGetElements(org.apache.oodt.cas.filemgr.validation.TestXMLValidationLayer): There aren't exactly 4 elements in the test samples! expected:<4> but was:<11> Tests in error: testAddProductType(org.apache.oodt.cas.filemgr.cli.TestFileManagerCli): org.apache.oodt.cas.cli.exception.CmdLineConstructionException: Invalid option: 'typeName' Thanks, Ross Laidlaw