oship-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 499
committer: Wagner Francisco Mezaroba <wagner@wagner-laptop>
branch nick: oship
timestamp: Tue 2010-09-28 21:55:16 -0300
message:
  Added some invariants in the OriginalVersion class and added tests for it. Bug 625976 
modified:
  src/oship/openehr/rm/common/change_control/__init__.py
  src/oship/openehr/rm/common/change_control/interfaces.py
  src/oship/openehr/rm/common/change_control/tests/originalversion.py


--
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-27 13:13:22 +0000
+++ src/oship/openehr/rm/common/change_control/__init__.py	2010-09-29 00:55:16 +0000
@@ -69,6 +69,10 @@
 
     def __init__(self, uid, previd,otherInputVersionUids,data,attestations,lifecycleState,caudit,contribution,sig):
         Version.__init__(self,uid,previd,data,lifecycleState,caudit,contribution,sig)
+        if attestations is not None and (len(attestations) == 0):
+            raise ValueError(u'Attestations must not be empty')
+        if otherInputVersionUids is not None and (len(otherInputVersionUids) == 0):
+            raise ValueError(u'otherInputVersionUids must not be empty')
         self.otherInputVersionUids=otherInputVersionUids
         self.attestations=attestations
 

=== modified file 'src/oship/openehr/rm/common/change_control/interfaces.py'
--- src/oship/openehr/rm/common/change_control/interfaces.py	2010-08-06 21:24:11 +0000
+++ src/oship/openehr/rm/common/change_control/interfaces.py	2010-09-29 00:55:16 +0000
@@ -126,18 +126,6 @@
     A Version containing locally created content and optional attestations.
     """
 
-    uid=Object(
-        schema=IObjectVersionId,
-        title=_(u"UID"),
-        description=_(u"""Stored version of inheritence precursor."""),
-        required=True)
-
-    precedingVersionUid=Object(
-        schema=IObjectVersionId,
-        title=_(u"Preceding Version UID"),
-        description=_(u"""Stored version of inheritence precursor."""),
-        required=True)
-
     otherInputVersionUids=Set(
             value_type=Object(schema=IObjectVersionId),
             title=_(u"Other Input Version Uids"),

=== modified file 'src/oship/openehr/rm/common/change_control/tests/originalversion.py'
--- src/oship/openehr/rm/common/change_control/tests/originalversion.py	2010-09-12 22:02:27 +0000
+++ src/oship/openehr/rm/common/change_control/tests/originalversion.py	2010-09-29 00:55:16 +0000
@@ -29,26 +29,32 @@
     def tearDown(self):
         pass
 
-    def testInitializerWithNullContribution(self):
+    def testShouldNotInitializeWithNullContribution(self):
         self.assertRaises(ValueError, OriginalVersion, self.initialVersionId,None,None,self.data,None,self.lifecycleState,self.caudit,None,None)
 
-    def testInitializerWithInvalidContributionType(self):
+    def testShouldNotInitializeWithInvalidContributionType(self):
         self.assertRaises(ValueError, OriginalVersion, self.initialVersionId,None,None,self.data,None,self.lifecycleState,self.caudit,self.invalidContribution,None)       
 
-    def testInitializerWithInitialVersionUidAndPrecedingVersionUid(self):
-       self.assertRaises(ValueError, OriginalVersion, self.initialVersionId, self.secondVersionId, None, self.data,None, self.lifecycleState,self.caudit,self.contribution,None)       
-
-    def testInitializerWithInitialVersionUidAndNullPrecedingVersionUid(self):
+    def testShouldNotInitializeWithInitialVersionUidAndPrecedingVersionUid(self):
+       self.assertRaises(ValueError, OriginalVersion, self.initialVersionId, self.secondVersionId, None, self.data,None, self.lifecycleState,self.caudit,self.contribution,None)      
+    def testShouldInitializeWithInitialVersionUidAndNullPrecedingVersionUid(self):
         originalVersion = OriginalVersion(self.initialVersionId, None, None, self.data,None, self.lifecycleState,self.caudit,self.contribution,None)
         self.assertEquals(self.initialVersionId, originalVersion.uid)
         self.assertEquals(None, originalVersion.precedingVersionId)                   
 
-    def testInitializerWithNotInitialVersionUidAndPrecedingVersionUid(self):
+    def testShouldInitializeWithNotInitialVersionUidAndPrecedingVersionUid(self):
         originalVersion = OriginalVersion(self.secondVersionId, self.thirdVersionId, None, self.data,None, self.lifecycleState,self.caudit,self.contribution,None)       
         self.assertEquals(self.secondVersionId, originalVersion.uid)
         self.assertEquals(self.thirdVersionId, originalVersion.precedingVersionId)
 
-    def testInitializerWithNotInitialVersionUidAndNullPrecedingVersionUid(self):
+    def testShouldNotInitializeWithNotInitialVersionUidAndNullPrecedingVersionUid(self):
         self.assertRaises(ValueError, OriginalVersion, self.secondVersionId, None, None, self.data,None, self.lifecycleState,self.caudit,self.contribution,None)       
 
+    def testShouldNotInitializeWithEmptyAttestationsList(self):
+        emptyList = []
+        self.assertRaises(ValueError, OriginalVersion, self.initialVersionId, None, None, self.data, emptyList, self.lifecycleState,self.caudit,self.contribution,None) 
+
+    def testShouldNotInitializeWithEmtpyOtherInputVersionUidsList(self):
+        emptyList = []
+        self.assertRaises(ValueError, OriginalVersion, self.initialVersionId, None, emptyList, self.data, None, self.lifecycleState,self.caudit,self.contribution,None)