From 2badf757282eed92a8e1ebcebd9434d3726c1c06 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Mon, 30 Mar 2015 21:08:16 +0300 Subject: src/server-tests: misc --- src/server-tests/test_neo4j_cypher.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/server-tests/test_neo4j_cypher.py') diff --git a/src/server-tests/test_neo4j_cypher.py b/src/server-tests/test_neo4j_cypher.py index c63cc618..3bab58d6 100644 --- a/src/server-tests/test_neo4j_cypher.py +++ b/src/server-tests/test_neo4j_cypher.py @@ -5,15 +5,14 @@ from db_op import DBO_rz_clone, DBO_add_node_set, DBO_add_link_set, \ DBO_rm_node_set, DB_composed_op import test_util from model.graph import Attr_Diff, Topo_Diff -from test_util import generate_random_node_dict, generate_random_link_dict +from test_util import generate_random_node_dict, generate_random_link_dict,\ + generate_random_RZDoc import neo4j_test_util from neo4j_util import meta_attr_list_to_meta_attr_map -import logging from rz_server import Config, init_log -import re -from neo4j_cypher import Cypher_Parser, DB_Query, QT_Node_Filter__Doc_ID_Label -import neo4j_cypher +from neo4j_cypher import Cypher_Parser, DB_Query, QT_RZDOC_NS_Filter import sys +from model.model import RZDoc class Test_DB_Op(unittest.TestCase): @@ -131,7 +130,7 @@ class Test_DB_Op(unittest.TestCase): dbq_set = [dbq] #dbq_set = dbq_set[:1] - self.test_T__common(dbq_set, QT_Node_Filter__Doc_ID_Label, test_label) + self.test_T__common(dbq_set, QT_RZDOC_NS_Filter, test_rzdoc) def test_T__common(self, dbq_set, T, *args): self.log.debug('\n') -- cgit v1.3.1