diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-10-05 22:24:36 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-10-05 22:24:36 +0200 |
| commit | c4c8dd4e3a5fcd9a86835566db954662dcb41a0c (patch) | |
| tree | 60458ed3dd92bf7eef9dec4890774b54d6d71e4e /tests/lib/archive | |
| parent | a53999e94ebefc7c87830df5bc52c6b975ad45b4 (diff) | |
| download | nextcloud-server-c4c8dd4e3a5fcd9a86835566db954662dcb41a0c.tar.gz nextcloud-server-c4c8dd4e3a5fcd9a86835566db954662dcb41a0c.zip | |
make archive test cases work again
Diffstat (limited to 'tests/lib/archive')
| -rw-r--r-- | tests/lib/archive/tar.php | 18 | ||||
| -rw-r--r-- | tests/lib/archive/zip.php | 18 |
2 files changed, 14 insertions, 22 deletions
diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php index 2595b7cb195..51de004813a 100644 --- a/tests/lib/archive/tar.php +++ b/tests/lib/archive/tar.php @@ -8,17 +8,13 @@ require_once 'archive.php'; -if(is_dir(OC::$SERVERROOT.'/apps/files_archive/tests/data')) { - class Test_Archive_TAR extends Test_Archive{ - protected function getExisting() { - $dir=OC::$SERVERROOT.'/apps/files_archive/tests/data'; - return new OC_Archive_TAR($dir.'/data.tar.gz'); - } +class Test_Archive_TAR extends Test_Archive { + protected function getExisting() { + $dir = OC::$SERVERROOT . '/tests/data'; + return new OC_Archive_TAR($dir . '/data.tar.gz'); + } - protected function getNew() { - return new OC_Archive_TAR(OCP\Files::tmpFile('.tar.gz')); - } + protected function getNew() { + return new OC_Archive_TAR(OCP\Files::tmpFile('.tar.gz')); } -}else{ - abstract class Test_Archive_TAR extends Test_Archive{} } diff --git a/tests/lib/archive/zip.php b/tests/lib/archive/zip.php index a7682e34180..adddf81ee1b 100644 --- a/tests/lib/archive/zip.php +++ b/tests/lib/archive/zip.php @@ -8,17 +8,13 @@ require_once 'archive.php'; -if(is_dir(OC::$SERVERROOT.'/apps/files_archive/tests/data')) { - class Test_Archive_ZIP extends Test_Archive{ - protected function getExisting() { - $dir=OC::$SERVERROOT.'/apps/files_archive/tests/data'; - return new OC_Archive_ZIP($dir.'/data.zip'); - } +class Test_Archive_ZIP extends Test_Archive { + protected function getExisting() { + $dir = OC::$SERVERROOT . '/tests/data'; + return new OC_Archive_ZIP($dir . '/data.zip'); + } - protected function getNew() { - return new OC_Archive_ZIP(OCP\Files::tmpFile('.zip')); - } + protected function getNew() { + return new OC_Archive_ZIP(OCP\Files::tmpFile('.zip')); } -}else{ - abstract class Test_Archive_ZIP extends Test_Archive{} } |