Changeset 1866

Show
Ignore:
Timestamp:
09/27/08 14:25:13 (3 months ago)
Author:
mikey
Message:

fix bugs, better run correct tests before initial commit next time...

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • framework/trunk/src/main/php/net/stubbles/ipo/request/broker/annotations/stubDateFilterAnnotation.php

    r1865 r1866  
    119119    { 
    120120        $filter = new stubDateFilter($this->createRVEFactory()); 
    121         if (null !== $this->minValue || null !== $this->maxValue) { 
     121        if (null !== $this->minDate || null !== $this->maxDate) { 
    122122            $filter = new stubPeriodFilterDecorator($filter, $this->createRVEFactory()); 
    123123            if (null !== $this->minDate) { 
    …… 
    126126             
    127127            if (null !== $this->maxDate) { 
    128                 $filter->setMaxDate($this->maxDate, $this->maxvErrorId); 
     128                $filter->setMaxDate($this->maxDate, $this->maxDateErrorId); 
    129129            } 
    130130             

  • framework/trunk/src/test/php/net/stubbles/ipo/request/broker/annotations/stubDateFilterAnnotationTestCase.php

    r1865 r1866  
    122122        $this->assertType('stubPeriodFilterDecorator', $filter); 
    123123        $this->assertTrue(stubDate::now()->equals($filter->getMinDate())); 
    124         $this->assertEquals('VALUE_TOO_SMALL', $filter->getMinDateErrorId()); 
     124        $this->assertEquals('DATE_TOO_EARLY', $filter->getMinDateErrorId()); 
    125125        $this->assertTrue(stubDate::now()->equals($filter->getMaxDate())); 
    126         $this->assertEquals('VALUE_TOO_GREAT', $filter->getMaxDateErrorId()); 
    127         $this->assertType('stubFloatFilter', $filter->getDecoratedFilter()); 
     126        $this->assertEquals('DATE_TOO_LATE', $filter->getMaxDateErrorId()); 
     127        $this->assertType('stubDateFilter', $filter->getDecoratedFilter()); 
    128128    } 
    129129 
    …… 
    149149        $this->assertEquals('differentMax', $filter->getMaxDateErrorId()); 
    150150        $this->assertEquals('d/m/y', $filter->getDateFormat()); 
    151         $this->assertType('stubFloatFilter', $filter->getDecoratedFilter()); 
     151        $this->assertType('stubDateFilter', $filter->getDecoratedFilter()); 
    152152    } 
    153153}