Issue #1855228 by damiankloip: Move Views core module tests to their respective modules.

core/modules/comment/lib/Drupal/comment/Tests/Views/ArgumentUserUIDTest.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Comment\ArgumentUserUIDTest.
+ * Contains \Drupal\comment\Tests\Views\ArgumentUserUIDTest.
  */
 
-namespace Drupal\views\Tests\Comment;
+namespace Drupal\comment\Tests\Views;
 
 /**
  * Tests the argument_comment_user_uid handler.

core/modules/comment/lib/Drupal/comment/Tests/Views/CommentTestBase.php

@@ -2,12 +2,13 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Comment\CommentTestBase.
+ * Contains \Drupal\comment\Tests\Views\CommentTestBase.
  */
 
-namespace Drupal\views\Tests\Comment;
+namespace Drupal\comment\Tests\Views;
 
 use Drupal\views\Tests\ViewTestBase;
+use Drupal\views\Tests\ViewTestData;
 
 /**
  * Tests the argument_comment_user_uid handler.
@@ -19,11 +20,13 @@ abstract class CommentTestBase extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('comment');
+  public static $modules = array('comment', 'comment_test_views');
 
   function setUp() {
     parent::setUp();
 
+    ViewTestData::importTestViews(get_class($this), array('comment_test_views'));
+
     // Add two users, create a node with the user1 as author and another node
     // with user2 as author. For the second node add a comment from user1.
     $this->account = $this->drupalCreateUser();

core/modules/comment/lib/Drupal/comment/Tests/Views/DefaultViewRecentComments.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Comment\DefaultViewRecentComments.
+ * Contains \Drupal\comment\Tests\Views\DefaultViewRecentComments.
  */
 
-namespace Drupal\views\Tests\Comment;
+namespace Drupal\comment\Tests\Views;
 
 use Drupal\entity\DatabaseStorageController;
 use  Drupal\views\Tests\ViewTestBase;

core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Comment\FilterUserUIDTest.
+ * Contains \Drupal\comment\Tests\Views\FilterUserUIDTest.
  */
 
-namespace Drupal\views\Tests\Comment;
+namespace Drupal\comment\Tests\Views;
 
 /**
  * Tests the filter_comment_user_uid handler.

core/modules/comment/lib/Drupal/comment/Tests/Views/WizardTest.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Comment\WizardTest.
+ * Contains \Drupal\comment\Tests\Views\WizardTest.
  */
 
-namespace Drupal\views\Tests\Comment;
+namespace Drupal\comment\Tests\Views;
 
 use Drupal\views\Tests\Wizard\WizardTestBase;
 

core/modules/comment/tests/modules/comment_test_views/comment_test_views.info

@@ -0,0 +1,8 @@
+name = Comment test views
+description = Provides default views for views comment tests.
+package = Testing
+version = VERSION
+core = 8.x
+dependencies[] = comment
+dependencies[] = views
+hidden = TRUE

core/modules/comment/tests/modules/comment_test_views/comment_test_views.module

@@ -0,0 +1 @@
+<?php

core/modules/field/lib/Drupal/field/Tests/Views/ApiDataTest.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Test\Field\ApiDataTest.
+ * Contains \Drupal\field\Tests\Views\ApiDataTest.
  */
 
-namespace Drupal\views\Tests\Field;
+namespace Drupal\field\Tests\Views;
 
 /**
  * Test the produced views_data.

core/modules/field/lib/Drupal/field/Tests/Views/FieldTestBase.php

@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Test\Field\FieldTestBase.
+ * Contains \Drupal\field\Tests\Views\FieldTestBase.
  */
 
 /**
@@ -16,15 +16,23 @@
  *   - Use relationships between different entity types, for example node and the node author(user).
  */
 
-namespace Drupal\views\Tests\Field;
+namespace Drupal\field\Tests\Views;
 
 use Drupal\views\Tests\ViewTestBase;
+use Drupal\views\Tests\ViewTestData;
 
 /**
  * Provides some helper methods for testing fieldapi integration into views.
  */
 abstract class FieldTestBase extends ViewTestBase {
 
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('field_test_views');
+
   /**
    * Stores the field definitions used by the test.
    * @var array
@@ -37,6 +45,12 @@ abstract class FieldTestBase extends ViewTestBase {
    */
   public $instances;
 
+  protected function setUp() {
+    parent::setUp();
+
+    ViewTestData::importTestViews(get_class($this), array('field_test_views'));
+  }
+
   function setUpFields($amount = 3) {
     // Create three fields.
     $field_names = array();

core/modules/field/lib/Drupal/field/Tests/Views/HandlerFieldFieldTest.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Test\Field\HandlerFieldFieldTest.
+ * Contains \Drupal\field\Tests\Views\HandlerFieldFieldTest.
  */
 
-namespace Drupal\views\Tests\Field;
+namespace Drupal\field\Tests\Views;
 
 use Drupal\views\ViewExecutable;
 

core/modules/field/tests/modules/field_test_views/field_test_views.info

@@ -0,0 +1,7 @@
+name = User test views
+description = Provides default views for views user tests.
+package = Testing
+version = VERSION
+core = 8.x
+dependencies[] = views
+hidden = TRUE

core/modules/field/tests/modules/field_test_views/field_test_views.module

@@ -0,0 +1 @@
+<?php

core/modules/language/lib/Drupal/language/Tests/Views/ArgumentLanguageTest.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains Drupal\views\Tests\Language\ArgumentLanguageTest.
+ * Contains \Drupal\language\Tests\Views\ArgumentLanguageTest.
  */
 
-namespace Drupal\views\Tests\Language;
+namespace Drupal\language\Tests\Views;
 
 use Drupal\Core\Language\Language;
 

core/modules/language/lib/Drupal/language/Tests/Views/FieldLanguageTest.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains Drupal\views\Tests\Language\FieldLanguageTest.
+ * Contains \Drupal\language\Tests\Views\FieldLanguageTest.
  */
 
-namespace Drupal\views\Tests\Language;
+namespace Drupal\language\Tests\Views;
 
 use Drupal\Core\Language\Language;
 

core/modules/language/lib/Drupal/language/Tests/Views/FilterLanguageTest.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains Drupal\views\Tests\Language\FilterLanguageTest.
+ * Contains \Drupal\language\Tests\Views\FilterLanguageTest.
  */
 
-namespace Drupal\views\Tests\Language;
+namespace Drupal\language\Tests\Views;
 
 use Drupal\Core\Language\Language;
 

core/modules/language/lib/Drupal/language/Tests/Views/LanguageTestBase.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains Drupal\views\Tests\Language\LanguageTestBase.
+ * Contains \Drupal\language\Tests\Views\LanguageTestBase.
  */
 
-namespace Drupal\views\Tests\Language;
+namespace Drupal\language\Tests\Views;
 
 use Drupal\views\Tests\ViewUnitTestBase;
 use Drupal\Core\Language\Language;

core/modules/node/lib/Drupal/node/Tests/Views/FieldTypeTest.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Node\FieldTypeTest.
+ * Contains \Drupal\node\Tests\Views\FieldTypeTest.
  */
 
-namespace Drupal\views\Tests\Node;
+namespace Drupal\node\Tests\Views;
 
 /**
  * Tests the Drupal\node\Plugin\views\field\Type handler.

core/modules/node/lib/Drupal/node/Tests/Views/FilterUidRevisionTest.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Comment\FilterUidRevisionTest.
+ * Contains \Drupal\node\Tests\Views\FilterUidRevisionTest.
  */
 
-namespace Drupal\views\Tests\Node;
+namespace Drupal\node\Tests\Views;
 
 /**
  * Tests the node_uid_revision handler.

core/modules/node/lib/Drupal/node/Tests/Views/NodeTestBase.php

@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\node\Tests\Views\NodeTestBase.
+ */
+
+namespace Drupal\node\Tests\Views;
+
+use Drupal\views\Tests\ViewTestBase;
+use Drupal\views\Tests\ViewTestData;
+
+/**
+ * Base class for all node tests.
+ */
+abstract class NodeTestBase extends ViewTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('node_test_views');
+
+  protected function setUp() {
+    parent::setUp();
+
+    ViewTestData::importTestViews(get_class($this), array('node_test_views'));
+  }
+
+}

core/modules/node/lib/Drupal/node/Tests/Views/RevisionRelationships.php

@@ -2,17 +2,31 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Node\RevisionRelationships.
+ * Contains \Drupal\node\Tests\Views\RevisionRelationships.
  */
-namespace Drupal\views\Tests\Node;
+namespace Drupal\node\Tests\Views;
 
 use Drupal\views\Tests\ViewTestBase;
+use Drupal\views\Tests\ViewTestData;
 
 /**
  * Tests basic node_revision table integration into views.
  */
 class RevisionRelationships extends ViewTestBase {
 
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('node' ,'node_test_views');
+
+  protected function setUp() {
+    parent::setUp();
+
+    ViewTestData::importTestViews(get_class($this), array('node_test_views'));
+  }
+
   /**
    * Views used by this test.
    *

core/modules/node/lib/Drupal/node/Tests/Views/StatusExtraTest.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\Node\StatusExtraTest.
+ * Contains \Drupal\node\Tests\Views\StatusExtraTest.
  */
 
-namespace Drupal\views\Tests\Node;
+namespace Drupal\node\Tests\Views;
 
 /**
  * Tests the node.status_extra field handler.

core/modules/node/tests/modules/node_test_views/node_test_views.info

@@ -0,0 +1,8 @@
+name = Node test views
+description = Provides default views for views node tests.
+package = Testing
+version = VERSION
+core = 8.x
+dependencies[] = node
+dependencies[] = views
+hidden = TRUE

core/modules/node/tests/modules/node_test_views/node_test_views.module

@@ -0,0 +1 @@
+<?php

core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_type.yml

@@ -0,0 +1,20 @@
+api_version: '3.0'
+base_table: node
+core: '8'
+description: ''
+disabled: '0'
+display:
+  default:
+    display_options:
+      fields:
+        type:
+          field: type
+          id: type
+          table: node
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
+human_name: ''
+name: test_field_type
+tag: ''

core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipNodeTermDataTest.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Taxonomy\RelationshipNodeTermDataTest.
+ * Contains \Drupal\taxonomy\Tests\Views\RelationshipNodeTermDataTest.
  */
 
-namespace Drupal\views\Tests\Taxonomy;
+namespace Drupal\taxonomy\Tests\Views;
 
 /**
  * Tests the node_term_data relationship handler.

core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipRepresentativeNode.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Taxonomy\RelationshipRepresentativeNode.
+ * Contains \Drupal\taxonomy\Tests\Views\RelationshipRepresentativeNode.
  */
 
-namespace Drupal\views\Tests\Taxonomy;
+namespace Drupal\taxonomy\Tests\Views;
 
 /**
  * Tests the representative node relationship for terms.

core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyTestBase.php

@@ -2,12 +2,13 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Taxonomy\TaxonomyTestBase.
+ * Contains \Drupal\taxonomy\Tests\Views\TaxonomyTestBase.
  */
 
-namespace Drupal\views\Tests\Taxonomy;
+namespace Drupal\taxonomy\Tests\Views;
 
 use Drupal\views\Tests\ViewTestBase;
+use Drupal\views\Tests\ViewTestData;
 
 /**
  * Base class for all taxonomy tests.
@@ -19,7 +20,7 @@ abstract class TaxonomyTestBase extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('taxonomy');
+  public static $modules = array('taxonomy', 'taxonomy_test_views');
 
   /**
    * Stores the nodes used for the different tests.
@@ -46,6 +47,8 @@ abstract class TaxonomyTestBase extends ViewTestBase {
     parent::setUp();
     $this->mockStandardInstall();
 
+    ViewTestData::importTestViews(get_class($this), array('taxonomy_test_views'));
+
     $this->term1 = $this->createTerm();
     $this->term2 = $this->createTerm();
 

core/modules/taxonomy/tests/modules/taxonomy_test_views/taxonomy_test_views.info

@@ -0,0 +1,8 @@
+name = Taxonomy test views
+description = Provides default views for views taxonomy tests.
+package = Testing
+version = VERSION
+core = 8.x
+dependencies[] = taxonomy
+dependencies[] = views
+hidden = TRUE

core/modules/taxonomy/tests/modules/taxonomy_test_views/taxonomy_test_views.module

@@ -0,0 +1 @@
+<?php

core/modules/user/lib/Drupal/user/Tests/Views/AccessPermissionTest.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\User\AccessPermissionTest.
+ * Contains \Drupal\user\Tests\Views\AccessPermissionTest.
  */
 
-namespace Drupal\views\Tests\User;
+namespace Drupal\user\Tests\Views;
 
 use Drupal\user\Plugin\views\access\Permission;
 

core/modules/user/lib/Drupal/user/Tests/Views/AccessRoleTest.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\User\AccessRoleTest.
+ * Contains \Drupal\user\Tests\Views\AccessRoleTest.
  */
 
-namespace Drupal\views\Tests\User;
+namespace Drupal\user\Tests\Views;
 
 use Drupal\user\Plugin\views\access\Role;
 

core/modules/user/lib/Drupal/user/Tests/Views/AccessTestBase.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Uses\AccessTestBase.
+ * Contains \Drupal\user\Tests\Views\AccessTestBase.
  */
 
-namespace Drupal\views\Tests\User;
+namespace Drupal\user\Tests\Views;
 
 /**
  * A common test base class for the user access plugin tests.

core/modules/user/lib/Drupal/user/Tests/Views/ArgumentDefaultTest.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\User\ArgumentDefaultTest.
+ * Contains \Drupal\user\Tests\Views\ArgumentDefaultTest.
  */
 
-namespace Drupal\views\Tests\User;
+namespace Drupal\user\Tests\Views;
 
 /**
  * Tests views user argument default plugin.

core/modules/user/lib/Drupal/user/Tests/Views/ArgumentValidateTest.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\User\ArgumentValidateTest.
+ * Contains \Drupal\user\Tests\Views\ArgumentValidateTest.
  */
 
-namespace Drupal\views\Tests\User;
+namespace Drupal\user\Tests\Views;
 
 /**
  * Tests views user argument validator plugin.

core/modules/user/lib/Drupal/user/Tests/Views/HandlerArgumentUserUidTest.php

@@ -2,10 +2,10 @@
 
   /**
    * @file
-   * Definition of Drupal\views\Tests\User\HandlerArgumentUserUidTest.
+   * Contains \Drupal\user\Tests\Views\HandlerArgumentUserUidTest.
    */
 
-namespace Drupal\views\Tests\User;
+namespace Drupal\user\Tests\Views;
 
 /**
  * Tests views user uid argument handler.

core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldUserNameTest.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\User\HandlerFieldUserNameTest.
+ * Contains \Drupal\user\Tests\Views\HandlerFieldUserNameTest.
  */
 
-namespace Drupal\views\Tests\User;
+namespace Drupal\user\Tests\Views;
 
 /**
  * Tests the field username handler.

core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php

@@ -2,12 +2,13 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\User\HandlerFilterUserNameTest.
+ * Contains \Drupal\user\Tests\Views\HandlerFilterUserNameTest.
  */
 
-namespace Drupal\views\Tests\User;
+namespace Drupal\user\Tests\Views;
 
 use Drupal\views\Tests\ViewTestBase;
+use Drupal\views\Tests\ViewTestData;
 
 /**
  * Tests the handler of the user: name filter.
@@ -16,6 +17,13 @@ use Drupal\views\Tests\ViewTestBase;
  */
 class HandlerFilterUserNameTest extends ViewTestBase {
 
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('views_ui', 'user_test_views');
+
   /**
    * Views used by this test.
    *
@@ -23,13 +31,6 @@ class HandlerFilterUserNameTest extends ViewTestBase {
    */
   public static $testViews = array('test_user_name');
 
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('views_ui');
-
   /**
    * Accounts used by this test.
    *
@@ -64,6 +65,8 @@ class HandlerFilterUserNameTest extends ViewTestBase {
   protected function setUp() {
     parent::setUp();
 
+    ViewTestData::importTestViews(get_class($this), array('user_test_views'));
+
     $this->enableViewsTestModule();
 
     $this->accounts = array();

core/modules/user/lib/Drupal/user/Tests/Views/RelationshipRepresentativeNode.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\User\RelationshipRepresentativeNode.
+ * Contains \Drupal\user\Tests\Views\RelationshipRepresentativeNode.
  */
 
-namespace Drupal\views\Tests\User;
+namespace Drupal\user\Tests\Views;
 
 /**
  * Tests the representative node relationship for users.

core/modules/user/lib/Drupal/user/Tests/Views/UserTestBase.php

@@ -2,18 +2,26 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\User\UserTestBase.
+ * Contains \Drupal\user\Tests\Views\UserTestBase.
  */
 
-namespace Drupal\views\Tests\User;
+namespace Drupal\user\Tests\Views;
 
 use Drupal\views\Tests\ViewTestBase;
+use Drupal\views\Tests\ViewTestData;
 
 /**
  * @todo.
  */
 abstract class UserTestBase extends ViewTestBase {
 
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('user_test_views');
+
   /**
    * Users to use during this test.
    *
@@ -31,6 +39,8 @@ abstract class UserTestBase extends ViewTestBase {
   protected function setUp() {
     parent::setUp();
 
+    ViewTestData::importTestViews(get_class($this), array('user_test_views'));
+
     $this->users[] = $this->drupalCreateUser();
     $this->users[] = user_load(1);
     $this->nodes[] = $this->drupalCreateNode(array('uid' => $this->users[0]->uid));

core/modules/user/tests/user_test_views/user_test_views.info

@@ -0,0 +1,8 @@
+name = User test views
+description = Provides default views for views user tests.
+package = Testing
+version = VERSION
+core = 8.x
+dependencies[] = user
+dependencies[] = views
+hidden = TRUE

core/modules/user/tests/user_test_views/user_test_views.module

@@ -0,0 +1 @@
+<?php

core/modules/views/lib/Drupal/views/Tests/Node/NodeTestBase.php

@@ -1,16 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\views\Tests\Node\NodeTestBase.
- */
-
-namespace Drupal\views\Tests\Node;
-
-use Drupal\views\Tests\ViewTestBase;
-
-/**
- * Base class for all node tests.
- */
-abstract class NodeTestBase extends ViewTestBase {
-}

core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php

@@ -31,7 +31,7 @@ abstract class ViewTestBase extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    ViewTestData::importTestViews(get_class($this));
+    ViewTestData::importTestViews(get_class($this), array('views_test_config'));
   }
 
   /**

core/modules/views/lib/Drupal/views/Tests/ViewTestData.php

@@ -26,12 +26,11 @@ class ViewTestData {
    *   The name of the test class.
    * @param array $modules
    *   (optional) The module directories to look in for test views.
-   *   The views_test_config module will always be checked.
+   *   Defaults to an empty array.
    *
    * @see config_install_default_config()
    */
   public static function importTestViews($class, $modules = array()) {
-    $modules[] = 'views_test_config';
     $views = array();
     while ($class) {
       if (property_exists($class, 'testViews')) {
@@ -48,6 +47,10 @@ class ViewTestData {
       );
       foreach ($modules as $module) {
         $config_dir = drupal_get_path('module', $module) . '/test_views';
+        if (!is_dir($config_dir) || !module_exists($module)) {
+          continue;
+        }
+
         $source_storage = new FileStorage($config_dir);
         foreach ($source_storage->listAll() as $config_name) {
           list(, , $id) = explode('.', $config_name);

core/modules/views/lib/Drupal/views/Tests/ViewUnitTestBase.php

@@ -42,7 +42,7 @@ abstract class ViewUnitTestBase extends DrupalUnitTestBase {
     }
     $query->execute();
 
-    ViewTestData::importTestViews(get_class($this));
+    ViewTestData::importTestViews(get_class($this), array('views_test_config'));
   }
 
   /**