From f2cb3ec76dec3fe2b40f25765ef842223c7132fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Wed, 23 Jan 2013 13:55:25 +0200
Subject: handle bzip1 as well

in fact .tbz is tar.bz (bzip1) and .tbz2 is what tar.bz2 is used
commonly.
---
 _test/tests/inc/tar.test.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to '_test/tests/inc')

diff --git a/_test/tests/inc/tar.test.php b/_test/tests/inc/tar.test.php
index e8805a75d..f27b9506b 100644
--- a/_test/tests/inc/tar.test.php
+++ b/_test/tests/inc/tar.test.php
@@ -73,7 +73,7 @@ class Tar_TestCase extends DokuWikiTest {
     public function test_tarcontent() {
         $dir = dirname(__FILE__).'/tar';
 
-        foreach(array('tar', 'tgz', 'tbz') as $ext) {
+        foreach(array('tar', 'tgz', 'tbz', 'tbz2') as $ext) {
             $tar  = new Tar();
             $file = "$dir/test.$ext";
 
@@ -96,7 +96,7 @@ class Tar_TestCase extends DokuWikiTest {
         $dir = dirname(__FILE__).'/tar';
         $out = sys_get_temp_dir().'/dwtartest'.md5(time());
 
-        foreach(array('tar', 'tgz', 'tbz') as $ext) {
+        foreach(array('tar', 'tgz', 'tbz', 'tbz2') as $ext) {
             $tar  = new Tar();
             $file = "$dir/test.$ext";
 
@@ -122,7 +122,7 @@ class Tar_TestCase extends DokuWikiTest {
         $dir = dirname(__FILE__).'/tar';
         $out = sys_get_temp_dir().'/dwtartest'.md5(time());
 
-        foreach(array('tar', 'tgz', 'tbz') as $ext) {
+        foreach(array('tar', 'tgz', 'tbz', 'tbz2') as $ext) {
             $tar  = new Tar();
             $file = "$dir/test.$ext";
 
@@ -148,7 +148,7 @@ class Tar_TestCase extends DokuWikiTest {
         $dir = dirname(__FILE__).'/tar';
         $out = sys_get_temp_dir().'/dwtartest'.md5(time());
 
-        foreach(array('tar', 'tgz', 'tbz') as $ext) {
+        foreach(array('tar', 'tgz', 'tbz', 'tbz2') as $ext) {
             $tar  = new Tar();
             $file = "$dir/test.$ext";
 
@@ -174,7 +174,7 @@ class Tar_TestCase extends DokuWikiTest {
         $dir = dirname(__FILE__).'/tar';
         $out = sys_get_temp_dir().'/dwtartest'.md5(time());
 
-        foreach(array('tar', 'tgz', 'tbz') as $ext) {
+        foreach(array('tar', 'tgz', 'tbz', 'tbz2') as $ext) {
             $tar  = new Tar();
             $file = "$dir/test.$ext";
 
@@ -199,7 +199,7 @@ class Tar_TestCase extends DokuWikiTest {
         $dir = dirname(__FILE__).'/tar';
         $out = sys_get_temp_dir().'/dwtartest'.md5(time());
 
-        foreach(array('tar', 'tgz', 'tbz') as $ext) {
+        foreach(array('tar', 'tgz', 'tbz', 'tbz2') as $ext) {
             $tar  = new Tar();
             $file = "$dir/test.$ext";
 
@@ -229,6 +229,10 @@ class Tar_TestCase extends DokuWikiTest {
         $this->assertEquals(Tar::COMPRESS_GZIP, $tar->filetype('foo.tar.gz'));
         $this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tbz'));
         $this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tBZ'));
+        $this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tbz2'));
+        $this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tBZ2'));
+        $this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tar.bz'));
+        $this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tar.BZ'));
         $this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tar.BZ2'));
         $this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tar.bz2'));
     }
@@ -316,4 +320,4 @@ class Tar_TestCase extends DokuWikiTest {
 
         TestUtils::rdelete($out);
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3