Revert last hackish test refactoring and use test name in test path instead

Author: Vinai

tests/MagentoHackathon/Composer/Magento/Deploystrategy/AbstractTest.php

@@ -49,8 +49,8 @@ abstract function getTestDeployStrategyFiletype($isDir = false);
     protected function setUp()
     {
         $this->filesystem = new \Composer\Util\Filesystem();
-        $this->sourceDir = sys_get_temp_dir() . DS . "module_dir";
-        $this->destDir = sys_get_temp_dir() . DS . "magento_dir";
+        $this->sourceDir = sys_get_temp_dir() . DS . $this->getName() . DS . "module_dir";
+        $this->destDir = sys_get_temp_dir() . DS . $this->getName() . DS . "magento_dir";
         $this->filesystem->ensureDirectoryExists($this->sourceDir);
         $this->filesystem->ensureDirectoryExists($this->destDir);
 
@@ -70,6 +70,8 @@ protected function tearDown()
     /**
      * @param string $file
      * @param string $type
+     * @throws \InvalidArgumentException
+     * @throws \PHPUnit_Framework_AssertionFailedError
      */
     public function assertFileType($file, $type)
     {
@@ -139,7 +141,7 @@ public function testAddMapping()
 
     public function testCreate()
     {
-        $src = 'local.xml';
+        $src = 'local1.xml';
         $dest = 'local2.xml';
         touch($this->sourceDir . DS . $src);
         $this->assertTrue(is_readable($this->sourceDir . DS . $src));
@@ -150,7 +152,7 @@ public function testCreate()
 
     public function testCopyDirToDir()
     {
-        $src = "hello";
+        $src = "hello1";
         $dest = "hello2";
         $this->mkdir($this->sourceDir . DS . $src);
         touch($this->sourceDir . DS . $src . DS . "local.xml");
@@ -235,7 +237,7 @@ public function testGlobTargetDirDoesNotExists()
 
     public function testGlobSlashDirectoryExists()
     {
-        $globSource = "sourcedir/test1.xml";
+        $globSource = "sourcedir/test.xml";
         $this->mkdir($this->sourceDir . DS . dirname($globSource));
         touch($this->sourceDir . DS . $globSource);
 
@@ -254,7 +256,7 @@ public function testGlobSlashDirectoryExists()
 
     public function testGlobSlashDirectoryDoesNotExists()
     {
-        $globSource = "sourcedir/test2.xml";
+        $globSource = "sourcedir/test.xml";
         $this->mkdir($this->sourceDir . DS . dirname($globSource));
         touch($this->sourceDir . DS . $globSource);
 
@@ -274,7 +276,7 @@ public function testGlobWildcardTargetDirDoesNotExist()
     {
         $globSource = "sourcedir/*";
         $glob_dir = dirname($globSource);
-        $files = array('test3.xml', 'test4.xml');
+        $files = array('test1.xml', 'test2.xml');
         $this->mkdir($this->sourceDir . DS . $glob_dir);
         foreach ($files as $file) {
             touch($this->sourceDir . DS . $glob_dir . DS . $file);
@@ -301,7 +303,7 @@ public function testGlobWildcardTargetDirDoesExist()
     {
         $globSource = "sourcedir/*";
         $glob_dir = dirname($globSource);
-        $files = array('test5.xml', 'test6.xml');
+        $files = array('test1.xml', 'test2.xml');
         $this->mkdir($this->sourceDir . DS . $glob_dir);
         foreach ($files as $file) {
             touch($this->sourceDir . DS . $glob_dir . DS . $file);
@@ -337,7 +339,7 @@ public function testSourceAndTargetAreDirsDoNotExist()
             $this->setUp();
 
             list ($globSource, $dest) = $fixture;
-            $sourceDirContent = "test7.xml";
+            $sourceDirContent = "test.xml";
             $this->mkdir($this->sourceDir . DS . $globSource);
             touch($this->sourceDir . DS . $globSource . DS . $sourceDirContent);
 
@@ -369,7 +371,7 @@ public function testSourceAndTargetAreDirsDoExist()
             $this->setUp();
 
             list ($globSource, $dest) = $fixture;
-            $sourceDirContent = "test8.xml";
+            $sourceDirContent = "test.xml";
             $this->mkdir($this->sourceDir . DS . $globSource);
             touch($this->sourceDir . DS . $globSource . DS . $sourceDirContent);
 

tests/MagentoHackathon/Composer/Magento/Deploystrategy/SymlinkTest.php

@@ -24,7 +24,7 @@ public function getTestDeployStrategyFiletype($isDir = false)
 
     public function testClean()
     {
-        $src = 'local.xml';
+        $src = 'local1.xml';
         $dest = 'local2.xml';
         touch($this->sourceDir . DIRECTORY_SEPARATOR . $src);
         $this->assertTrue(is_readable($this->sourceDir . DIRECTORY_SEPARATOR . $src));