Add integration tests for tag list and tag listsets commands

ximenesuk · Dec 16, 2013 · 5f5eed7 · 5f5eed7
1 parent 3c9c8ca
commit 5f5eed7
Showing 1 changed file with 37 additions and 0 deletions.
diff --git a/components/tools/OmeroPy/test/integration/clitest/test_tag.py b/components/tools/OmeroPy/test/integration/clitest/test_tag.py
@@ -53,6 +53,22 @@ def create_tags(self, ntags, name):
                 tag_ids = tag.id.val
         return tag_ids
 
+    def create_tagset(self, tag_ids, name):
+        tagset = omero.model.TagAnnotationI()
+        tagset.textValue = omero.rtypes.rstring(name)
+        tagset = self.update.saveAndReturnObject(tagset)
+
+        tagset.ns = rstring(omero.constants.metadata.NSINSIGHTTAGSET)
+        links = []
+        for tag_id in tag_ids:
+            link = omero.model.AnnotationAnnotationLinkI()
+            link.parent = tagset
+            link.child = omero.model.TagAnnotationI(tag_id, False)
+            links.append(link)
+        self.update.saveArray(links)
+
+        return tagset.id.val
+
     def get_tag_by_name(self, tag_name, ns=None):
         # Query
         params = omero.sys.Parameters()
@@ -179,6 +195,27 @@ def testLoadTagset(self):
         tags = self.get_tags_in_tagset(tagset.id.val)
         assert sorted([x.textValue.val for x in tags]) == sorted(tag_names)
 
+    # Tag list commands
+    # ========================================================================
+    @pytest.mark.parametrize('list_command', ['list', 'listsets'])
+    @pytest.mark.parametrize('page_arg', ['', '--nopage'])
+    def testList(self, capsys, list_command, page_arg):
+        tag_ids = self.create_tags(2, 'list_tag')
+        tagset_id = self.create_tagset(tag_ids, 'list_tagset')
+
+        self.args += [list_command]
+        if page_arg:
+            self.args += [page_arg]
+        self.cli.invoke(self.args, strict=True)
+
+        out, err = capsys.readouterr()
+        assert str(tagset_id) in out
+        for tag_id in tag_ids:
+            if list_command == 'list':
+                assert str(tag_id) in out
+            else:
+                assert str(tag_id) not in out
+
     # Tag linking commands
     # ========================================================================
     def get_link(self, classname, object_id):