Rewrite old refactoring tests a bit to reuse them

test/refactor/extract.py

@@ -1,31 +1,31 @@
-# --- simple
+# -------------------------------------------------- simple-1
 def test():
-    #? 35 a
+    #? 35 {'new_name': 'a'}
     return test(100, (30 + b, c) + 1)
 
-# +++
+# ++++++++++++++++++++++++++++++++++++++++++++++++++
 def test():
     a = (30 + b, c) + 1
     return test(100, a)
 
 
-# --- simple #2
+# -------------------------------------------------- simple-2
 def test():
-    #? 25 a
+    #? 25 {'new_name': 'a'}
     return test(100, (30 + b, c) + 1)
 
-# +++
+# ++++++++++++++++++++++++++++++++++++++++++++++++++
 def test():
     a = 30 + b
     return test(100, (a, c) + 1)
 
 
-# --- multiline
+# -------------------------------------------------- multiline-1
 def test():
-    #? 30 x
+    #? 30 {'new_name': 'a'}
     return test(1, (30 + b, c) 
                             + 1)
-# +++
+# ++++++++++++++++++++++++++++++++++++++++++++++++++
 def test():
     x = ((30 + b, c) 
                             + 1)
@@ -33,12 +33,12 @@ def test():
 )
 
 
-# --- multiline #2
+# -------------------------------------------------- multiline-2
 def test():
-    #? 25 x
+    #? 25 {'new_name': 'a'}
     return test(1, (30 + b, c) 
                             + 1)
-# +++
+# ++++++++++++++++++++++++++++++++++++++++++++++++++
 def test():
     x = 30 + b
     return test(1, (x, c)