Changeset 6875

Timestamp:

12 Oct 2011, 19:28:49 (13 years ago)

Author:

Henrik Bettermann

Message:

Add StudentOnlinePayment? class (including factory) which also implements IStudentNavigation.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• payments/payment.py (modified) (2 diffs)
• payments/tests.py (modified) (2 diffs)
• students/payments.py (modified) (2 diffs)
• students/tests/test_payment.py (added)

main/waeup.sirp/trunk/src/waeup/sirp/payments/payment.py

@@ -20 +20 @@
 from datetime import datetime
 from grok import index
-from zope.component.interfaces import IFactory
-from zope.interface import implementedBy
 from waeup.sirp.payments.interfaces import (
     IPayment, ISCPayment, IOnlinePayment)
@@ -73 +71 @@
 
 OnlinePayment = attrs_to_fields(OnlinePayment)
-
-# Online payments must be importable. So we might need a factory.
-class OnlinePaymentFactory(grok.GlobalUtility):
-    """A factory for online payments.
-    """
-    grok.implements(IFactory)
-    grok.name(u'waeup.OnlinePayment')
-    title = u"Create a new online payment.",
-    description = u"This factory instantiates new online payment instances."
-
-    def __call__(self, *args, **kw):
-        return OnlinePayment()
-
-    def getInterfaces(self):
-        return implementedBy(OnlinePayment)

main/waeup.sirp/trunk/src/waeup/sirp/payments/tests.py

@@ -22 +22 @@
 from waeup.sirp.payments.container import PaymentsContainer
 from waeup.sirp.payments.payment import (
-    SCPayment, OnlinePayment, OnlinePaymentFactory)
+    SCPayment, OnlinePayment)
 from waeup.sirp.testing import (FunctionalLayer, FunctionalTestCase)
 
@@ -64 +64 @@
         self.assertRaises(
             NotImplementedError, container.clear)
-
-class OnlinePaymentFactoryTest(FunctionalTestCase):
-
-    layer = FunctionalLayer
-
-    def setUp(self):
-        super(OnlinePaymentFactoryTest, self).setUp()
-        self.factory = OnlinePaymentFactory()
-        return
-
-    def tearDown(self):
-        super(OnlinePaymentFactoryTest, self).tearDown()
-        return
-
-    def test_factory(self):
-        obj = self.factory()
-        assert isinstance(obj, OnlinePayment)
-
-    def test_getInterfaces(self):
-        implemented_by = self.factory.getInterfaces()
-        assert implemented_by.isOrExtends(IOnlinePayment)

main/waeup.sirp/trunk/src/waeup/sirp/students/payments.py

@@ -20 +20 @@
 from grok import index
 from zope.component.interfaces import IFactory
+from zope.interface import implementedBy
 from waeup.sirp.students.interfaces import IStudentPaymentsContainer, IStudentNavigation
-from waeup.sirp.payments import PaymentsContainer
+from waeup.sirp.payments import PaymentsContainer, OnlinePayment
+from waeup.sirp.payments.interfaces import IOnlinePayment
 from waeup.sirp.utils.helpers import attrs_to_fields
 
@@ -38 +40 @@
 
 StudentPaymentsContainer = attrs_to_fields(StudentPaymentsContainer)
+
+class StudentOnlinePayment(OnlinePayment):
+    """This is an online payment.
+    """
+    grok.implements(IOnlinePayment, IStudentNavigation)
+    grok.provides(IOnlinePayment)
+
+    def __init__(self):
+        super(StudentOnlinePayment, self).__init__()
+        p_id = None
+        return
+
+    def getStudent(self):
+        return self.__parent__.__parent__
+
+StudentOnlinePayment = attrs_to_fields(StudentOnlinePayment)
+
+# Student online payments must be importable. So we might need a factory.
+class StudentOnlinePaymentFactory(grok.GlobalUtility):
+    """A factory for student online payments.
+    """
+    grok.implements(IFactory)
+    grok.name(u'waeup.StudentOnlinePayment')
+    title = u"Create a new online payment.",
+    description = u"This factory instantiates new online payment instances."
+
+    def __call__(self, *args, **kw):
+        return StudentOnlinePayment()
+
+    def getInterfaces(self):
+        return implementedBy(StudentOnlinePayment)