adds ToolCommand cls to remove, fetch, list & kills roundtrip test

Author: lizgehret

q2cli/builtin/tools.py

@@ -1441,7 +1441,8 @@ def annotation_create(input_path, annotation_type,
     name='annotation-remove',
     short_help='Remove an Annotation from a QIIME 2 Result.',
     help='Remove an existing Annotation (by name) from'
-         ' an Artifact or Visualization.'
+         ' an Artifact or Visualization.',
+    cls=ToolCommand
 )
 @click.option(
     '--input-path',
@@ -1487,7 +1488,8 @@ def annotation_remove(input_path, name, output_path):
     name='annotation-fetch',
     short_help='Fetch an Annotation from a QIIME 2 Result.',
     help='Fetch an existing Annotation (by name) from'
-         ' an Artifact or Visualization.'
+         ' an Artifact or Visualization.',
+    cls=ToolCommand
 )
 @click.option(
     '--input-path',
@@ -1536,7 +1538,8 @@ def annotation_fetch(input_path, name, verbose):
     name='annotation-list',
     short_help='List Annotations on a QIIME 2 Result.',
     help='List all Annotations that are attached to'
-         ' an Artifact or Visualization.'
+         ' an Artifact or Visualization.',
+    cls=ToolCommand
 )
 @click.option(
     '--input-path',

q2cli/tests/test_tools.py

@@ -1308,36 +1308,6 @@ def setUp(self):
     def tearDown(self):
         shutil.rmtree(self.tempdir)
 
-    def test_annotation_commands_roundtrip_success(self):
-        create_result = self.runner.invoke(
-            tools,
-            ['annotation-create', '--input-path', self.art1,
-                '--annotation-type', 'Note',
-                '--name', 'mynote', '--text', 'my special text',
-                '--output-path', self.output1]
-        )
-        self.assertEqual(create_result.exit_code, 0)
-
-        fetch_result = self.runner.invoke(
-            tools,
-            ['annotation-fetch', '--input-path', self.output1,
-                '--name', 'mynote']
-        )
-        self.assertEqual(fetch_result.exit_code, 0)
-
-        list_result = self.runner.invoke(
-            tools,
-            ['annotation-list', '--input-path', self.output1]
-        )
-        self.assertEqual(list_result.exit_code, 0)
-
-        remove_result = self.runner.invoke(
-            tools,
-            ['annotation-remove', '--input-path', self.output1,
-                '--name', 'mynote', '--output-path', self.output1]
-        )
-        self.assertEqual(remove_result.exit_code, 0)
-
     # ANNOTATION_CREATE
     def test_annotation_create_with_text_success(self):
         create_result = self.runner.invoke(