oship-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 486
committer: Wagner Francisco Mezaroba <wagner@wagner-laptop>
branch nick: oship
timestamp: Sun 2010-09-12 18:06:42 -0300
message:
  Added Contribution invariant to the Version class. Added OriginalVersion test class to test this invariant. Bug #625975
added:
  src/oship/openehr/rm/common/change_control/tests/originalversion.py
modified:
  src/oship/openehr/rm/common/change_control/__init__.py
  src/oship/openehr/rm/common/change_control/tests/version.txt
  src/oship/openehr/rm/common/change_control/tests/versionedobject.txt


--
lp:oship
https://code.launchpad.net/~oship-dev/oship/devel

Your team OSHIP Development Team is subscribed to branch lp:oship.
To unsubscribe from this branch go to https://code.launchpad.net/~oship-dev/oship/devel/+edit-subscription

=== modified file 'src/oship/openehr/rm/common/change_control/__init__.py'
--- src/oship/openehr/rm/common/change_control/__init__.py	2010-09-12 20:19:13 +0000
+++ src/oship/openehr/rm/common/change_control/__init__.py	2010-09-12 21:06:42 +0000
@@ -29,6 +29,8 @@
     grok.implements(IVersion)
 
     def __init__(self, uid, preVid, data, lcstate, caudit, contribution, sig):
+        if contribution == None or contribution.type != 'CONTRIBUTION':
+            raise ValueError('Contribution must not be None and its type must be CONTRIBUTION')
         self.uid=uid
         self.precedingVersionId=preVid
         self.data=data

=== added file 'src/oship/openehr/rm/common/change_control/tests/originalversion.py'
--- src/oship/openehr/rm/common/change_control/tests/originalversion.py	1970-01-01 00:00:00 +0000
+++ src/oship/openehr/rm/common/change_control/tests/originalversion.py	2010-09-12 21:06:42 +0000
@@ -0,0 +1,40 @@
+"""
+Do a Python test on the app.
+
+:Test-Layer: python
+"""
+import unittest
+import grok
+
+from oship.openehr.rm.common.change_control import Version,OriginalVersion
+from oship.openehr.rm.common.change_control.interfaces import IVersion,IOriginalVersion
+from oship.openehr.rm.support.identification import ObjectVersionId,TerminologyId,ObjectRef,ObjectId
+from oship.openehr.rm.datatypes.text import DvCodedText,CodePhrase
+
+class OriginalVersionTest(unittest.TestCase):
+
+    def setUp(self):
+        self.uid = ObjectVersionId("87284370-2D4B-4e3d-A3F3-F303D2F4F34B::2::1")
+        self.data = u"Some data"
+        openEhrTerminologyId = TerminologyId(u"openehr")
+        versionCodePhrase = CodePhrase(openEhrTerminologyId,u"version lifecycle state")
+        self.lifecycleState = DvCodedText(versionCodePhrase,u"complete",None,None,None,None,None)
+        self.caudit=None
+        contributionId=ObjectId(u'1')
+        self.contribution=ObjectRef(contributionId,u'local',u'CONTRIBUTION')
+        self.invalidContribution=ObjectRef(contributionId, u'local', u'INVALID TYPE')
+
+#        version = OriginalVersion(uid,None,None,data,None,lifecycleState,caudit,contribution,None)
+#        version.ownerId().value
+#        version.isBranch()
+#        pass
+
+    def tearDown(self):
+        pass
+
+    def testInitializerWithNullContribution(self):
+        self.assertRaises(ValueError, OriginalVersion, self.uid,None,None,self.data,None,self.lifecycleState,self.caudit,None,None)
+
+    def testInitializarWithInvalidContributionType(self):
+        self.assertRaises(ValueError, OriginalVersion, self.uid,None,None,self.data,None,self.lifecycleState,self.caudit,self.invalidContribution,None)       
+

=== modified file 'src/oship/openehr/rm/common/change_control/tests/version.txt'
--- src/oship/openehr/rm/common/change_control/tests/version.txt	2010-08-06 21:24:11 +0000
+++ src/oship/openehr/rm/common/change_control/tests/version.txt	2010-09-12 21:06:42 +0000
@@ -2,7 +2,7 @@
 
 >>> from oship.openehr.rm.common.change_control import Version,OriginalVersion
 >>> from oship.openehr.rm.common.change_control.interfaces import IVersion,IOriginalVersion
->>> from oship.openehr.rm.support.identification import ObjectVersionId,TerminologyId
+>>> from oship.openehr.rm.support.identification import ObjectVersionId,TerminologyId,ObjectRef,ObjectId
 >>> from oship.openehr.rm.datatypes.text import DvCodedText,CodePhrase
 >>> uid = ObjectVersionId("87284370-2D4B-4e3d-A3F3-F303D2F4F34B::2::1")
 >>> data = u"Some data"
@@ -10,7 +10,8 @@
 >>> versionCodePhrase = CodePhrase(openEhrTerminologyId,u"version lifecycle state")
 >>> lifecycleState = DvCodedText(versionCodePhrase,u"complete",None,None,None,None,None)
 >>> caudit=None
->>> contribution=None
+>>> contributionId=ObjectId(u'1')
+>>> contribution=ObjectRef(contributionId,u'local',u'CONTRIBUTION')
 >>> version = OriginalVersion(uid,None,None,data,None,lifecycleState,caudit,contribution,None)
 >>> version.ownerId().value
 u'87284370-2D4B-4e3d-A3F3-F303D2F4F34B'

=== modified file 'src/oship/openehr/rm/common/change_control/tests/versionedobject.txt'
--- src/oship/openehr/rm/common/change_control/tests/versionedobject.txt	2010-08-06 21:24:11 +0000
+++ src/oship/openehr/rm/common/change_control/tests/versionedobject.txt	2010-09-12 21:06:42 +0000
@@ -2,7 +2,7 @@
 
 >>> from oship.openehr.rm.common.change_control import Version,OriginalVersion, VersionedObject
 >>> from oship.openehr.rm.common.change_control.interfaces import IVersion,IOriginalVersion
->>> from oship.openehr.rm.support.identification import ObjectVersionId,TerminologyId
+>>> from oship.openehr.rm.support.identification import ObjectVersionId,TerminologyId, ObjectRef, ObjectId
 >>> from oship.openehr.rm.datatypes.text import DvCodedText,CodePhrase
 >>> uid = ObjectVersionId("87284370-2D4B-4e3d-A3F3-F303D2F4F34B::2::1")
 >>> data = u"Some data"
@@ -10,7 +10,8 @@
 >>> versionCodePhrase = CodePhrase(openEhrTerminologyId,u"version lifecycle state")
 >>> lifecycleState = DvCodedText(versionCodePhrase,u"complete",None,None,None,None,None)
 >>> caudit=None
->>> contribution=None
+>>> contributionId=ObjectId(u'1')
+>>> contribution=ObjectRef(contributionId,u'local',u'CONTRIBUTION')
 >>> versionedObject = VersionedObject(None,None,None)
 >>> versionedObject.versionCount()
 0