From 912be8f66fc77a0999250f2f494ddaeed4b3fa08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Thu, 27 Nov 2014 18:12:02 +0100 Subject: Add tests: known and unknown external video files --- _test/tests/inc/parser/parser_media.test.php | 78 ++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 _test/tests/inc/parser/parser_media.test.php (limited to '_test') diff --git a/_test/tests/inc/parser/parser_media.test.php b/_test/tests/inc/parser/parser_media.test.php new file mode 100644 index 000000000..0b62473f8 --- /dev/null +++ b/_test/tests/inc/parser/parser_media.test.php @@ -0,0 +1,78 @@ + +*/ +class TestOfDoku_Parser_Media extends TestOfDoku_Parser { + + function testVideoOGVExternal() { + $file = 'http://some.where.far/away.ogv'; + $parser_response = p_get_instructions('{{' . $file . '}}'); + + $calls = array ( + array('document_start',array()), + array('p_open',array()), + array('externalmedia',array($file,null,null,null,null,'cache','details')), + array('cdata',array(null)), + array('p_close',array()), + array('document_end',array()), + ); + $this->assertEquals(array_map('stripbyteindex',$parser_response),$calls); + + $Renderer = new Doku_Renderer_xhtml(); + $url = $Renderer->externalmedia($file,null,null,null,null,'cache','details',true); + //print_r("url: " . $url); + $video = ''."\n"; + $this->assertEquals(substr($url,304),$rest); + } + + /** + * unknown extension of external media file + */ + function testVideoVIDExternal() { + $file = 'http://some.where.far/away.vid'; + $parser_response = p_get_instructions('{{' . $file . '}}'); + + $calls = array( + array('document_start', array()), + array('p_open', array()), + array('externalmedia', array($file, null, null, null, null, 'cache', 'details')), + array('cdata', array(null)), + array('p_close', array()), + array('document_end', array()), + ); + $this->assertEquals(array_map('stripbyteindex', $parser_response), $calls); + + $Renderer = new Doku_Renderer_xhtml(); + $url = $Renderer->externalmedia($file, null, null, null, null, 'cache', 'details', true); + // work around random token + $a_first_part = ''; + $this->assertEquals(substr($url,0,34),$a_first_part); + $this->assertEquals(substr($url,40,121),$a_second_part); + $rest = 'away.vid'; + $this->assertEquals(substr($url,161),$rest); + } +} + +/** + * .oga: + * http://upload.wikimedia.org/wikipedia/commons/6/6b/Meow_of_a_pleading_cat.oga + * + * .wav: + * http://upload.wikimedia.org/wikipedia/commons/8/81/Meow_of_a_Siamese_cat_-_freemaster2.wav + * + * + */ -- cgit v1.2.3 From db42b6f8860359481248e9bc847b111497511d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Thu, 18 Dec 2014 10:50:08 +0100 Subject: Add test for internal video files --- _test/data/media/wiki/kind_zu_katze.ogv | Bin 0 -> 45883 bytes _test/data/media/wiki/kind_zu_katze.png | Bin 0 -> 970 bytes _test/data/media/wiki/kind_zu_katze.webm | Bin 0 -> 101529 bytes _test/tests/inc/parser/parser_media.test.php | 35 +++++++++++++++++++++++++++ 4 files changed, 35 insertions(+) create mode 100644 _test/data/media/wiki/kind_zu_katze.ogv create mode 100644 _test/data/media/wiki/kind_zu_katze.png create mode 100644 _test/data/media/wiki/kind_zu_katze.webm (limited to '_test') diff --git a/_test/data/media/wiki/kind_zu_katze.ogv b/_test/data/media/wiki/kind_zu_katze.ogv new file mode 100644 index 000000000..1ad3732dc Binary files /dev/null and b/_test/data/media/wiki/kind_zu_katze.ogv differ diff --git a/_test/data/media/wiki/kind_zu_katze.png b/_test/data/media/wiki/kind_zu_katze.png new file mode 100644 index 000000000..a5c151e3f Binary files /dev/null and b/_test/data/media/wiki/kind_zu_katze.png differ diff --git a/_test/data/media/wiki/kind_zu_katze.webm b/_test/data/media/wiki/kind_zu_katze.webm new file mode 100644 index 000000000..2973ff833 Binary files /dev/null and b/_test/data/media/wiki/kind_zu_katze.webm differ diff --git a/_test/tests/inc/parser/parser_media.test.php b/_test/tests/inc/parser/parser_media.test.php index 0b62473f8..195b95991 100644 --- a/_test/tests/inc/parser/parser_media.test.php +++ b/_test/tests/inc/parser/parser_media.test.php @@ -65,6 +65,41 @@ class TestOfDoku_Parser_Media extends TestOfDoku_Parser { $rest = 'away.vid'; $this->assertEquals(substr($url,161),$rest); } + + + function testVideoOGVInternal() { + $file = 'wiki:kind_zu_katze.ogv'; + $parser_response = p_get_instructions('{{' . $file . '}}'); + + $calls = array ( + array('document_start',array()), + array('p_open',array()), + array('internalmedia',array($file,null,null,null,null,'cache','details')), + array('cdata',array(null)), + array('p_close',array()), + array('document_end',array()), + ); + $this->assertEquals(array_map('stripbyteindex',$parser_response),$calls); + + $Renderer = new Doku_Renderer_xhtml(); + $url = $Renderer->externalmedia($file,null,null,null,null,'cache','details',true); + + $video = ''."\n"; + $this->assertEquals(substr($url,644),$rest); + } } /** -- cgit v1.2.3 From 50e07413f6c62d6593a89dcf070dffd413170aad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Thu, 18 Dec 2014 11:02:40 +0100 Subject: Fix file size --- _test/tests/inc/parser/parser_media.test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '_test') diff --git a/_test/tests/inc/parser/parser_media.test.php b/_test/tests/inc/parser/parser_media.test.php index 195b95991..e124b85e2 100644 --- a/_test/tests/inc/parser/parser_media.test.php +++ b/_test/tests/inc/parser/parser_media.test.php @@ -92,7 +92,7 @@ class TestOfDoku_Parser_Media extends TestOfDoku_Parser { $source_ogv = ''; $this->assertEquals(substr($url,212,83),$source_ogv); - $a_webm = 'kind_zu_katze.webm'; + $a_webm = 'kind_zu_katze.webm'; $a_ogv = 'kind_zu_katze.ogv'; $this->assertEquals(substr($url,296,176),$a_webm); $this->assertEquals(substr($url,472,172),$a_ogv); -- cgit v1.2.3 From 7268f44f1b278bafced8e85930ba3dd0c92b8900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Thu, 18 Dec 2014 11:39:15 +0100 Subject: Remove stray comment block --- _test/tests/inc/parser/parser_media.test.php | 10 ---------- 1 file changed, 10 deletions(-) (limited to '_test') diff --git a/_test/tests/inc/parser/parser_media.test.php b/_test/tests/inc/parser/parser_media.test.php index e124b85e2..d9a0626f5 100644 --- a/_test/tests/inc/parser/parser_media.test.php +++ b/_test/tests/inc/parser/parser_media.test.php @@ -101,13 +101,3 @@ class TestOfDoku_Parser_Media extends TestOfDoku_Parser { $this->assertEquals(substr($url,644),$rest); } } - -/** - * .oga: - * http://upload.wikimedia.org/wikipedia/commons/6/6b/Meow_of_a_pleading_cat.oga - * - * .wav: - * http://upload.wikimedia.org/wikipedia/commons/8/81/Meow_of_a_Siamese_cat_-_freemaster2.wav - * - * - */ -- cgit v1.2.3