Changeset 12262 for main/waeup.ikoba/trunk/src/waeup/ikoba

Timestamp:

19 Dec 2014, 08:24:55 (10 years ago)

Author:

Henrik Bettermann

Message:

Validate product id properly. Add tests.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba

Files:

• customers/tests/test_browser.py (modified) (2 diffs)
• products/interfaces.py (modified) (2 diffs)
• products/tests/test_browser.py (modified) (2 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py

@@ -44 +44 @@
 from waeup.ikoba.interfaces import (
     IUserAccount, IJobManager, APPROVED, SUBMITTED,
-    IFileStoreNameChooser, IExtFileStore, IFileStoreHandler)
+    IFileStoreNameChooser, IExtFileStore, IFileStoreHandler, NotIdValue)
 from waeup.ikoba.imagestorage import (
     FileStoreNameChooser, ExtFileStore, DefaultFileStoreHandler,
@@ -121 +121 @@
         self.document.title = u'My first document'
         self.document.document_id = u'DOC1'
+        self.assertRaises(
+            NotIdValue, setattr, self.document, 'document_id', u'id with spaces')
         self.customer['documents'].addDocument(self.document)
         self.contract = createObject('waeup.SampleContract')
         self.contract.title = u'My first contract'
         self.contract.contract_id = u'CON1'
+        self.assertRaises(
+            NotIdValue, setattr, self.contract, 'contract_id', u'id with spaces')
         self.customer['contracts'].addContract(self.contract)
 

main/waeup.ikoba/trunk/src/waeup/ikoba/products/interfaces.py

@@ -19 +19 @@
 from zope import schema
 from waeup.ikoba.interfaces import (
-    IIkobaObject,
+    IIkobaObject, validate_id,
     ContextualDictSourceFactoryBase)
 from waeup.ikoba.interfaces import MessageFactory as _
@@ -47 +47 @@
         default = u'NA',
         required = True,
+        constraint=validate_id,
         )
 

main/waeup.ikoba/trunk/src/waeup/ikoba/products/tests/test_browser.py

@@ -38 +38 @@
 from waeup.ikoba.testing import FunctionalLayer, FunctionalTestCase
 from waeup.ikoba.app import Company
-from waeup.ikoba.interfaces import IUserAccount, IJobManager, APPROVED
+from waeup.ikoba.interfaces import (
+    IUserAccount, IJobManager, APPROVED, NotIdValue)
 from waeup.ikoba.authentication import LocalRoleSetEvent
 from waeup.ikoba.tests.test_async import FunctionalAsyncTestCase
@@ -91 +92 @@
         self.product = createObject('waeup.Product')
         self.product.product_id = u'LIC'
+        self.assertRaises(
+            NotIdValue, setattr, self.product, 'product_id', u'id with spaces')
         self.product.title = u'Our License'
         self.app['products'].addProduct(self.product)