! Fixes for controller tests and new @registry annotation for registry keys reset

app/code/community/EcomDev/PHPUnit/Controller/Front.php

@@ -31,7 +31,7 @@ class EcomDev_PHPUnit_Controller_Front extends Mage_Core_Controller_Varien_Front
      */
     public function init()
     {
-        if ($this->_routers) {;
+        if ($this->_routers) {
             $this->_routers = array();
         }
 

app/code/community/EcomDev/PHPUnit/Model/Fixture/Processor/Registry.php

@@ -23,6 +23,7 @@
  * @singleton catalog/product_type
  * @resource catalog/product
  * @helper catalog
+ * @registry key
  *
  * or by specifying it in Yaml file:
  *
@@ -55,7 +56,8 @@ class EcomDev_PHPUnit_Model_Fixture_Processor_Registry implements EcomDev_PHPUni
         $typeToKey = array(
             'singleton' => '_singleton/',
             'resource'  => '_resource_singleton/',
-            'helper'    => '_helper/'
+            'helper'    => '_helper/',
+            'registry'  => ''
         );
 
         if ($fixture->getStorageData(self::STORAGE_KEY) !== null) {
@@ -116,7 +118,7 @@ class EcomDev_PHPUnit_Model_Fixture_Processor_Registry implements EcomDev_PHPUni
     {
         $options = $fixture->getOptions();
         $registry = array();
-        foreach (array('singleton', 'resource', 'helper') as $type) {
+        foreach (array('singleton', 'resource', 'helper', 'registry') as $type) {
             if (!isset($options[$type])) {
                 continue;
             }

lib/EcomDev/PHPUnit/Constraint/Config/Layout.php

@@ -173,6 +173,8 @@ class EcomDev_PHPUnit_Constraint_Config_Layout
         $assertion = self::getDesignPackageModel()
             ->getLayoutFileAssertion($this->_expectedValue, $this->_area, $this->_designPackage, $this->_theme);
 
+        $this->setActualValue($assertion['actual']);
+        $this->_expectedValue = $assertion['expected'];
         return $this->compareValues($assertion['expected'], $assertion['actual']);
     }