MDL-55091 phpunit: Following has been deprecated.

1. getMock()
2. setExpectedException()
3. checkForUnintentionallyCoveredCode renamed to beStrictAboutCoversAnnotation
4. beStrictAboutTestSize renamed to enforceTimeLimit
5. UnitTestCase class is now fully removed.
This commit is contained in:
Rajesh Taneja
2016-07-26 10:11:30 +08:00
parent 165b70a16a
commit 52f3e060e4
80 changed files with 806 additions and 560 deletions
-193
View File
@@ -1,193 +0,0 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle 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 3 of the License, or
// (at your option) any later version.
//
// Moodle 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 Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Legacy SimpleTest layer.
*
* @deprecated since 2.3
* @package core
* @category phpunit
* @author Petr Skoda
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
/**
* Simplified emulation test case for legacy SimpleTest.
*
* Note: this is supposed to work for very simple tests only.
*
* @deprecated since 2.3
* @package core
* @category phpunit
* @author Petr Skoda
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
abstract class UnitTestCase extends PHPUnit_Framework_TestCase {
/**
* @deprecated since 2.3
* @param bool $expected
* @param string $message
* @return void
*/
public function expectException($expected, $message = '') {
// alternatively use phpdocs: @expectedException ExceptionClassName
if (!$expected) {
return;
}
$this->setExpectedException('moodle_exception', $message);
}
/**
* @deprecated since 2.3
* @param bool $expected
* @param string $message
* @return void
*/
public function expectError($expected = false, $message = '') {
// alternatively use phpdocs: @expectedException PHPUnit_Framework_Error
if (!$expected) {
return;
}
$this->setExpectedException('PHPUnit_Framework_Error', $message);
}
/**
* @deprecated since 2.3
* @static
* @param mixed $actual
* @param string $messages
* @return void
*/
public static function assertTrue($actual, $messages = '') {
parent::assertTrue((bool)$actual, $messages);
}
/**
* @deprecated since 2.3
* @static
* @param mixed $actual
* @param string $messages
* @return void
*/
public static function assertFalse($actual, $messages = '') {
parent::assertFalse((bool)$actual, $messages);
}
/**
* @deprecated since 2.3
* @static
* @param mixed $expected
* @param mixed $actual
* @param string $message
* @return void
*/
public static function assertEqual($expected, $actual, $message = '') {
parent::assertEquals($expected, $actual, $message);
}
/**
* @deprecated since 2.3
* @static
* @param mixed $expected
* @param mixed $actual
* @param float|int $margin
* @param string $message
* @return void
*/
public static function assertWithinMargin($expected, $actual, $margin, $message = '') {
parent::assertEquals($expected, $actual, '', $margin, $message);
}
/**
* @deprecated since 2.3
* @static
* @param mixed $expected
* @param mixed $actual
* @param string $message
* @return void
*/
public static function assertNotEqual($expected, $actual, $message = '') {
parent::assertNotEquals($expected, $actual, $message);
}
/**
* @deprecated since 2.3
* @static
* @param mixed $expected
* @param mixed $actual
* @param string $message
* @return void
*/
public static function assertIdentical($expected, $actual, $message = '') {
parent::assertSame($expected, $actual, $message);
}
/**
* @deprecated since 2.3
* @static
* @param mixed $expected
* @param mixed $actual
* @param string $message
* @return void
*/
public static function assertNotIdentical($expected, $actual, $message = '') {
parent::assertNotSame($expected, $actual, $message);
}
/**
* @deprecated since 2.3
* @static
* @param mixed $actual
* @param mixed $expected
* @param string $message
* @return void
*/
public static function assertIsA($actual, $expected, $message = '') {
if ($expected === 'array') {
parent::assertEquals('array', gettype($actual), $message);
} else {
parent::assertInstanceOf($expected, $actual, $message);
}
}
/**
* @deprecated since 2.3
* @static
* @param mixed $pattern
* @param mixed $string
* @param string $message
* @return void
*/
public static function assertPattern($pattern, $string, $message = '') {
parent::assertRegExp($pattern, $string, $message);
}
/**
* @deprecated since 2.3
* @static
* @param mixed $pattern
* @param mixed $string
* @param string $message
* @return void
*/
public static function assertNotPattern($pattern, $string, $message = '') {
parent::assertNotRegExp($pattern, $string, $message);
}
}
-1
View File
@@ -35,7 +35,6 @@ require_once(__DIR__.'/classes/basic_testcase.php');
require_once(__DIR__.'/classes/database_driver_testcase.php');
require_once(__DIR__.'/classes/arraydataset.php');
require_once(__DIR__.'/classes/advanced_testcase.php');
require_once(__DIR__.'/classes/unittestcase.php');
require_once(__DIR__.'/classes/hint_resultprinter.php'); // Loaded here because phpunit.xml does not support relative links for printerFile.
require_once(__DIR__.'/classes/constraint_object_is_equal_with_exceptions.php');
require_once(__DIR__.'/../testing/classes/test_lock.php');
+1 -1
View File
@@ -296,7 +296,7 @@ class core_phpunit_advanced_testcase extends advanced_testcase {
} catch (moodle_exception $e) {
$this->assertInstanceOf('dml_exception', $e);
}
$DB = $this->getMock(get_class($DB));
$DB = $this->createMock(get_class($DB));
$this->assertNull($DB->get_record('pokus', array()));
// Rest continues after reset.
}