TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish implementing and testing zip

Browse Source 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/AbstractArchiveBuilder.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/Exception/TarArchiveException.php
	renommé:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveException.php -> core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/Exception/ZipArchiveException.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderInterface.php
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
This commit is contained in:
Benjamin Perche
2014-07-03 13:10:53 +02:00
parent 9eecad5658
commit 83cf3b59e0
9 changed files with 611 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
View File

@@ -33,11 +33,19 @@ class TarArchiveBuilderTest extends \PHPUnit_Framework_TestCase
Tlog::getNewInstance();
$this->tar = new TarArchiveBuilder();
<<<<<<< HEAD
$this->tar->setEnvironment("dev");
=======
>>>>>>> Finish implementing and testing zip
}
public function testAddFileAndDirectory()
{
<<<<<<< HEAD
=======
$this->tar->setEnvironment("dev");
>>>>>>> Finish implementing and testing zip
/**
* File
*/
@@ -82,6 +90,7 @@ class TarArchiveBuilderTest extends \PHPUnit_Framework_TestCase
$this->assertTrue($this->tar->hasDirectory("bar"));
}
<<<<<<< HEAD
public function testAddValidFileFromString()
{
@@ -289,3 +298,6 @@ class TarArchiveBuilderTest extends \PHPUnit_Framework_TestCase
);
}
}
=======
}
>>>>>>> Finish implementing and testing zip

98
core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
View File

@@ -73,84 +73,121 @@ class ZipArchiveBuilderTest extends \PHPUnit_Framework_TestCase
{
$this->assertEquals(
"foo",
<<<<<<< HEAD
$this->zip->getFilePath("foo")
>>>>>>> Define archive builders and formatters
=======
$this->zip->formatFilePath("foo")
>>>>>>> Finish implementing and testing zip
);
$this->assertEquals(
"foo",
<<<<<<< HEAD
<<<<<<< HEAD
$this->zip->formatFilePath("/foo")
=======
$this->zip->getFilePath("/foo")
>>>>>>> Define archive builders and formatters
=======
$this->zip->formatFilePath("/foo")
>>>>>>> Finish implementing and testing zip
);
$this->assertEquals(
"foo",
<<<<<<< HEAD
<<<<<<< HEAD
$this->zip->formatFilePath("foo/")
=======
$this->zip->getFilePath("foo/")
>>>>>>> Define archive builders and formatters
=======
$this->zip->formatFilePath("foo/")
>>>>>>> Finish implementing and testing zip
);
$this->assertEquals(
"foo",
<<<<<<< HEAD
<<<<<<< HEAD
$this->zip->formatFilePath("/foo/")
=======
$this->zip->getFilePath("/foo/")
>>>>>>> Define archive builders and formatters
=======
$this->zip->formatFilePath("/foo/")
>>>>>>> Finish implementing and testing zip
);
$this->assertEquals(
"/foo/bar",
<<<<<<< HEAD
<<<<<<< HEAD
$this->zip->formatFilePath("foo/bar")
=======
$this->zip->getFilePath("foo/bar")
>>>>>>> Define archive builders and formatters
=======
$this->zip->formatFilePath("foo/bar")
>>>>>>> Finish implementing and testing zip
);
$this->assertEquals(
"/foo/bar",
<<<<<<< HEAD
<<<<<<< HEAD
$this->zip->formatFilePath("/foo/bar")
=======
$this->zip->getFilePath("/foo/bar")
>>>>>>> Define archive builders and formatters
=======
$this->zip->formatFilePath("/foo/bar")
>>>>>>> Finish implementing and testing zip
);
$this->assertEquals(
"/foo/bar",
<<<<<<< HEAD
<<<<<<< HEAD
$this->zip->formatFilePath("/foo//bar/")
=======
$this->zip->getFilePath("/foo//bar/")
>>>>>>> Define archive builders and formatters
=======
$this->zip->formatFilePath("/foo//bar/")
>>>>>>> Finish implementing and testing zip
);
$this->assertEquals(
"/foo/bar",
<<<<<<< HEAD
<<<<<<< HEAD
$this->zip->formatFilePath("/foo/bar/")
=======
$this->zip->getFilePath("/foo/bar/")
>>>>>>> Define archive builders and formatters
=======
$this->zip->formatFilePath("/foo/bar/")
>>>>>>> Finish implementing and testing zip
);
$this->assertEquals(
"/foo/bar/baz",
<<<<<<< HEAD
<<<<<<< HEAD
$this->zip->formatFilePath("foo/bar/baz")
=======
$this->zip->getFilePath("foo/bar/baz")
>>>>>>> Define archive builders and formatters
=======
$this->zip->formatFilePath("foo/bar/baz")
>>>>>>> Finish implementing and testing zip
);
$this->assertEquals(
"/foo/bar/baz",
<<<<<<< HEAD
<<<<<<< HEAD
$this->zip->formatFilePath("//foo/bar///baz/")
);
@@ -163,6 +200,9 @@ class ZipArchiveBuilderTest extends \PHPUnit_Framework_TestCase
$this->zip->formatDirectoryPath("foo")
=======
$this->zip->getFilePath("//foo/bar///baz/")
=======
$this->zip->formatFilePath("//foo/bar///baz/")
>>>>>>> Finish implementing and testing zip
);
}
@@ -170,89 +210,129 @@ class ZipArchiveBuilderTest extends \PHPUnit_Framework_TestCase
{
$this->assertEquals(
"/foo/",
<<<<<<< HEAD
$this->zip->getDirectoryPath("foo")
>>>>>>> Define archive builders and formatters
=======
$this->zip->formatDirectoryPath("foo")
>>>>>>> Finish implementing and testing zip
);
$this->assertEquals(
"/foo/",
<<<<<<< HEAD
<<<<<<< HEAD
$this->zip->formatDirectoryPath("/foo")
=======
$this->zip->getDirectoryPath("/foo")
>>>>>>> Define archive builders and formatters
=======
$this->zip->formatDirectoryPath("/foo")
>>>>>>> Finish implementing and testing zip
);
$this->assertEquals(
"/foo/",
<<<<<<< HEAD
<<<<<<< HEAD
$this->zip->formatDirectoryPath("foo/")
=======
$this->zip->getDirectoryPath("foo/")
>>>>>>> Define archive builders and formatters
=======
$this->zip->formatDirectoryPath("foo/")
>>>>>>> Finish implementing and testing zip
);
$this->assertEquals(
"/foo/",
<<<<<<< HEAD
<<<<<<< HEAD
$this->zip->formatDirectoryPath("/foo/")
=======
$this->zip->getDirectoryPath("/foo/")
>>>>>>> Define archive builders and formatters
=======
$this->zip->formatDirectoryPath("/foo/")
>>>>>>> Finish implementing and testing zip
);
$this->assertEquals(
"/foo/bar/",
<<<<<<< HEAD
<<<<<<< HEAD
$this->zip->formatDirectoryPath("foo/bar")
=======
$this->zip->getDirectoryPath("foo/bar")
>>>>>>> Define archive builders and formatters
=======
$this->zip->formatDirectoryPath("foo/bar")
>>>>>>> Finish implementing and testing zip
);
$this->assertEquals(
"/foo/bar/",
<<<<<<< HEAD
<<<<<<< HEAD
$this->zip->formatDirectoryPath("/foo/bar")
=======
$this->zip->getDirectoryPath("/foo/bar")
>>>>>>> Define archive builders and formatters
=======
$this->zip->formatDirectoryPath("/foo/bar")
>>>>>>> Finish implementing and testing zip
);
$this->assertEquals(
"/foo/bar/",
<<<<<<< HEAD
<<<<<<< HEAD
$this->zip->formatDirectoryPath("/foo//bar/")
=======
$this->zip->getDirectoryPath("/foo//bar/")
>>>>>>> Define archive builders and formatters
=======
$this->zip->formatDirectoryPath("/foo//bar/")
>>>>>>> Finish implementing and testing zip
);
$this->assertEquals(
"/foo/bar/",
<<<<<<< HEAD
<<<<<<< HEAD
$this->zip->formatDirectoryPath("/foo/bar/")
=======
$this->zip->getDirectoryPath("/foo/bar/")
>>>>>>> Define archive builders and formatters
=======
$this->zip->formatDirectoryPath("/foo/bar/")
>>>>>>> Finish implementing and testing zip
);
$this->assertEquals(
"/foo/bar/baz/",
<<<<<<< HEAD
<<<<<<< HEAD
$this->zip->formatDirectoryPath("foo/bar/baz")
=======
$this->zip->getDirectoryPath("foo/bar/baz")
>>>>>>> Define archive builders and formatters
=======
$this->zip->formatDirectoryPath("foo/bar/baz")
>>>>>>> Finish implementing and testing zip
);
$this->assertEquals(
"/foo/bar/baz/",
<<<<<<< HEAD
<<<<<<< HEAD
$this->zip->formatDirectoryPath("//foo/bar///baz/")
=======
$this->zip->getDirectoryPath("//foo/bar///baz/")
>>>>>>> Define archive builders and formatters
=======
$this->zip->formatDirectoryPath("//foo/bar///baz/")
>>>>>>> Finish implementing and testing zip
);
}
@@ -274,11 +354,15 @@ class ZipArchiveBuilderTest extends \PHPUnit_Framework_TestCase
}
/**
<<<<<<< HEAD
<<<<<<< HEAD
* @expectedException \Thelia\Core\FileFormat\Archive\ArchiveBuilder\Exception\ZipArchiveException
=======
* @expectedException \Thelia\Core\FileFormat\Archive\ArchiveBuilder\ZipArchiveException
>>>>>>> Define archive builders and formatters
=======
* @expectedException \Thelia\Core\FileFormat\Archive\ArchiveBuilder\Exception\ZipArchiveException
>>>>>>> Finish implementing and testing zip
* @expectedExceptionMessage [Zip Error] The file is not a zip archive
*/
public function testLoadNotValidZip()
@@ -327,11 +411,15 @@ class ZipArchiveBuilderTest extends \PHPUnit_Framework_TestCase
}
/**
<<<<<<< HEAD
<<<<<<< HEAD
* @expectedException \Thelia\Core\FileFormat\Archive\ArchiveBuilder\Exception\ZipArchiveException
=======
* @expectedException \Thelia\Core\FileFormat\Archive\ArchiveBuilder\ZipArchiveException
>>>>>>> Define archive builders and formatters
=======
* @expectedException \Thelia\Core\FileFormat\Archive\ArchiveBuilder\Exception\ZipArchiveException
>>>>>>> Finish implementing and testing zip
* @expectedExceptionMessage [Zip Error] The file is not a zip archive
*/
public function testLoadOnlineAvailableAndNotValidFile()
@@ -489,6 +577,9 @@ class ZipArchiveBuilderTest extends \PHPUnit_Framework_TestCase
);
}
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> Finish implementing and testing zip
public function testAddValidFileFromString()
{
@@ -504,6 +595,7 @@ class ZipArchiveBuilderTest extends \PHPUnit_Framework_TestCase
"foo",
$this->loadedZip->getFileContent("bar")
);
<<<<<<< HEAD
$this->loadedZip->addFileFromString(
"foo", "bar", "baz"
@@ -517,6 +609,8 @@ class ZipArchiveBuilderTest extends \PHPUnit_Framework_TestCase
"foo",
$this->loadedZip->getFileContent("baz/bar")
);
=======
>>>>>>> Finish implementing and testing zip
}
/**
@@ -547,7 +641,11 @@ class ZipArchiveBuilderTest extends \PHPUnit_Framework_TestCase
);
}
<<<<<<< HEAD
}
=======
}
>>>>>>> Define archive builders and formatters
=======
}
>>>>>>> Finish implementing and testing zip