add tests for composite bypass and std

lsst · Jul 11, 2017 · 669ccb8 · 669ccb8
1 parent cb2656a
commit 669ccb8
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 3 deletions.
diff --git a/python/lsst/obs/base/test/compositeMapper.py b/python/lsst/obs/base/test/compositeMapper.py
@@ -40,3 +40,10 @@ def _makeCamera(self, policy, repositoryDir):
         """Normally this makes a camera. For composite testing, we don't need a camera.
         """
         return None
+
+    def std_stdTestType(self, item, dataId):
+        item.standardized = True
+        return item
+
+    def bypass_bypassTestType(self, datasetType, pythonType, location, dataId):
+        return set(dataId.keys())
diff --git a/tests/testComposite.py b/tests/testComposite.py
@@ -62,9 +62,23 @@ def setUp(self):
                                                 'a': {'datasetType': 'basicObject1'},
                                                 'b': {'datasetType': 'basicObject2'}
                                             },
-                                            'assembler': 'lsst.daf.persistence.test.TestObjectPair.assembler',
-                                            'disassembler': 'lsst.daf.persistence.test.TestObjectPair.disassembler'
-
+                                            'assembler':
+                                                'lsst.daf.persistence.test.TestObjectPair.assembler',
+                                            'disassembler':
+                                                'lsst.daf.persistence.test.TestObjectPair.disassembler'},
+                                        'stdTestType': {
+                                            'python': 'lsst.daf.persistence.test.TestObjectPair',
+                                            'composite': {
+                                                'a': {'datasetType': 'basicObject1'},
+                                                'b': {'datasetType': 'basicObject2'}
+                                            }
+                                        },
+                                        'bypassTestType': {
+                                            'python': 'lsst.daf.persistence.test.TestObjectPair',
+                                            'composite': {
+                                                'a': {'datasetType': 'basicObject1'},
+                                                'b': {'datasetType': 'basicObject2'}
+                                            }
                                         }
                                     }})
 
@@ -151,6 +165,25 @@ def testDatasetDoesNotExist(self):
         butler.put(self.objA, 'basicObject1', dataId={'id': 'foo'})
         self.assertFalse(butler.datasetExists('basicPair', dataId={'id': 'foo', 'name': 'bar'}))
 
+    def testStd(self):
+        """Verify that composite dataset types with a std_ function are passed to the std_ function after
+        being instantiated."""
+        secondRepoPath = os.path.join(self.testData, 'repo2')
+        repoArgs = dafPersist.RepositoryArgs(root=secondRepoPath, policy=self.policy)
+        butler = dafPersist.Butler(inputs=self.firstRepoPath, outputs=repoArgs)
+        objABPair = butler.get('stdTestType', dataId={'id': 'foo', 'name': 'bar'})
+        self.assertTrue(hasattr(objABPair, 'standardized'))
+        self.assertTrue(objABPair.standardized)
+
+    def testBypass(self):
+        """Verify that composite dataset types with a bypass_ function are passed to the bypass function after
+        being instantiated."""
+        secondRepoPath = os.path.join(self.testData, 'repo2')
+        repoArgs = dafPersist.RepositoryArgs(root=secondRepoPath, policy=self.policy)
+        butler = dafPersist.Butler(inputs=self.firstRepoPath, outputs=repoArgs)
+        bypassObject = butler.get('bypassTestType', dataId={'id': 'foo', 'name': 'bar'})
+        self.assertEqual(bypassObject, set(['id', 'name'])
+
 
 class TestGenericAssembler(unittest.TestCase):
     """A test case for the generic assembler feature of composite datasets."""