Merge pull request #332 from climbus/master

create_generate with goal_resource param

rope/contrib/generate.py

@@ -5,15 +5,15 @@
 from rope.refactor import sourceutils, importutils, functionutils, suites
 
 
-def create_generate(kind, project, resource, offset):
+def create_generate(kind, project, resource, offset, goal_resource=None):
     """A factory for creating `Generate` objects
 
     `kind` can be 'variable', 'function', 'class', 'module' or
     'package'.
 
     """
     generate = eval('Generate' + kind.title())
-    return generate(project, resource, offset)
+    return generate(project, resource, offset, goal_resource=goal_resource)
 
 
 def create_module(project, name, sourcefolder=None):

ropetest/contrib/generatetest.py

@@ -284,6 +284,32 @@ def test_generating_function_in_a_suite_in_a_function(self):
             '    if 1:\n        g()\n',
             self.mod.read())
 
+    def test_create_generate_class_with_goal_resource(self):
+        code = 'c = C()\n'
+        self.mod.write(code)
+
+        result = generate.create_generate(
+            "class",
+            self.project,
+            self.mod,
+            code.index("C"),
+            goal_resource=self.mod2)
+
+        self.assertTrue(isinstance(result, generate.GenerateClass))
+        self.assertEqual(result.goal_resource, self.mod2)
+
+    def test_create_generate_class_without_goal_resource(self):
+        code = 'c = C()\n'
+        self.mod.write(code)
+
+        result = generate.create_generate(
+            "class",
+            self.project,
+            self.mod,
+            code.index("C"))
+
+        self.assertTrue(isinstance(result, generate.GenerateClass))
+        self.assertIsNone(result.goal_resource)
 
 if __name__ == '__main__':
     unittest.main()