diff --git a/core/modules/views/lib/Drupal/views/Tests/Comment/ArgumentUserUIDTest.php b/core/modules/views/lib/Drupal/views/Tests/Comment/ArgumentUserUIDTest.php index 97e2da6..25fd863 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Comment/ArgumentUserUIDTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Comment/ArgumentUserUIDTest.php @@ -12,11 +12,11 @@ */ class ArgumentUserUIDTest extends CommentTestBase { - protected function setUp() { + public function setUp() { comment_add_default_comment_field('node', 'page'); parent::setUp(); } - + public static function getInfo() { return array( 'name' => 'Comment: User UID Argument', diff --git a/core/modules/views/lib/Drupal/views/Tests/Comment/FilterUserUIDTest.php b/core/modules/views/lib/Drupal/views/Tests/Comment/FilterUserUIDTest.php index 0ebf6d7..9df6220 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Comment/FilterUserUIDTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Comment/FilterUserUIDTest.php @@ -14,7 +14,7 @@ */ class FilterUserUIDTest extends CommentTestBase { - protected function setUp() { + public function setUp() { comment_add_default_comment_field('node', 'page'); parent::setUp(); } diff --git a/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php b/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php index 5a26867..20d2e70 100644 --- a/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php @@ -33,11 +33,6 @@ class DefaultViewsTest extends WebTestBase { 'glossary' => array('all'), ); - protected function setUp() { - comment_add_default_comment_field('node', 'page'); - parent::setUp(); - } - public static function getInfo() { return array( 'name' => 'Default views', @@ -46,7 +41,7 @@ public static function getInfo() { ); } - protected function setUp() { + public function setUp() { parent::setUp(); $this->vocabulary = entity_create('taxonomy_vocabulary', array( diff --git a/core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php b/core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php index 6293694..654134d 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php @@ -13,10 +13,6 @@ * Tests the field plugin base integration with the entity system. */ class FieldEntityTest extends ViewTestBase { - protected function setUp() { - comment_add_default_comment_field('node', 'page'); - parent::setUp(); - } /** * Modules to enable. @@ -25,6 +21,11 @@ protected function setUp() { */ public static $modules = array('comment'); + public function setUp() { + comment_add_default_comment_field('node', 'page'); + parent::setUp(); + } + public static function getInfo() { return array( 'name' => 'Field: Entity Api Integration', diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php index af2eb0f..49a71c8 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php @@ -40,7 +40,7 @@ class HandlerAllTest extends HandlerTestBase { 'user', ); - protected function setUp() { + public function setUp() { comment_add_default_comment_field('node', 'page'); parent::setUp(); } diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php index 49db5b7..77d9c1e 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php @@ -31,7 +31,7 @@ public static function getInfo() { ); } - protected function setUp() { + public function setUp() { parent::setUp(); comment_add_default_comment_field('node', 'page'); $this->enableViewsTestModule(); diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php b/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php index b580470..66c851c 100644 --- a/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php +++ b/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php @@ -28,9 +28,9 @@ */ protected $view; - protected function setUp() { + public function setUp() { parent::setUp(); - + $this->view = $this->getBasicView(); }