Changeset 2522

Timestamp:

03/12/10 11:34:51 (5 months ago)

Author:

mikey

Message:

reduce test flakiness

Files:

• framework/trunk/src/test/php/net/stubbles/ipo/request/broker/annotations/stubDateFilterAnnotationTestCase.php (modified) (12 diffs)

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

@@ -18 +18 @@
 {
     /**
+     * date to return
+     *
+     * @var  stubDate
+     */
+    protected static $date;
+
+    /**
+     * sets date instance to return
+     *
+     * @param  stubDate  $date
+     */
+    public static function setDate(stubDate $date)
+    {
+        self::$date = $date;
+    }
+
+    /**
+     * returns date
+     *
+     * @return  stubDate
+     */
+    public static function getDate()
+    {
+        return self::$date;
+    }
+
+    /**
      * returns min data in a static way
      *
@@ -24 +51 @@
     public static function getMinDate()
     {
-        return stubDate::now();
+        return self::$date;
     }
 
@@ -34 +61 @@
     public function getMinDateNonStatic()
     {
-        return stubDate::now();
+        return self::$date;
     }
 
@@ -44 +71 @@
     public static function getMaxDate()
     {
-        return stubDate::now();
+        return self::$date;
     }
 
@@ -54 +81 @@
     public function getMaxDateNonStatic()
     {
-        return stubDate::now();
+        return self::$date;
     }
 }
@@ -82 +109 @@
         $this->dateFilterAnnotation = new stubDateFilterAnnotation();
         $this->dateFilterAnnotation->setRequired(false);
+        DateProvider::setDate(stubDate::now());
     }
 
@@ -136 +164 @@
         $this->assertType('stubPeriodFilterDecorator', $filter);
         $this->assertNull($filter->getMaxDate());
-        $this->assertTrue(stubDate::now()->equals($filter->getMinDate()));
+        $this->assertTrue(DateProvider::getDate()->equals($filter->getMinDate()));
         $this->assertType('stubDateFilter', $filter->getDecoratedFilter());
     }
@@ -152 +180 @@
         $this->assertType('stubPeriodFilterDecorator', $filter);
         $this->assertNull($filter->getMaxDate());
-        $this->assertTrue(stubDate::now()->equals($filter->getMinDate()));
+        $this->assertTrue(DateProvider::getDate()->equals($filter->getMinDate()));
         $this->assertType('stubDateFilter', $filter->getDecoratedFilter());
     }
@@ -168 +196 @@
         $this->assertType('stubPeriodFilterDecorator', $filter);
         $this->assertNull($filter->getMinDate());
+        $this->assertTrue($maxDate->equals($filter->getMaxDate()));
+        $this->assertType('stubDateFilter', $filter->getDecoratedFilter());
+    }
+
+    /**
+     * test that the correct filter is created
+     *
+     * @test
+     */
+    public function withMaxFromString()
+    {
+        $this->dateFilterAnnotation->setMaxDate('now');
+        $filter = $this->dateFilterAnnotation->getFilter();
+        $this->assertType('stubPeriodFilterDecorator', $filter);
+        $this->assertNull($filter->getMinDate());
         $this->assertTrue(stubDate::now()->equals($filter->getMaxDate()));
         $this->assertType('stubDateFilter', $filter->getDecoratedFilter());
@@ -177 +220 @@
      * @test
      */
-    public function withMaxFromString()
-    {
-        $this->dateFilterAnnotation->setMaxDate('now');
-        $filter = $this->dateFilterAnnotation->getFilter();
-        $this->assertType('stubPeriodFilterDecorator', $filter);
-        $this->assertNull($filter->getMinDate());
-        $this->assertTrue(stubDate::now()->equals($filter->getMaxDate()));
-        $this->assertType('stubDateFilter', $filter->getDecoratedFilter());
-    }
-
-    /**
-     * test that the correct filter is created
-     *
-     * @test
-     */
     public function withMaxFromProviderWithDefaultMethod()
     {
@@ -198 +226 @@
         $this->assertType('stubPeriodFilterDecorator', $filter);
         $this->assertNull($filter->getMinDate());
-        $this->assertTrue(stubDate::now()->equals($filter->getMaxDate()));
+        $this->assertTrue(DateProvider::getDate()->equals($filter->getMaxDate()));
         $this->assertType('stubDateFilter', $filter->getDecoratedFilter());
     }
@@ -214 +242 @@
         $this->assertType('stubPeriodFilterDecorator', $filter);
         $this->assertNull($filter->getMinDate());
-        $this->assertTrue(stubDate::now()->equals($filter->getMaxDate()));
+        $this->assertTrue(DateProvider::getDate()->equals($filter->getMaxDate()));
         $this->assertType('stubDateFilter', $filter->getDecoratedFilter());
     }