Simplified the test_task_structure() test.

jhradilek · Nov 21, 2024 · c133ea8 · c133ea8
1 parent 6c40e08
commit c133ea8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/test/test_convert_to_task.py b/test/test_convert_to_task.py
@@ -42,8 +42,7 @@ def test_task_structure(self):
             <body>
                 <p>Topic introduction</p>
                 <ol>
-                    <li>First step</li>
-                    <li>Second step</li>
+                    <li>Task step</li>
                 </ol>
                 <p>Topic summary</p>
             </body>
@@ -61,6 +60,5 @@ def test_task_structure(self):
         self.assertTrue(task.xpath('boolean(/task/title[text()="Topic title"])'))
         self.assertTrue(task.xpath('boolean(/task/taskbody)'))
         self.assertTrue(task.xpath('boolean(/task/taskbody/context/p[text()="Topic introduction"])'))
-        self.assertTrue(task.xpath('boolean(/task/taskbody/steps/step[1]/cmd[text()="First step"])'))
-        self.assertTrue(task.xpath('boolean(/task/taskbody/steps/step[2]/cmd[text()="Second step"])'))
+        self.assertTrue(task.xpath('boolean(/task/taskbody/steps/step/cmd[text()="Task step"])'))
         self.assertTrue(task.xpath('boolean(/task/taskbody/result/p[text()="Topic summary"])'))
diff --git a/test/test_convert_to_task_generated.py b/test/test_convert_to_task_generated.py
@@ -43,22 +43,19 @@ def test_task_structure(self):
                 <p>Topic introduction</p>
                 <p outputclass="title"><b>Prerequisites</b></p>
                 <ul>
-                    <li>First prerequisite</li>
-                    <li>Second prerequisite</li>
+                    <li>Task prerequisite</li>
                 </ul>
                 <p outputclass="title"><b>Procedure</b></p>
                 <ol>
-                    <li>First step</li>
-                    <li>Second step</li>
+                    <li>Task step</li>
                 </ol>
                 <p outputclass="title"><b>Verification</b></p>
                 <ul>
                     <li>Verification step</li>
                 </ul>
                 <p outputclass="title"><b>Troubleshooting</b></p>
                 <ol>
-                    <li>First troubleshooting step</li>
-                    <li>Second troubleshooting step</li>
+                    <li>Troubleshooting step</li>
                 </ol>
                 <p outputclass="title"><b>Next steps</b></p>
                 <ul>
@@ -78,12 +75,9 @@ def test_task_structure(self):
         self.assertTrue(task.xpath('boolean(/task[@id="example-topic"])'))
         self.assertTrue(task.xpath('boolean(/task/title[text()="Topic title"])'))
         self.assertTrue(task.xpath('boolean(/task/taskbody)'))
-        self.assertTrue(task.xpath('boolean(/task/taskbody/prereq/ul/li[1][text()="First prerequisite"])'))
-        self.assertTrue(task.xpath('boolean(/task/taskbody/prereq/ul/li[2][text()="Second prerequisite"])'))
+        self.assertTrue(task.xpath('boolean(/task/taskbody/prereq/ul/li[text()="Task prerequisite"])'))
         self.assertTrue(task.xpath('boolean(/task/taskbody/context/p[text()="Topic introduction"])'))
-        self.assertTrue(task.xpath('boolean(/task/taskbody/steps/step[1]/cmd[text()="First step"])'))
-        self.assertTrue(task.xpath('boolean(/task/taskbody/steps/step[2]/cmd[text()="Second step"])'))
-        self.assertTrue(task.xpath('boolean(/task/taskbody/result/ul/li[1][text()="Verification step"])'))
-        self.assertTrue(task.xpath('boolean(/task/taskbody/tasktroubleshooting/ol/li[1][text()="First troubleshooting step"])'))
-        self.assertTrue(task.xpath('boolean(/task/taskbody/tasktroubleshooting/ol/li[2][text()="Second troubleshooting step"])'))
-        self.assertTrue(task.xpath('boolean(/task/taskbody/postreq/ul/li[1][text()="Next step"])'))
+        self.assertTrue(task.xpath('boolean(/task/taskbody/steps/step/cmd[text()="Task step"])'))
+        self.assertTrue(task.xpath('boolean(/task/taskbody/result/ul/li[text()="Verification step"])'))
+        self.assertTrue(task.xpath('boolean(/task/taskbody/tasktroubleshooting/ol/li[text()="Troubleshooting step"])'))
+        self.assertTrue(task.xpath('boolean(/task/taskbody/postreq/ul/li[text()="Next step"])'))