Skip to content

Update the signatures of the identified provider methods to include the static keyword #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ctam wants to merge 1 commit into
base: MOODLE_501_DEV
Choose a base branch
from
Open

Update the signatures of the identified provider methods to include the static keyword #503

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 41 additions & 41 deletions local/kaltura/tests/locallib_test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class local_kaltura_locallib_testcase extends advanced_testcase {
/**
* A Dataprovider method, providing invalid data.
*/
public function mymedia_test_required_param_fail() {
public static function mymedia_test_required_param_fail() {
$data = array(
array(
array(
Expand Down Expand Up @@ -217,7 +217,7 @@ public function test_local_kaltura_validate_mymedia_required_params_fail($data)
/**
* A Dataprovider method, providing invalid data.
*/
public function mediagallery_test_required_param_fail() {
public static function mediagallery_test_required_param_fail() {
$data = array(
array(
array(
Expand Down Expand Up @@ -418,7 +418,7 @@ public function test_local_kaltura_validate_coursegallery_required_params() {
/**
* A Dataprovider method, providing invalid data.
*/
public function browseembed_test_required_param_fail() {
public static function browseembed_test_required_param_fail() {
$data = array(
array(
array(
Expand Down Expand Up @@ -631,7 +631,7 @@ public function test_local_kaltura_get_lti_launch_container() {
/**
* Data provider for different KAF service names.
*/
public function module_name_test_fail() {
public static function module_name_test_fail() {
$data = array(
array('nothing'),
array(''),
Expand All @@ -654,7 +654,7 @@ public function test_local_kaltura_validate_kaf_module_request_fail($data) {
/**
* Data provider for different KAF service names.
*/
public function module_name_test() {
public static function module_name_test() {
$data = array(
array('mymedia'),
array('coursegallery'),
Expand Down Expand Up @@ -716,21 +716,21 @@ public function test_local_kaltura_format_lti_instance_object() {

$result = local_kaltura_format_lti_instance_object($param);

$this->assertObjectHasAttribute('course', $result);
$this->assertObjectHasAttribute('id', $result);
$this->assertObjectHasAttribute('name', $result);
$this->assertObjectHasAttribute('intro', $result);
$this->assertObjectHasAttribute('instructorchoicesendname', $result);
$this->assertObjectHasAttribute('instructorchoicesendemailaddr', $result);
$this->assertObjectHasAttribute('instructorcustomparameters', $result);
$this->assertObjectHasAttribute('instructorchoiceacceptgrades', $result);
$this->assertObjectHasAttribute('instructorchoiceallowroster', $result);
$this->assertObjectHasAttribute('resourcekey', $result);
$this->assertObjectHasAttribute('password', $result);
$this->assertObjectHasAttribute('toolurl', $result);
$this->assertObjectHasAttribute('securetool', $result);
$this->assertObjectHasAttribute('forcessl', $result);
$this->assertObjectHasAttribute('cmid', $result);
$this->assertObjectHasProperty('course', $result);
$this->assertObjectHasProperty('id', $result);
$this->assertObjectHasProperty('name', $result);
$this->assertObjectHasProperty('intro', $result);
$this->assertObjectHasProperty('instructorchoicesendname', $result);
$this->assertObjectHasProperty('instructorchoicesendemailaddr', $result);
$this->assertObjectHasProperty('instructorcustomparameters', $result);
$this->assertObjectHasProperty('instructorchoiceacceptgrades', $result);
$this->assertObjectHasProperty('instructorchoiceallowroster', $result);
$this->assertObjectHasProperty('resourcekey', $result);
$this->assertObjectHasProperty('password', $result);
$this->assertObjectHasProperty('toolurl', $result);
$this->assertObjectHasProperty('securetool', $result);
$this->assertObjectHasProperty('forcessl', $result);
$this->assertObjectHasProperty('cmid', $result);

$this->assertEquals(1, $result->course);
$this->assertEquals(1, $result->id);
Expand Down Expand Up @@ -846,43 +846,43 @@ public function test_local_kaltura_log_data_logging_request_data() {
$this->assertTrue($result);
$record = $DB->get_record('local_kaltura_log', array('module'=> 'mymedia'));

$this->assertObjectHasAttribute('id', $record);
$this->assertObjectHasProperty('id', $record);

$this->assertObjectHasAttribute('module', $record);
$this->assertObjectHasProperty('module', $record);
$this->assertEquals(KAF_MYMEDIA_MODULE, $record->module);

$this->assertObjectHasAttribute('type', $record);
$this->assertObjectHasProperty('type', $record);
$this->assertEquals(KALTURA_LOG_REQUEST, $record->type);

$this->assertObjectHasAttribute('endpoint', $record);
$this->assertObjectHasProperty('endpoint', $record);
$this->assertEquals('http://localhost', $record->endpoint);

$this->assertObjectHasAttribute('data', $record);
$this->assertObjectHasProperty('data', $record);
$this->assertEquals(serialize($data), $record->data);

$this->assertObjectHasAttribute('timecreated', $record);
$this->assertObjectHasProperty('timecreated', $record);
$this->assertNotEquals(0, $record);

$result = local_kaltura_log_data(KAF_MEDIAGALLERY_MODULE, 'http://localhost', $data, true);
$this->assertTrue($result);

$record = $DB->get_record('local_kaltura_log', array('module'=> 'coursegallery'));

$this->assertObjectHasAttribute('id', $record);
$this->assertObjectHasProperty('id', $record);

$this->assertObjectHasAttribute('module', $record);
$this->assertObjectHasProperty('module', $record);
$this->assertEquals(KAF_MEDIAGALLERY_MODULE, $record->module);

$this->assertObjectHasAttribute('type', $record);
$this->assertObjectHasProperty('type', $record);
$this->assertEquals(KALTURA_LOG_REQUEST, $record->type);

$this->assertObjectHasAttribute('endpoint', $record);
$this->assertObjectHasProperty('endpoint', $record);
$this->assertEquals('http://localhost', $record->endpoint);

$this->assertObjectHasAttribute('data', $record);
$this->assertObjectHasProperty('data', $record);
$this->assertEquals(serialize($data), $record->data);

$this->assertObjectHasAttribute('timecreated', $record);
$this->assertObjectHasProperty('timecreated', $record);
$this->assertNotEquals(0, $record);
}

Expand All @@ -905,28 +905,28 @@ public function test_local_kaltura_log_data_logging_response_data() {

$record = $DB->get_record('local_kaltura_log', array('module'=> 'phpunit response'));

$this->assertObjectHasAttribute('id', $record);
$this->assertObjectHasProperty('id', $record);

$this->assertObjectHasAttribute('module', $record);
$this->assertObjectHasProperty('module', $record);
$this->assertEquals('phpunit response', $record->module);

$this->assertObjectHasAttribute('type', $record);
$this->assertObjectHasProperty('type', $record);
$this->assertEquals(KALTURA_LOG_RESPONSE, $record->type);

$this->assertObjectHasAttribute('endpoint', $record);
$this->assertObjectHasProperty('endpoint', $record);
$this->assertEquals('http://localhost', $record->endpoint);

$this->assertObjectHasAttribute('data', $record);
$this->assertObjectHasProperty('data', $record);
$this->assertEquals(serialize($data), $record->data);

$this->assertObjectHasAttribute('timecreated', $record);
$this->assertObjectHasProperty('timecreated', $record);
$this->assertNotEquals(0, $record);
}

/**
* Data provider for test_local_kaltura_format_uri().
*/
public function uri_format_test() {
public static function uri_format_test() {
return array(
array('http://phpunit.tests/local_kaltura/tests'),
array('http://phpunit.tests/local_kaltura/tests/'),
Expand Down Expand Up @@ -1052,7 +1052,7 @@ public function test_local_kaltura_get_kaf_publishing_data_for_admin() {
/**
* Data provider for test_local_kaltura_url_contains_configured_hostname_fail().
*/
public function uri_hostname_tests_invalid() {
public static function uri_hostname_tests_invalid() {
return array(
array('http://phpunit1.tests/local_kaltura/tests'),
array('http://phpunit.2tests/local_kaltura/tests/'),
Expand All @@ -1077,7 +1077,7 @@ public function test_local_kaltura_url_contains_configured_hostname_fail($url) {
/**
* Data provider for test_local_kaltura_url_contains_configured_hostname().
*/
public function uri_hostname_tests_valid() {
public static function uri_hostname_tests_valid() {
return array(
array('http://phpunit.tests/local_kaltura/'),
array('https://phpunit.tests/local_kaltura/tests/'),
Expand Down