Add delete

Author: FreeYourSoul

CHANGELOG.md

@@ -26,7 +26,7 @@
 
 ## Feature todo
 
-* Delete node 
+* ~~Delete node~~ 
 
 ## Testing todo
 

freexgraph/freexgraph.py

@@ -20,7 +20,7 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-
+from copy import copy
 from typing import Optional, Union, Set, List, Any
 
 import networkx as nx
@@ -240,11 +240,10 @@ def remove_node(self, node_id: str) -> None:
         """Remove the provided node and all its successors
         :param node_id: node to remove
         """
-        assert self._graph.has_node(
-            node_id
-        ), f"{node_id} has to be in the execution graph to be removed"
-        self._graph.remove_nodes_from(self._graph.successors(node_id))
-        self._graph.remove_node(node_id)
+        if self._graph.has_node(node_id):
+            for n in copy(self._graph.successors(node_id)):
+                self.remove_node(n)
+            self._graph.remove_node(node_id)
 
     @property
     def root(self) -> FreExNode:

test/basic_freexgraph_test.py

@@ -281,7 +281,7 @@ def test_delete_one_node(visitor_test):
     execution_graph.add_node(NodeForTest(ida))
     execution_graph.add_node(NodeForTest(idb, parents={ida}))
     execution_graph.add_node(NodeForTest(idd, parents={idb}))
-    execution_graph.add_node(NodeForTest(idx, parents={idb}))
+    execution_graph.add_node(NodeForTest(idx, parents={idb, idd}))
     execution_graph.add_node(NodeForTest(idc, parents={idd}))
     execution_graph.add_node(NodeForTest(ide, parents={idd, idx}))
 
@@ -307,7 +307,7 @@ def test_delete_one_node(visitor_test):
     assert idx == visitor_test.visited[4]
 
 
-def test_delete_node_with_childs(valid_complex_graph):
+def test_delete_node_with_childs(visitor_test):
     #
     #                ida
     #                 |
@@ -330,9 +330,18 @@ def test_delete_node_with_childs(valid_complex_graph):
     execution_graph.add_node(NodeForTest(ida))
     execution_graph.add_node(NodeForTest(idb, parents={ida}))
     execution_graph.add_node(NodeForTest(idd, parents={idb}))
-    execution_graph.add_node(NodeForTest(idx, parents={idb}))
+    execution_graph.add_node(NodeForTest(idx, parents={idb, idd}))
     execution_graph.add_node(NodeForTest(idc, parents={idd}))
     execution_graph.add_node(NodeForTest(ide, parents={idd, idx}))
 
-    # should remove idc and ide
-    # execution_graph.remove_node(idd)
+    # should remove idc, ide and idx
+    execution_graph.remove_node(idd)
+
+    visitor_test.visit(execution_graph.root)
+
+    assert len(visitor_test.visited) == 2
+
+    assert ide not in visitor_test.visited
+
+    assert ida == visitor_test.visited[0]
+    assert idb == visitor_test.visited[1]