Fixes issue where the additional next button's position was not consistent. Updates tests.

Author: MatthewHepburn

FSM/Source/fsm.js

@@ -862,9 +862,7 @@ var display = {
             buttonHTML += " " + checkButton.classList[i];
         }
         buttonHTML += "'>Next</a>";
-        var siblings = checkButton.parentNode.children;
-        var lastSibling = siblings[siblings.length - 1];
-        lastSibling.insertAdjacentHTML("afterend",buttonHTML);
+        checkButton.insertAdjacentHTML("afterend",buttonHTML);
 
     },
     linkLabelText:function(link){

FSM/Tests/acceptingStates1.py

@@ -17,7 +17,7 @@ def setUp(self):
 
     def test_accepting_states1(self):
         driver = self.driver
-        driver.get(self.base_url + "file:///home/matthew/Documents/Y4/CAL/FSM%20Prototype/Deploy/inf1/select-states-2-accepting-state.html")
+        driver.get(self.base_url + "file:///home/matthew/Documents/Y4/CAL/FSM/Deploy/inf1/select-states-2-accepting-state.html")
         driver.find_element_by_id("check-button").click()
         self.assertTrue(self.is_element_present(By.CSS_SELECTOR, "img.cross.x-check-button"))
         driver.find_element_by_id("1").click()

FSM/Tests/acceptingStates2.py

@@ -14,28 +14,28 @@ def setUp(self):
         self.base_url = " "
         self.verificationErrors = []
         self.accept_next_alert = True
-    
+
     def test_accepting_states2(self):
         driver = self.driver
-        driver.get(self.base_url + "file:///home/matthew/Documents/Y4/CAL/FSM%20Prototype/Deploy/inf1/give-list-1.html")
+        driver.get(self.base_url + "file:///home/matthew/Documents/Y4/CAL/FSM/Deploy/inf1/give-list-1.html")
         driver.find_element_by_id("qf0").clear()
         driver.find_element_by_id("qf0").send_keys("ab")
         driver.find_element_by_id("qf1").clear()
         driver.find_element_by_id("qf1").send_keys("aa")
         # ERROR: Caught exception [Error: locator strategy either id or name must be specified explicitly.]
         driver.find_element_by_id("check-button").click()
         # ERROR: Caught exception [Error: locator strategy either id or name must be specified explicitly.]
-    
+
     def is_element_present(self, how, what):
         try: self.driver.find_element(by=how, value=what)
         except NoSuchElementException as e: return False
         return True
-    
+
     def is_alert_present(self):
         try: self.driver.switch_to_alert()
         except NoAlertPresentException as e: return False
         return True
-    
+
     def close_alert_and_get_its_text(self):
         try:
             alert = self.driver.switch_to_alert()
@@ -46,7 +46,7 @@ def close_alert_and_get_its_text(self):
                 alert.dismiss()
             return alert_text
         finally: self.accept_next_alert = True
-    
+
     def tearDown(self):
         self.driver.quit()
         self.assertEqual([], self.verificationErrors)

FSM/Tests/demo1.py

@@ -17,7 +17,7 @@ def setUp(self):
 
     def test_demo1(self):
         driver = self.driver
-        driver.get(self.base_url + "file:///home/matthew/Documents/Y4/CAL/FSM%20Prototype/Deploy/inf1/demo1-intro-to-fsm.html")
+        driver.get(self.base_url + "file:///home/matthew/Documents/Y4/CAL/FSM/Deploy/inf1/demo1-intro-to-fsm.html")
         driver.find_element_by_id("demo-B").click()
         driver.find_element_by_id("demo-B").click()
         driver.find_element_by_id("demo-B").click()

FSM/Tests/give-list-2.py FSM/Tests/giveList2.pyFSM/Tests/give-list-2.py renamed to FSM/Tests/giveList2.py

@@ -14,10 +14,10 @@ def setUp(self):
         self.base_url = " "
         self.verificationErrors = []
         self.accept_next_alert = True
-    
+
     def test_give_list2(self):
         driver = self.driver
-        driver.get(self.base_url + "file:///home/matthew/Documents/Y4/CAL/FSM%20Prototype/Deploy/inf1/give-list-2.html")
+        driver.get(self.base_url + "file:///home/matthew/Documents/Y4/CAL/FSM/Deploy/inf1/give-list-2.html")
         driver.find_element_by_id("check-button").click()
         # ERROR: Caught exception [Error: locator strategy either id or name must be specified explicitly.]
         driver.find_element_by_id("1").click()
@@ -38,17 +38,17 @@ def test_give_list2(self):
         driver.find_element_by_id("check-button").click()
         # ERROR: Caught exception [Error: locator strategy either id or name must be specified explicitly.]
         # ERROR: Caught exception [Error: locator strategy either id or name must be specified explicitly.]
-    
+
     def is_element_present(self, how, what):
         try: self.driver.find_element(by=how, value=what)
         except NoSuchElementException as e: return False
         return True
-    
+
     def is_alert_present(self):
         try: self.driver.switch_to_alert()
         except NoAlertPresentException as e: return False
         return True
-    
+
     def close_alert_and_get_its_text(self):
         try:
             alert = self.driver.switch_to_alert()
@@ -59,7 +59,7 @@ def close_alert_and_get_its_text(self):
                 alert.dismiss()
             return alert_text
         finally: self.accept_next_alert = True
-    
+
     def tearDown(self):
         self.driver.quit()
         self.assertEqual([], self.verificationErrors)

FSM/Tests/introducingCycles.py

@@ -14,10 +14,10 @@ def setUp(self):
         self.base_url = " "
         self.verificationErrors = []
         self.accept_next_alert = True
-    
+
     def test_introducing_cycles(self):
         driver = self.driver
-        driver.get(self.base_url + "file:///home/matthew/Documents/Y4/CAL/FSM%20Prototype/Deploy/inf1/give-list-cycles.html")
+        driver.get(self.base_url + "file:///home/matthew/Documents/Y4/CAL/FSM/Deploy/inf1/give-list-cycles.html")
         driver.find_element_by_id("check-button").click()
         # ERROR: Caught exception [Error: locator strategy either id or name must be specified explicitly.]
         driver.find_element_by_id("qf1").clear()
@@ -26,17 +26,17 @@ def test_introducing_cycles(self):
         driver.find_element_by_id("qf2").send_keys("aaaaaabb")
         driver.find_element_by_id("check-button").click()
         # ERROR: Caught exception [Error: locator strategy either id or name must be specified explicitly.]
-    
+
     def is_element_present(self, how, what):
         try: self.driver.find_element(by=how, value=what)
         except NoSuchElementException as e: return False
         return True
-    
+
     def is_alert_present(self):
         try: self.driver.switch_to_alert()
         except NoAlertPresentException as e: return False
         return True
-    
+
     def close_alert_and_get_its_text(self):
         try:
             alert = self.driver.switch_to_alert()
@@ -47,7 +47,7 @@ def close_alert_and_get_its_text(self):
                 alert.dismiss()
             return alert_text
         finally: self.accept_next_alert = True
-    
+
     def tearDown(self):
         self.driver.quit()
         self.assertEqual([], self.verificationErrors)

FSM/Tests/introducingFSMs2.py

@@ -17,7 +17,7 @@ def setUp(self):
 
     def test_introducing_f_s_ms2(self):
         driver = self.driver
-        driver.get(self.base_url + "file:///home/matthew/Documents/Y4/CAL/FSM%20Prototype/Deploy/inf1/select-states-1.html")
+        driver.get(self.base_url + "file:///home/matthew/Documents/Y4/CAL/FSM/Deploy/inf1/select-states-1.html")
         driver.find_element_by_id("0").click()
         driver.find_element_by_id("23").click()
         driver.find_element_by_id("check-button").click()

FSM/runTests

@@ -0,0 +1,3 @@
+#!/bin/bash
+cd Tests
+python3 -m unittest acceptingStates1 acceptingStates2 demo1 giveList2 introducingCycles introducingFSMs2