commit de480997a53cf28fb56a1003af369a6fa7c1be68 Author: beejeebus Date: Mon Dec 15 09:26:11 2014 -0500 random fucken schema installs for franken-tests diff --git a/core/modules/field/src/Tests/FieldAttachOtherTest.php b/core/modules/field/src/Tests/FieldAttachOtherTest.php index f3b0f67..af92af7 100644 --- a/core/modules/field/src/Tests/FieldAttachOtherTest.php +++ b/core/modules/field/src/Tests/FieldAttachOtherTest.php @@ -20,7 +20,6 @@ class FieldAttachOtherTest extends FieldUnitTestBase { protected function setUp() { parent::setUp(); - $this->installSchema('system', array('router')); $this->container->get('router.builder')->rebuild(); $this->installEntitySchema('entity_test_rev'); $this->createFieldWithStorage(); diff --git a/core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php b/core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php index 188cceb..e1bd163 100644 --- a/core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php +++ b/core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php @@ -27,9 +27,9 @@ class FieldImportDeleteUninstallTest extends FieldUnitTestBase { protected function setUp() { parent::setUp(); // Module uninstall requires the router and users_data tables. + // FieldUnitTestBase already install the router table. // @see drupal_flush_all_caches() // @see user_modules_uninstalled() - $this->installSchema('system', array('router')); $this->installSchema('user', array('users_data')); } diff --git a/core/modules/options/src/Tests/OptionsFieldUnitTestBase.php b/core/modules/options/src/Tests/OptionsFieldUnitTestBase.php index a254a0a..fcfe4f8 100644 --- a/core/modules/options/src/Tests/OptionsFieldUnitTestBase.php +++ b/core/modules/options/src/Tests/OptionsFieldUnitTestBase.php @@ -55,7 +55,6 @@ */ protected function setUp() { parent::setUp(); - $this->installSchema('system', array('router')); $this->container->get('router.builder')->rebuild(); $this->fieldStorageDefinition = array( diff --git a/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php b/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php index adddda1..6161326 100644 --- a/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php +++ b/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php @@ -63,7 +63,6 @@ protected function setUp() { parent::setUp(); - $this->installSchema('system', array('router')); \Drupal::service('router.builder')->rebuild(); } diff --git a/core/modules/system/src/Tests/Module/ModuleImplementsAlterTest.php b/core/modules/system/src/Tests/Module/ModuleImplementsAlterTest.php index af8f58d..5a8186d 100644 --- a/core/modules/system/src/Tests/Module/ModuleImplementsAlterTest.php +++ b/core/modules/system/src/Tests/Module/ModuleImplementsAlterTest.php @@ -16,6 +16,8 @@ */ class ModuleImplementsAlterTest extends KernelTestBase { + public static $modules = array('system'); + protected function setUp() { parent::setUp(); $this->installSchema('system', array('router')); diff --git a/core/modules/views/src/Tests/Plugin/RelationshipJoinTestBase.php b/core/modules/views/src/Tests/Plugin/RelationshipJoinTestBase.php index 17e074c..ebc597d 100644 --- a/core/modules/views/src/Tests/Plugin/RelationshipJoinTestBase.php +++ b/core/modules/views/src/Tests/Plugin/RelationshipJoinTestBase.php @@ -38,8 +38,6 @@ protected function setUpFixtures() { parent::setUpFixtures(); // Create a record for uid 1. - $this->installSchema('system', 'sequences'); - $this->installSchema('system', 'router'); $this->root_user = entity_create('user', array('name' => $this->randomMachineName())); $this->root_user->save(); diff --git a/core/modules/views/src/Tests/ViewUnitTestBase.php b/core/modules/views/src/Tests/ViewUnitTestBase.php index 9486a48..a704cd4 100644 --- a/core/modules/views/src/Tests/ViewUnitTestBase.php +++ b/core/modules/views/src/Tests/ViewUnitTestBase.php @@ -34,6 +34,7 @@ protected function setUp() { parent::setUp(); + $this->installSchema('system', array('router', 'sequences')); $this->setUpFixtures(); } @@ -48,9 +49,6 @@ protected function setUpFixtures() { \Drupal::state()->set('views_test_data_schema', $this->schemaDefinition()); \Drupal::state()->set('views_test_data_views_data', $this->viewsData()); - // The router table is required for router rebuilds. - $this->installSchema('system', array('router')); - $this->installConfig(array('views', 'views_test_config', 'views_test_data')); foreach ($this->schemaDefinition() as $table => $schema) { $this->installSchema('views_test_data', $table);