diff --git a/plugins/com.python.pydev.refactoring/tests/com/python/pydev/refactoring/tdd/PyCreateClassTest.java b/plugins/com.python.pydev.refactoring/tests/com/python/pydev/refactoring/tdd/PyCreateClassTest.java index 82fbbfd9b1..6e5b6ca8df 100644 --- a/plugins/com.python.pydev.refactoring/tests/com/python/pydev/refactoring/tdd/PyCreateClassTest.java +++ b/plugins/com.python.pydev.refactoring/tests/com/python/pydev/refactoring/tdd/PyCreateClassTest.java @@ -72,8 +72,8 @@ public void testPyCreateClassInSameModule() throws Exception { ExecutePyCreate.execute(pyCreateClass, info, PyCreateClass.LOCATION_STRATEGY_BEFORE_CURRENT); assertContentsEqual("" + - "class MyClass(${object}):\n" + - " ${pass}${cursor}\n" + + "class MyClass(object):\n" + + " pass\n" + "\n" + "\n" + "MyClass()" @@ -108,8 +108,8 @@ public void testPyCreateClassInSameModule4() throws Exception { " pass\n" + "\n" + "\n" + - "class MyClass(${object}):\n" + - " ${pass}${cursor}\n" + + "class MyClass(object):\n" + + " pass\n" + "\n" + "\n" + @@ -146,9 +146,9 @@ public void testPyCreateClassInSameModule5() throws Exception { " pass\n" + "\n" + "\n" + - "class MyClass(${object}):\n" + "class MyClass(object):\n" + - " ${pass}${cursor}\n" + + " pass\n" + "\n" + "\n" + "MyClass()" + @@ -176,8 +176,8 @@ public void testPyCreateClassInSameModule6() throws Exception { "a = 10\n" + "\n" + "\n" + - "class MyClass(${object}):\n" + - " ${pass}${cursor}\n" + "class MyClass(object):\n" + + " pass\n" + "\n" + "\n" + @@ -201,11 +201,11 @@ public void testPyCreateClassWithParameters() throws Exception { ExecutePyCreate.execute(pyCreateClass, info, PyCreateClass.LOCATION_STRATEGY_BEFORE_CURRENT); assertContentsEqual("" + - "class MyClass(${object}):\n" + + "class MyClass(object):\n" + " \n" + - " def __init__(self, ${aa}, ${bb}, ${param2}):\n" + - " ${pass}${cursor}\n" + + " def __init__(self, aa, bb, param2):\n" + + " pass\n" + "\n" + "\n" + @@ -224,11 +224,11 @@ public void testPyCreateClassWithParameters2() throws Exception { ExecutePyCreate.execute(pyCreateClass, info, PyCreateClass.LOCATION_STRATEGY_BEFORE_CURRENT); assertContentsEqual("" + - "class MyClass(${object}):\n" + + "class MyClass(object):\n" + " \n" + - " def __init__(self, ${aa}, ${bb}, ${my_foo}):\n" + - " ${pass}${cursor}\n" + + " def __init__(self, aa, bb, my_foo):\n" + + " pass\n" + "\n" + "\n" + @@ -255,8 +255,8 @@ public void testPyCreateClassInSameModule2() throws Exception { assertContentsEqual("" + "import foo\n" + "\n" + - "class MyClass(${object}):\n" + - " ${pass}${cursor}\n" + "class MyClass(object):\n" + + " pass\n" + "\n" + "\n" + @@ -292,8 +292,8 @@ public void testPyCreateClassInSameModule3() throws Exception { "\n" + "\n" + - "class MyClass(${object}):\n" + - " ${pass}${cursor}\n" + + "class MyClass(object):\n" + + " pass\n" + "\n" + "\n" + "class Bar(object):\n" @@ -334,8 +334,8 @@ public void testPyCreateClassEndOfFile() throws Exception { "\n" + "\n" + - "class MyClass(${object}):\n" + - " ${pass}${cursor}\n" + + "class MyClass(object):\n" + + " pass\n" + "\n" + "\n", document.get()); } @@ -351,8 +351,8 @@ public void testPyCreateClassEndOfFile2() throws Exception { document); assertContentsEqual("" + - "class Foo(${object}):\n" + - " ${pass}${cursor}\n" + + "class Foo(object):\n" + + " pass\n" + "\n" + "\n", document.get()); }