Changeset 387

Show
Ignore:
Timestamp:
09/02/08 01:37:52 (4 months ago)
Author:
johnbywater
Message:

Refactored timepoint usage.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/dm/dom/temporal.py

    r380 r387  
    1717 
    1818    def getCreateTime(self): 
    19         return self.timepoint.now() 
     19        return self.timepoint.recorded 
    2020 
    2121    def getFindTime(self): 
    …… 
    4444    """Register for simple history of values.""" 
    4545 
    46     def getCreateTime(self): 
    47         return self.timepoint.recorded 
    48  
    49     def getFindTime(self): 
    50         return self.timepoint.recorded 
    51  
    5246    def create(self, recordedValue, loadedList={}, dateCreated=None): 
    5347        return super(TemporalCollection, self).create( 
    …… 
    7064class BitemporalCollection(BaseTemporalCollection): 
    7165    """Register for history of recorded history of actual values.""" 
    72  
    73     def getCreateTime(self): 
    74         return self.timepoint.recorded 
    75  
    76     def getFindTime(self): 
    77         return self.timepoint.recorded 
    7866 
    7967    def create(self, recordedValue, loadedList={}, dateCreated=None): 

  • trunk/src/dm/dom/temporaltest.py

    r380 r387  
    268268        sleep(0.1) 
    269269        self.failUnlessEqual(self.collection.getCreateTime(), time1) 
     270        self.timepoint.reset() 
     271        self.failUnless(self.collection.getCreateTime() > time1) 
    270272 
    271273 
    …… 
    331333        self.failUnlessEqual(self.collection.getFindTime(), time1) 
    332334        self.timepoint.reset() 
     335        self.failUnless(self.collection.getFindTime() > time1) 
    333336        self.timepoint.recorded = time1 
    334337        self.failIfEqual(self.collection.getFindTime(), time1) 
    …… 
    339342        self.failUnlessEqual(self.collection.getCreateTime(), time1) 
    340343        self.timepoint.reset() 
     344        self.failUnless(self.collection.getCreateTime() > time1) 
    341345        self.timepoint.recorded = time1 
    342346        self.failIfEqual(self.collection.getCreateTime(), time1) 
    …… 
    429433        sleep(0.1) 
    430434        self.failUnlessEqual(self.collection.getFindTime(), time1) 
     435        self.timepoint.reset() 
     436        self.failUnless(self.collection.getFindTime() > time1) 
    431437 
    432438    def test_getCreateTime(self): 
    …… 
    435441        sleep(0.1) 
    436442        self.failUnlessEqual(self.collection.getCreateTime(), time1) 
     443        self.timepoint.reset() 
     444        self.failUnless(self.collection.getCreateTime() > time1) 
    437445 
    438446