commit c15f9e3d2a877c6cdb0d2deec9db90187d04816a Author: Joel Pittet Date: Sat Sep 12 12:29:09 2015 -0700 less change diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php index e72f4ca..db99715 100644 --- a/core/modules/simpletest/src/TestBase.php +++ b/core/modules/simpletest/src/TestBase.php @@ -654,7 +654,7 @@ protected function assertNotNull($value, $message = '', $group = 'Other') { * translate this string. Defaults to 'Other'; most tests do not override * this default. * - * @return + * @return bool * TRUE if the assertion succeeded, FALSE otherwise. */ protected function assertEqual($first, $second, $message = '', $group = 'Other') { diff --git a/core/modules/views/src/Tests/ModuleTest.php b/core/modules/views/src/Tests/ModuleTest.php index 7adb05f..eae011a 100644 --- a/core/modules/views/src/Tests/ModuleTest.php +++ b/core/modules/views/src/Tests/ModuleTest.php @@ -157,23 +157,23 @@ public function testLoadFunctions() { $all_views = $storage->loadMultiple(); // Test Views::getAllViews(). - $this->assertIdenticalWithSafeStrings(array_keys($all_views), array_keys(Views::getAllViews()), 'Views::getAllViews works as expected.'); + $this->assertIdentical(array_keys($all_views), array_keys(Views::getAllViews()), 'Views::getAllViews works as expected.'); // Test Views::getEnabledViews(). $expected_enabled = array_filter($all_views, function($view) { return views_view_is_enabled($view); }); - $this->assertIdenticalWithSafeStrings(array_keys($expected_enabled), array_keys(Views::getEnabledViews()), 'Expected enabled views returned.'); + $this->assertIdentical(array_keys($expected_enabled), array_keys(Views::getEnabledViews()), 'Expected enabled views returned.'); // Test Views::getDisabledViews(). $expected_disabled = array_filter($all_views, function($view) { return views_view_is_disabled($view); }); - $this->assertIdenticalWithSafeStrings(array_keys($expected_disabled), array_keys(Views::getDisabledViews()), 'Expected disabled views returned.'); + $this->assertIdentical(array_keys($expected_disabled), array_keys(Views::getDisabledViews()), 'Expected disabled views returned.'); // Test Views::getViewsAsOptions(). // Test the $views_only parameter. - $this->assertIdenticalWithSafeStrings(array_keys($all_views), array_keys(Views::getViewsAsOptions(TRUE)), 'Expected option keys for all views were returned.'); + $this->assertIdentical(array_keys($all_views), array_keys(Views::getViewsAsOptions(TRUE)), 'Expected option keys for all views were returned.'); $expected_options = array(); foreach ($all_views as $id => $view) { $expected_options[$id] = $view->label(); @@ -190,7 +190,7 @@ public function testLoadFunctions() { // Test the sort parameter. $all_views_sorted = $all_views; ksort($all_views_sorted); - $this->assertIdenticalWithSafeStrings(array_keys($all_views_sorted), array_keys(Views::getViewsAsOptions(TRUE, 'all', NULL, FALSE, TRUE)), 'All view id keys returned in expected sort order'); + $this->assertIdentical(array_keys($all_views_sorted), array_keys(Views::getViewsAsOptions(TRUE, 'all', NULL, FALSE, TRUE)), 'All view id keys returned in expected sort order'); // Test $exclude_view parameter. $this->assertFalse(array_key_exists('archive', Views::getViewsAsOptions(TRUE, 'all', 'archive')), 'View excluded from options based on name');