oship-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 489
committer: Eduardo César edu@starforge>
branch nick: local
timestamp: Fri 2010-09-17 15:25:54 -0300
message:
  Fix Bug #632614. Added invariant and parent.
modified:
  src/oship/openehr/rm/composition/content/entry/__init__.py
  src/oship/openehr/rm/composition/content/entry/tests/instruction.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/composition/content/entry/__init__.py'
--- src/oship/openehr/rm/composition/content/entry/__init__.py	2010-08-06 21:24:11 +0000
+++ src/oship/openehr/rm/composition/content/entry/__init__.py	2010-09-17 18:25:54 +0000
@@ -130,12 +130,16 @@
 
     grok.implements(IInstructionDetails)
 
-    def __init__(self,inst,actid,wfd):
-        Pathable.__init__(self)
+    def __init__(self,inst,actid,wfd, parent=None):
+        Pathable.__init__(self, parent)
         self.instructionId=inst
         self.activityId=actid
         self.wfDetails=wfd
+        self.activityPathValid()
 
+    def activityPathValid(self):
+        if self.activityId != None and bool(self.activityId.isEmpty):
+            raise "activityId is not valid"
 
 
 class Instruction(CareEntry):

=== modified file 'src/oship/openehr/rm/composition/content/entry/tests/instruction.txt'
--- src/oship/openehr/rm/composition/content/entry/tests/instruction.txt	2010-08-06 21:24:11 +0000
+++ src/oship/openehr/rm/composition/content/entry/tests/instruction.txt	2010-09-17 18:25:54 +0000
@@ -1,6 +1,6 @@
 :Test-Layer: unit
 
->>> from oship.openehr.rm.composition.content.entry import Instruction,Activity
+>>> from oship.openehr.rm.composition.content.entry import Instruction,Activity, InstructionDetails
 >>> from oship.openehr.rm.composition.content.entry.interfaces import IInstruction
 >>> from oship.openehr.rm.support.identification import TerminologyId
 >>> from oship.openehr.rm.datatypes.text import CodePhrase,DvText
@@ -69,5 +69,5 @@
 True
 >>> isinstance(fullInstruction,Instruction)
 True
->>> 
+>>> insdetails= InstructionDetails(None, None, None)