Matthias Mullie has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/364446 )
Change subject: [WIP] Remove tests depending on extension
......................................................................
[WIP] Remove tests depending on extension
Bug: T169258
Change-Id: I1c2e903fb235395a8de8e0f7bf65ce07739d2930
---
M tests/common/TestsAutoLoader.php
M tests/phpunit/mocks/media/MockMediaHandlerFactory.php
D tests/phpunit/mocks/media/MockOggHandler.php
3 files changed, 0 insertions(+), 107 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/46/364446/1
diff --git a/tests/common/TestsAutoLoader.php b/tests/common/TestsAutoLoader.php
index 3de3ba7..37d5f39 100644
--- a/tests/common/TestsAutoLoader.php
+++ b/tests/common/TestsAutoLoader.php
@@ -157,7 +157,6 @@
'MockImageHandler' =>
"$testDir/phpunit/mocks/media/MockImageHandler.php",
'MockSvgHandler' => "$testDir/phpunit/mocks/media/MockSvgHandler.php",
'MockDjVuHandler' => "$testDir/phpunit/mocks/media/MockDjVuHandler.php",
- 'MockOggHandler' => "$testDir/phpunit/mocks/media/MockOggHandler.php",
'MockMediaHandlerFactory' =>
"$testDir/phpunit/mocks/media/MockMediaHandlerFactory.php",
'MockChangesListFilter' =>
"$testDir/phpunit/mocks/MockChangesListFilter.php",
'MockChangesListFilterGroup' =>
"$testDir/phpunit/mocks/MockChangesListFilterGroup.php",
diff --git a/tests/phpunit/mocks/media/MockMediaHandlerFactory.php
b/tests/phpunit/mocks/media/MockMediaHandlerFactory.php
index 54d46b0..908b47b 100644
--- a/tests/phpunit/mocks/media/MockMediaHandlerFactory.php
+++ b/tests/phpunit/mocks/media/MockMediaHandlerFactory.php
@@ -33,7 +33,6 @@
private static $overrides = [
'image/svg+xml' => MockSvgHandler::class,
'image/vnd.djvu' => MockDjVuHandler::class,
- 'application/ogg' => MockOggHandler::class,
];
public function __construct() {
diff --git a/tests/phpunit/mocks/media/MockOggHandler.php
b/tests/phpunit/mocks/media/MockOggHandler.php
deleted file mode 100644
index 99992fe..0000000
--- a/tests/phpunit/mocks/media/MockOggHandler.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * Fake handler for Ogg videos.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Media
- */
-
-class MockOggHandler extends OggHandlerTMH {
- function doTransform( $file, $dstPath, $dstUrl, $params, $flags = 0 ) {
- # Important or height handling is wrong.
- if ( !$this->normaliseParams( $file, $params ) ) {
- return new TransformParameterError( $params );
- }
-
- $srcWidth = $file->getWidth();
- $srcHeight = $file->getHeight();
-
- // Audio should not be transformed by size, give it a default
width and height
- if ( $this->isAudio( $file ) ) {
- $srcWidth = 220;
- $srcHeight = 23;
- }
-
- $params['width'] = isset( $params['width'] ) ? $params['width']
: $srcWidth;
-
- // if height overtakes width use height as max:
- $targetWidth = $params['width'];
- $targetHeight = $srcWidth == 0 ? $srcHeight : round(
$params['width'] * $srcHeight / $srcWidth );
- if ( isset( $params['height'] ) && $targetHeight >
$params['height'] ) {
- $targetHeight = $params['height'];
- $targetWidth = round( $params['height'] * $srcWidth /
$srcHeight );
- }
- $options = [
- 'file' => $file,
- 'length' => $this->getLength( $file ),
- 'offset' => $this->getOffset( $file ),
- 'width' => $targetWidth,
- 'height' => $targetHeight,
- 'isVideo' => !$this->isAudio( $file ),
- 'thumbtime' => isset(
- $params['thumbtime']
- ) ? $params['thumbtime'] : intval( $file->getLength() /
2 ),
- 'start' => isset( $params['start'] ) ? $params['start']
: false,
- 'end' => isset( $params['end'] ) ? $params['end'] :
false,
- 'fillwindow' => isset( $params['fillwindow'] ) ?
$params['fillwindow'] : false,
- 'disablecontrols' => isset ( $params['disablecontrols']
) ? $params['disablecontrols'] : false
- ];
-
- // No thumbs for audio
- if ( !$options['isVideo'] ) {
- return new TimedMediaTransformOutput( $options );
- }
-
- // Setup pointer to thumb arguments
- $options[ 'thumbUrl' ] = $dstUrl;
- $options[ 'dstPath' ] = $dstPath;
- $options[ 'path' ] = $dstPath;
-
- return new TimedMediaTransformOutput( $options );
- }
-
- function getLength( $file ) {
- if ( $this->isAudio( $file ) ) {
- return 0.99875;
- }
- return 4.3666666666667;
- }
-
- function getBitRate( $file ) {
- if ( $this->isAudio( $file ) ) {
- return 41107;
- }
- return 590013;
- }
-
- function getWebType( $file ) {
- if ( $this->isAudio( $file ) ) {
- return "audio/ogg; codecs=\"vorbis\"";
- }
- return "video/ogg; codecs=\"theora\"";
- }
-
- function getFramerate( $file ) {
- if ( $this->isAudio( $file ) ) {
- return 0;
- }
- return 30;
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/364446
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c2e903fb235395a8de8e0f7bf65ce07739d2930
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
