flush_db: dedicated DBO class, cleanup

3 files changed, 17 insertions, 26 deletions

diff --git a/src/server-tests/neo4j_test_util.py b/src/server-tests/neo4j_test_util.py
index 8f63a1a5..7755032d 100644
--- a/src/server-tests/neo4j_test_util.py
+++ b/src/server-tests/neo4j_test_util.py
@@ -3,8 +3,18 @@ import random
 import string
 import uuid
 
-from db_op import DB_op
+from db_op import DB_op, DBO_cypher_query
 
+class DBO_flush_db(DBO_cypher_query):
+    """
+    complete DB flush: remove all nodes & links
+    """
+    def __init__(self):
+        q_arr = ['match (n)',
+                 'optional match (n)-[r]-()',
+                 'delete n,r'
+                ]
+        super(DBO_flush_db, self).__init__(q_arr)
 
 class DBO_random_data_generation(DB_op):
 
@@ -56,18 +66,3 @@ def rand_label(prefix='T_', length=8):
     ret = ''.join([choice(string.ascii_lowercase)] + [choice(char_set) for _ in range(length - 1)])
     ret = prefix + ret
     return ret
-
-def flush_db(db_ctl):
-    """
-    complete DB flush: remove all nodes & links
-    """
-    db_ctl.exec_cypher_query('match (n) optional match (n)-[r]-() delete n,r')
-
-
-
-    q = ' '.join(q_arr)
-    op = DBO_cypher_query(q)
-    db_ctl.exec_op(op)
-
-    return (n_label, r_label)
-
diff --git a/src/server-tests/test_db_controller.py b/src/server-tests/test_db_controller.py
index 987abedb..d07bd2cc 100644
--- a/src/server-tests/test_db_controller.py
+++ b/src/server-tests/test_db_controller.py
@@ -19,8 +19,7 @@ from db_op import DBO_rz_clone
 from model.graph import Attr_Diff
 from model.graph import Topo_Diff
 from model.model import Link
-from neo4j_test_util import DBO_random_data_generation
-from neo4j_test_util import flush_db
+from neo4j_test_util import DBO_random_data_generation, DBO_flush_db
 import neo4j_test_util
 from neo4j_util import Neo4JException, DB_Query
 from neo4j_util import meta_attr_list_to_meta_attr_map
@@ -55,7 +54,10 @@ class TestDBController(unittest.TestCase):
         self.log.addHandler(logging.StreamHandler())
 
     def setUp(self):
-        # flush_db(self.db_ctl)  # remove once embedded DB test mode is supported
+        # flush_DB
+        # op = DBO_flush_db()
+        # self.db_ctl.exec_op(op)
+
         # self.db_ctl.exec_op(DBO_add_node_set(self.n_map))
         # self.db_ctl.exec_op(DBO_add_link_set(self.l_map))
         pass
diff --git a/src/server-tests/test_rhizi_api.py b/src/server-tests/test_rhizi_api.py
index 0de29e5b..1a58ef96 100644
--- a/src/server-tests/test_rhizi_api.py
+++ b/src/server-tests/test_rhizi_api.py
@@ -14,7 +14,7 @@ from db_controller import DB_Driver_Embedded
 class TestRhiziAPI(unittest.TestCase):
 
     def setUp(self):
-        self.flush_db()
+        pass
 
     @classmethod
     def setUpClass(self):
@@ -28,12 +28,6 @@ class TestRhiziAPI(unittest.TestCase):
         log_handler_c = logging.StreamHandler()
         log.addHandler(log_handler_c)
 
-    def flush_db(self):
-        """
-        complete DB flush: remove all nodes & links
-        """
-        self.db_ctl.exec_cypher_query('match (n) optional match (n)-[r]-() delete n,r')
-
     def test_add_node_set(self):
         """
         add node set test