- unittest improvements

- small bugfixes

library/Solarium/Query/Select.php

@@ -615,8 +615,7 @@ class Solarium_Query_Select extends Solarium_Query
      */
     protected function _createComponents($configs)
     {
-        foreach ($configs AS $type => $config)
-        {
+        foreach ($configs AS $type => $config) {
             $this->getComponent($type, true, $config);
         }
     }

library/Solarium/Query/Select/Component/Facet.php

@@ -83,6 +83,7 @@ abstract class Solarium_Query_Select_Component_Facet extends Solarium_Configurab
                 case 'exclude':
                     if(!is_array($value)) $value = array($value);
                     $this->setExcludes($value);
+                    unset($this->_options['exclude']);
                     break;
             }
         }

library/Solarium/Query/Select/Component/Facet/MultiQuery.php

@@ -98,7 +98,7 @@ class Solarium_Query_Select_Component_Facet_MultiQuery extends Solarium_Query_Se
     public function createQuery($key, $query, $excludes = array())
     {
         // merge excludes with shared excludes
-        $excludes = array_merge($this->_excludes, $excludes);
+        $excludes = array_merge($this->getExcludes(), $excludes);
 
         $facetQuery = new Solarium_Query_Select_Component_Facet_Query;
         $facetQuery->setKey($key);
@@ -135,7 +135,7 @@ class Solarium_Query_Select_Component_Facet_MultiQuery extends Solarium_Query_Se
         }
 
         // forward shared excludes
-        $facetQuery->addExcludes($this->_excludes);
+        $facetQuery->addExcludes($this->getExcludes());
 
         $this->_facetQueries[$key] = $facetQuery;
         return $this;