Revert "[Test] Tag and MultiTag data retrieval by name"

This reverts commit 6012834.
G-Node · May 7, 2017 · 47b044a · 47b044a
1 parent c09d756
commit 47b044a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 29 deletions.
diff --git a/nixio/test/test_multi_tag.py b/nixio/test/test_multi_tag.py
@@ -250,11 +250,6 @@ def test_multi_tag_retrieve_data(self):
         assert(tag.retrieve_data(0, 0).shape == (2000,))
         assert(np.array_equal(y[:2000], tag.retrieve_data(0, 0)[:]))
 
-        # get by name
-        data = tag.retrieve_data(0, da.name)
-        assert(data.shape == (2000,))
-        assert(np.array_equal(y[:2000], data[:]))
-
     def test_multi_tag_feature_data(self):
         index_data = self.block.create_data_array("indexed feature data",
                                                   "test",
@@ -330,23 +325,6 @@ def test_multi_tag_feature_data(self):
         data_view = self.feature_tag.retrieve_feature_data(1, 1)
         assert(len(data_view.shape) == 3)
 
-        # === retrieve by name ===
-        # indexed feature
-        feat_data = self.feature_tag.retrieve_feature_data(0, index_data.name)
-        assert(len(feat_data.shape) == 2)
-        assert(feat_data.size == 10)
-        assert(np.sum(feat_data) == 55)
-
-        data_view = self.feature_tag.retrieve_feature_data(9, index_data.name)
-        assert(np.sum(data_view[:, :]) == 9055)
-
-        # tagged feature
-        data_view = self.feature_tag.retrieve_feature_data(0, tagged_data.name)
-        assert(len(data_view.shape) == 3)
-
-        data_view = self.feature_tag.retrieve_feature_data(1, tagged_data.name)
-        assert(len(data_view.shape) == 3)
-
         def out_of_bounds():
             self.feature_tag.retrieve_feature_data(2, 1)
 

diff --git a/nixio/test/test_tag.py b/nixio/test/test_tag.py
@@ -190,13 +190,6 @@ def test_tag_retrieve_feature_data(self):
         assert(data2.size == 2)
         assert(data3.size == len(ramp_data))
 
-        # get by name
-        data1 = pos_tag.retrieve_feature_data(number_feat.name)
-        data2 = pos_tag.retrieve_feature_data(ramp_feat.name)
-
-        assert(data1.size == 1)
-        assert(data2.size == 2)
-
 
 @unittest.skipIf(skip_cpp, "HDF5 backend not available.")
 class TestTagCPP(_TestTag):