Simplified functions correspondiong to one of the scenarios

Author: RagnarW

test/tck/steps/bolt_type_steps.py

@@ -251,7 +251,7 @@ def step_impl(context):
 @then('result should be node "(?P<n1>.+)" node "(?P<n2>.+)" and int "(?P<len>\d+)"')
 def step_impl(context, n1, n2, len):
     result = context.results["as_string"]
-    given = tck_util.single_result_to_values(result)
+    given = tck_util.result_to_set(result)
     expected = tck_util.node_node_int_to_values(n1, n2, len)
     if given != expected:
         raise Exception("Mixed response does not match given: %s expected: %s" % (given, expected))

test/tck/tck_util.py

@@ -289,22 +289,11 @@ def text_string_to_set(table):
     return result_to_set(table)
 
 
-def single_result_to_values(result):
-    l = []
-
-    for val in result[0].values():
-        if not isinstance(val,list):
-            val = [val]
-        val = [Value(v) for v in val]
-        l.append(tuple(val))
-    return tuple(l)
-
-
 def node_node_int_to_values(n1, n2, len):
-    n1 = tuple([Value(get_node(n1)[0])])
-    n2 = tuple([Value(get_node(n2)[0])])
-    len = tuple([Value(int(len))])
-    return tuple([n1,n2,len])
+    n1 = Value(get_node(n1)[0])
+    n2 = Value(get_node(n2)[0])
+    len = Value(int(len))
+    return {n1, n2, len}
 
 
 class Value: