#2034 - Add webm and ogv as valid movie types.

- added them to legal_file helper
- revised unit tests
This commit is contained in:
shadlaws
2013-03-03 00:16:38 +01:00
parent d213ef3d3f
commit e7b224461a
2 changed files with 9 additions and 8 deletions

View File

@@ -37,7 +37,7 @@ class Legal_File_Helper_Test extends Gallery_Unit_Test_Case {
$this->assert_equal(null, legal_file::get_movie_types_by_extension("php.flv")); // invalid w/ .
// No extension returns full array
$this->assert_equal(3, count(legal_file::get_movie_types_by_extension()));
$this->assert_equal(5, count(legal_file::get_movie_types_by_extension()));
}
public function get_types_by_extension_test() {
@@ -47,7 +47,7 @@ class Legal_File_Helper_Test extends Gallery_Unit_Test_Case {
$this->assert_equal(null, legal_file::get_types_by_extension("php.flv")); // invalid w/ .
// No extension returns full array
$this->assert_equal(7, count(legal_file::get_types_by_extension()));
$this->assert_equal(9, count(legal_file::get_types_by_extension()));
}
public function get_photo_extensions_test() {
@@ -69,7 +69,7 @@ class Legal_File_Helper_Test extends Gallery_Unit_Test_Case {
$this->assert_equal(false, legal_file::get_movie_extensions("php.jpg")); // invalid w/ .
// No extension returns full array
$this->assert_equal(3, count(legal_file::get_movie_extensions()));
$this->assert_equal(5, count(legal_file::get_movie_extensions()));
}
public function get_extensions_test() {
@@ -79,12 +79,12 @@ class Legal_File_Helper_Test extends Gallery_Unit_Test_Case {
$this->assert_equal(false, legal_file::get_extensions("php.jpg")); // invalid w/ .
// No extension returns full array
$this->assert_equal(7, count(legal_file::get_extensions()));
$this->assert_equal(9, count(legal_file::get_extensions()));
}
public function get_filters_test() {
// All 7 extensions both uppercase and lowercase
$this->assert_equal(14, count(legal_file::get_filters()));
// All 9 extensions both uppercase and lowercase
$this->assert_equal(18, count(legal_file::get_filters()));
}
public function get_photo_types_test() {
@@ -94,7 +94,7 @@ class Legal_File_Helper_Test extends Gallery_Unit_Test_Case {
public function get_movie_types_test() {
// Note that this is one *more* than movie extensions since video/flv is added.
$this->assert_equal(4, count(legal_file::get_movie_types()));
$this->assert_equal(6, count(legal_file::get_movie_types()));
}
public function change_extension_test() {