Merge branch 'master' of github.com:heimrichhannot/contao-utils-bundle

heimrichhannot · Feb 19, 2018 · 264accd · 264accd
2 parents f1bc3b1 + 605017e
commit 264accd
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/tests/File/FileUtilTest.php b/tests/File/FileUtilTest.php
@@ -58,12 +58,15 @@ public function setUp()
 
     public function testGetFileList()
     {
+        $fileUtil = new FileUtil($this->mockContaoFramework());
         file_put_contents($this->getTempDir().'/files/testfile1', 'test');
+
+        $fileList = $fileUtil->getFileList($this->getTempDir().'/files', __DIR__, 'protectBaseUrl');
+        $this->assertSame('protectBaseUrl?file='.__DIR__.'/testfile1', $fileList[0]['absUrl']);
+
         file_put_contents($this->getTempDir().'/files/testfile2', 'test');
         file_put_contents($this->getTempDir().'/files/testfile3', 'test');
 
-        $framework = $this->mockContaoFramework();
-        $fileUtil = new FileUtil($framework);
         $fileList = $fileUtil->getFileList($this->getTempDir().'/files', __DIR__);
 
         $this->assertCount(3, $fileList);
@@ -80,9 +83,6 @@ public function testGetFileList()
         $fileList = $fileUtil->getFileList($this->getTempDir().'/fileList', __DIR__);
 
         $this->assertCount(0, $fileList);
-
-        $fileList = $fileUtil->getFileList($this->getTempDir().'/files', __DIR__, 'protectBaseUrl');
-        $this->assertSame('protectBaseUrl?file=/home/kwagner/Kunden/github/contao-utils-bundle/tests/File/testfile1', $fileList[2]['absUrl']);
     }
 
     public function testGetUniqueFileNameWithinTarget()
@@ -198,7 +198,7 @@ public function testSanitizeFileName()
 
     public function testGetFilesFromUuid()
     {
-        $filesModel = $this->mockClassWithProperties(FilesModel::class, ['path' => $this->getTempDir().'/files/testFile']);
+        $filesModel = $this->mockClassWithProperties(FilesModel::class, ['path' => $this->getTempDir().'/files']);
         $filesAdapter = $this->mockAdapter(['findByUuid']);
         $filesAdapter->method('findByUuid')->willReturn($filesModel);
         $fileUtil = new FileUtil($this->mockContaoFramework([FilesModel::class => $filesAdapter]));
@@ -207,12 +207,10 @@ public function testGetFilesFromUuid()
         $this->assertNull($file);
 
         file_put_contents($this->getTempDir().'/files/testFile', 'test');
-        $container = System::getContainer();
         $filesModel = $this->mockClassWithProperties(FilesModel::class, ['path' => $this->getTempDir().'/files/testFile']);
         $filesAdapter = $this->mockAdapter(['findByUuid']);
         $filesAdapter->method('findByUuid')->willReturn($filesModel);
-        $container->set('contao.framework', $this->mockContaoFramework([FilesModel::class => $filesAdapter]));
-        System::setContainer($container);
+        $fileUtil = new FileUtil($this->mockContaoFramework([FilesModel::class => $filesAdapter]));
 
         $file = $fileUtil->getFileFromUuid('uuid');
         $this->assertInstanceOf(File::class, $file);