SESPRINGPYTHONPY-134: Backported AopProxy fix and test cases to 1.1.x

Greg Turnquist · Greg Turnquist · commit 84038a990877 · 2010-05-20T10:07:05.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+*.pyc
+target/
+.DS_Store
diff --git a/src/springpython/aop/__init__.py b/src/springpython/aop/__init__.py
@@ -167,8 +167,6 @@ class AopProxy(object):
     lookups are not intercepted, but instead fetched from the actual target object."""
 
     def __init__(self, target, interceptors):
-        if type(target).__name__ != "instance":
-            raise Exception("Target attribute must be an instance.")
         self.target = target
         if type(interceptors) == list:
             self.interceptors = interceptors
diff --git a/test/springpythontest/.gitignore b/test/springpythontest/.gitignore
@@ -0,0 +1 @@
+springpython.db
diff --git a/test/springpythontest/aopTestCases.py b/test/springpythontest/aopTestCases.py
@@ -25,7 +25,7 @@
 from springpython.context import ApplicationContext
 from springpython.remoting.pyro import PyroDaemonHolder
 from springpythontest.support.testSupportClasses import BeforeAndAfterInterceptor
-from springpythontest.support.testSupportClasses import SampleService
+from springpythontest.support.testSupportClasses import SampleService, NewStyleSampleService
 from springpythontest.support.testSupportClasses import WrappingInterceptor
 
 class AopInterfaceTestCase(unittest.TestCase):
@@ -56,6 +56,15 @@ def testCreatingAProxyFactoryAndAddingAnInterceptorProgrammatically(self):
         self.assertEquals("<Wrapped>You made it! => test</Wrapped>", service.method("test"))
         self.assertEquals("sample", service.attribute)
 
+    def testCreatingAopProxyFactoryAndAddingInterceptorToNewStyleClassProgammatically(self):
+        factory = ProxyFactory()
+        factory.target = NewStyleSampleService()
+        factory.interceptors.append(WrappingInterceptor())
+        service = factory.getProxy()
+        self.assertEquals("<Wrapped>Even better!</Wrapped>", service.doSomething())
+        self.assertEquals("<Wrapped>You made it to a new style class! => test</Wrapped>", service.method("test"))
+        self.assertEquals("new_sample", service.attribute)
+
     def testCreatingAProxyFactoryAndAddingAnInterceptorIoC(self):
         factory = self.appContext.get_object("factory")
         service = factory.getProxy()
diff --git a/test/springpythontest/support/testSupportClasses.py b/test/springpythontest/support/testSupportClasses.py
@@ -149,6 +149,16 @@ def doSomething(self):
     def __str__(self):
         return "This is a sample service."
 
+class NewStyleSampleService(object):
+    def __init__(self):
+        self.attribute = "new_sample"
+    def method(self, data):
+        return "You made it to a new style class! => %s" % data
+    def doSomething(self):
+        return "Even better!"
+    def __str__(self):
+        return "This is a new style sample service."
+
 class RemoteService1(object):
     def getData(self, param):
         return "You got remote data => %s" % param
