deriva 1.7.3__py3-none-any.whl → 1.7.5__py3-none-any.whl

tests/deriva/core/test_datapath.py

@@ -76,33 +76,33 @@ def define_test_schema(catalog):
     )
     isa.create_table(table_def)
 
-    # create TNAME_EXPERIMENT table
-    table_def = _em.Table.define(
-        TNAME_EXPERIMENT,
-        column_defs=[
-            _em.Column.define(cname, ctype) for (cname, ctype) in [
-                ('Name', _em.builtin_types.text),
-                ('Amount', _em.builtin_types.int4),
-                ('Time', _em.builtin_types.timestamptz),
-                ('Type', _em.builtin_types.text),
-                ('Project Investigator', _em.builtin_types.text),
-                ('Project_Num', _em.builtin_types.int4),
-                ('Empty', _em.builtin_types.int4)
+    # experiment table definition helper
+    def exp_table_def(exp_table_name):
+        return _em.Table.define(
+            exp_table_name,
+            column_defs=[
+                _em.Column.define(cname, ctype) for (cname, ctype) in [
+                    ('Name', _em.builtin_types.text),
+                    ('Amount', _em.builtin_types.int4),
+                    ('Time', _em.builtin_types.timestamptz),
+                    ('Type', _em.builtin_types.text),
+                    ('Project Investigator', _em.builtin_types.text),
+                    ('Project_Num', _em.builtin_types.int4),
+                    ('Empty', _em.builtin_types.int4)
+                ]
+            ],
+            key_defs=[
+                _em.Key.define(['Name'])
+            ],
+            fkey_defs=[
+                _em.ForeignKey.define(['Type'], SNAME_VOCAB, TNAME_EXPERIMENT_TYPE, ['ID']),
+                _em.ForeignKey.define(['Project Investigator', 'Project_Num'], SNAME_ISA, TNAME_PROJECT, ['Investigator', 'Num'])
             ]
-        ],
-        key_defs=[
-            _em.Key.define(['Name'])
-        ],
-        fkey_defs=[
-            _em.ForeignKey.define(['Type'], SNAME_VOCAB, TNAME_EXPERIMENT_TYPE, ['ID']),
-            _em.ForeignKey.define(['Project Investigator', 'Project_Num'], SNAME_ISA, TNAME_PROJECT, ['Investigator', 'Num'])
-        ]
-    )
-    isa.create_table(table_def)
+        )
 
-    # create copy of TNAME_EXPERIMENT table
-    table_def['table_name'] = TNAME_EXPERIMENT_COPY
-    isa.create_table(table_def)
+    # create experiment tables
+    isa.create_table(exp_table_def(TNAME_EXPERIMENT))
+    isa.create_table(exp_table_def(TNAME_EXPERIMENT_COPY))
 
 
 def _generate_experiment_entities(types, count):
@@ -665,6 +665,13 @@ class DatapathTests (unittest.TestCase):
         df = DataFrame(results)
         self.assertEqual(len(df), TEST_EXP_MAX)
 
+    def test_insert_double_fetch(self):
+        entities = _generate_experiment_entities(self.types, 2)
+        results = self.experiment_copy.insert(entities)
+        rows1 = results.fetch()
+        rows2 = results.fetch()
+        self.assertEqual(rows1, rows2)
+        
     def test_insert_empty_entities(self):
         results = self.experiment_copy.insert(None)
         self.assertEqual(len(results), 0)
@@ -728,6 +735,25 @@ class DatapathTests (unittest.TestCase):
         with self.assertRaises(TypeError):
             self.experiment_type.update('this is not a dict')
 
+    def test_delete_whole_path(self):
+        self.experiment_copy.insert(_generate_experiment_entities(self.types, 10))
+        self.assertEqual(len(self.experiment_copy.entities()), 10)
+        self.experiment_copy.path.delete()
+        self.assertEqual(len(self.experiment_copy.entities()), 0)
+
+    def test_delete_filtered_path(self):
+        self.experiment_copy.insert(_generate_experiment_entities(self.types, 10))
+        expression = self.experiment_copy.column_definitions['Name'] == TEST_EXP_NAME_FORMAT.format(1)
+        self.assertEqual(len(self.experiment_copy.filter(expression).entities()), 1)
+        self.experiment_copy.filter(expression).delete()
+        self.assertEqual(len(self.experiment_copy.filter(expression).entities()), 0)
+
+    def test_delete_whole_table(self):
+        self.experiment_copy.insert(_generate_experiment_entities(self.types, 10))
+        self.assertEqual(len(self.experiment_copy.entities()), 10)
+        self.experiment_copy.delete()
+        self.assertEqual(len(self.experiment_copy.entities()), 0)
+
     def test_nondefaults(self):
         nondefaults = {'RID', 'RCB', 'RCT'}
         results = self.experiment.entities()
@@ -830,4 +856,4 @@ class DatapathTests (unittest.TestCase):
 
 
 if __name__ == '__main__':
-    sys.exit(unittest.main())
+    unittest.main()