            case 'F': $return.= $this->month; break;
            case 'g': $return.= $this->hours == 0 ? 12 : ($this->hours > 12 ? $this->hours - 12 : $this->hours); break;
            case 'G': $return.= $this->hours; break;
-@@ -536,33 +511,43 @@
+@@ -536,33 +524,43 @@
            case 'l': $return.= $this->weekday; break;
            case 'L': $return.= (int)$this->leap; break;
            case 'm': $return.= sprintf('%02d', $this->mon); break;

+     * @param   util.Date d
      * @param   string str
      * @param   string error default 'datenotequal'
      * @return  bool
      */
     public function assertDateEquals($d, $str, $error= 'datenotequal') {
-      return $this->assertEquals($d->format('%Y-%m-%d %H:%M:%S'), $str, $error);
+      return $this->assertEquals($str, $d->format('%Y-%m-%d %H:%M:%S'), $error);
     }
     
     /**
@@ -79,9 +105,7 @@
      */
     #[@test]
     public function testCalendarEaster() {

     }
 
     /**
@@ -115,9 +134,7 @@
      */
     #[@test]
     public function testCalendarDSTEnd() {
