fix test user

src/Muzich/CoreBundle/Tests/User/UserTest.php

@@ -28,35 +28,15 @@ class UserTest extends UnitTest
     
     $bux = $this->getUser('bux');
     $original_bux_tags_quick = $bux->getTagsFavoritesQuick();
-    if ((in_array('Nouveau 1', $bux->getTagsFavoritesQuick())))
-    {
-      // hack au cas ou on a éxécuté des tests avant qui on tinjecté le tag 
-      // Nouveau 1
-      $tags = $bux->getTagsFavoritesQuick();
-      $this->assertEquals(array(
-        $tribe->getId() => 'Tribe',
-        $electro->getId() => 'Electro',
-        $metal->getId() => 'Metal',
-        $minimal->getId() => 'Minimal',
-        $jungle->getId() => 'Jungle',
-        $hardtek->getId()  => 'Hardtek',
-        array_search('Nouveau 1', $bux->getTagsFavoritesQuick())  => 'Nouveau 1'
-      ), array_unique($bux->getTagsFavoritesQuick()));
-    }
-    else
-    {
-      $bux = $this->getUser('bux');
-      $this->assertEquals(array(
-        $tribe->getId() => 'Tribe',
-        $electro->getId() => 'Electro',
-        $metal->getId() => 'Metal',
-        $minimal->getId() => 'Minimal',
-        $jungle->getId() => 'Jungle',
-        $hardtek->getId()  => 'Hardtek'
-      ), $bux->getTagsFavoritesQuick());
-    }
-    
     
+    $this->assertEquals(array(
+      $tribe->getId() => 'Tribe',
+      $electro->getId() => 'Electro',
+      $metal->getId() => 'Metal',
+      $minimal->getId() => 'Minimal',
+      $jungle->getId() => 'Jungle',
+      $hardtek->getId()  => 'Hardtek'
+    ), $this->clean_tags($bux->getTagsFavoritesQuick()));
     
     $jean = $this->getUser('jean');
     $this->assertEquals(array(
@@ -79,68 +59,32 @@ class UserTest extends UnitTest
     $this->flush();
     
     $bux = $this->getUser('bux');
-    if ((in_array('Nouveau 1', $bux->getTagsFavoritesQuick())))
-    {
-      // hack au cas ou on a éxécuté des tests avant qui on tinjecté le tag 
-      // Nouveau 1
-      $tags = $bux->getTagsFavoritesQuick();
-      $this->assertEquals(array(
-        $tribe->getId() => 'Tribe',
-        $electro->getId() => 'Electro',
-        $metal->getId() => 'Metal',
-        $minimal->getId() => 'Minimal',
-        $jungle->getId() => 'Jungle',
-        $hardtek->getId()  => 'Hardtek',
-        array_search('Nouveau 1', $bux->getTagsFavoritesQuick())  => 'Nouveau 1',
-        $melodiq->getId() => 'Melodique'
-      ), $bux->getTagsFavoritesQuick());
-    }
-    else
-    {
-      $bux = $this->getUser('bux');
-      $this->assertEquals(array(
-        $tribe->getId() => 'Tribe',
-        $electro->getId() => 'Electro',
-        $metal->getId() => 'Metal',
-        $minimal->getId() => 'Minimal',
-        $jungle->getId() => 'Jungle',
-        $hardtek->getId()  => 'Hardtek',
-        $melodiq->getId() => 'Melodique'
-      ), $bux->getTagsFavoritesQuick());
-    }
+    $this->assertEquals(array(
+      $tribe->getId() => 'Tribe',
+      $electro->getId() => 'Electro',
+      $metal->getId() => 'Metal',
+      $minimal->getId() => 'Minimal',
+      $jungle->getId() => 'Jungle',
+      $hardtek->getId()  => 'Hardtek',
+      $melodiq->getId() => 'Melodique'
+    ), $this->clean_tags($bux->getTagsFavoritesQuick()));
     
     $this->getDoctrine()->getManager()->remove($bux_melodique);
     $this->flush();
     
     $bux = $this->getUser('bux');
     $original_bux_tags_quick = $bux->getTagsFavoritesQuick();
-    if ((in_array('Nouveau 1', $bux->getTagsFavoritesQuick())))
-    {
-      // hack au cas ou on a éxécuté des tests avant qui on tinjecté le tag 
-      // Nouveau 1
-      $tags = $bux->getTagsFavoritesQuick();
-      $this->assertEquals(array(
-        $tribe->getId() => 'Tribe',
-        $electro->getId() => 'Electro',
-        $metal->getId() => 'Metal',
-        $minimal->getId() => 'Minimal',
-        $jungle->getId() => 'Jungle',
-        $hardtek->getId()  => 'Hardtek',
-        array_search('Nouveau 1', $bux->getTagsFavoritesQuick())  => 'Nouveau 1'
-      ), $bux->getTagsFavoritesQuick());
-    }
-    else
-    {
-      $bux = $this->getUser('bux');
-      $this->assertEquals(array(
-        $tribe->getId() => 'Tribe',
-        $electro->getId() => 'Electro',
-        $metal->getId() => 'Metal',
-        $minimal->getId() => 'Minimal',
-        $jungle->getId() => 'Jungle',
-        $hardtek->getId()  => 'Hardtek'
-      ), $bux->getTagsFavoritesQuick());
-    }
+    
+    $bux = $this->getUser('bux');
+    $this->assertEquals(array(
+      $tribe->getId() => 'Tribe',
+      $electro->getId() => 'Electro',
+      $metal->getId() => 'Metal',
+      $minimal->getId() => 'Minimal',
+      $jungle->getId() => 'Jungle',
+      $hardtek->getId()  => 'Hardtek'
+    ), $this->clean_tags($bux->getTagsFavoritesQuick()));
+    
     
     // Persistance des données de test arf, du coup on remet les tags d'origine
     // a la fin du test au cas ou on le rééxecute
@@ -148,4 +92,13 @@ class UserTest extends UnitTest
     
   }
   
+  protected function clean_tags($tags)
+  {
+    while (array_search('Nouveau 1', $tags) !== False)
+    {
+      unset($tags[array_search('Nouveau 1', $tags)]);
+    }
+    return $tags;
+  }
+  
 }