Commit ca85441d authored by Dries's avatar Dries

Issue #2260121 by sun: PHPUnit Tests namespace of modules is ambiguous with...

Issue #2260121 by sun: PHPUnit Tests namespace of modules is ambiguous with regular runtime namespace (+ Simpletest tests).
parent ebace9e8
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\action\Tests\Menu\ActionLocalTasksTest.
* Contains \Drupal\Tests\action\Unit\Menu\ActionLocalTasksTest.
*/
namespace Drupal\action\Tests\Menu;
namespace Drupal\Tests\action\Unit\Menu;
use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\aggregator\Tests\Menu\AggregatorLocalTasksTest.
* Contains \Drupal\Tests\aggregator\Unit\Menu\AggregatorLocalTasksTest.
*/
namespace Drupal\aggregator\Tests\Menu;
namespace Drupal\Tests\aggregator\Unit\Menu;
use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\aggregator\Tests\Plugin\AggregatorPluginSettingsBaseTest
* Contains \Drupal\Tests\aggregator\Unit\Plugin\AggregatorPluginSettingsBaseTest
*/
namespace Drupal\aggregator\Tests\Plugin {
namespace Drupal\Tests\aggregator\Unit\Plugin {
use Drupal\aggregator\Form\SettingsForm;
use Drupal\Core\Form\FormState;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\block\Tests\BlockConfigEntityUnitTest.
* Contains \Drupal\Tests\block\Unit\BlockConfigEntityUnitTest.
*/
namespace Drupal\block\Tests;
namespace Drupal\Tests\block\Unit;
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Tests\Core\Plugin\Fixtures\TestConfigurablePlugin;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\block\Tests\BlockFormTest.
* Contains \Drupal\Tests\block\Unit\BlockFormTest.
*/
namespace Drupal\block\Tests;
namespace Drupal\Tests\block\Unit;
use Drupal\block\BlockForm;
use Drupal\Tests\UnitTestCase;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\block\Tests\CategoryAutocompleteTest.
* Contains \Drupal\Tests\block\Unit\CategoryAutocompleteTest.
*/
namespace Drupal\block\Tests;
namespace Drupal\Tests\block\Unit;
use Drupal\block\Controller\CategoryAutocompleteController;
use Drupal\Component\Utility\String;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\block\Tests\Menu\BlockLocalTasksTest.
* Contains \Drupal\Tests\block\Unit\Menu\BlockLocalTasksTest.
*/
namespace Drupal\block\Tests\Menu;
namespace Drupal\Tests\block\Unit\Menu;
use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
use Symfony\Component\DependencyInjection\ContainerBuilder;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\block\Tests\Plugin\DisplayVariant\FullPageVariantTest.
* Contains \Drupal\Tests\block\Unit\Plugin\DisplayVariant\FullPageVariantTest.
*/
namespace Drupal\block\Tests\Plugin\DisplayVariant;
namespace Drupal\Tests\block\Unit\Plugin\DisplayVariant;
use Drupal\Tests\UnitTestCase;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\block_content\Tests\Menu\BlockContentLocalTasksTest.
* Contains \Drupal\Tests\block_content\Unit\Menu\BlockContentLocalTasksTest.
*/
namespace Drupal\block_content\Tests\Menu;
namespace Drupal\Tests\block_content\Unit\Menu;
use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
use Symfony\Component\DependencyInjection\ContainerBuilder;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\book\Tests\BookManagerTest.
* Contains \Drupal\Tests\book\Unit\BookManagerTest.
*/
namespace Drupal\book\Tests;
namespace Drupal\Tests\book\Unit;
use Drupal\book\BookManager;
use Drupal\Tests\UnitTestCase;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\book\Tests\Menu\BookLocalTasksTest.
* Contains \Drupal\Tests\book\Unit\Menu\BookLocalTasksTest.
*/
namespace Drupal\book\Tests\Menu;
namespace Drupal\Tests\book\Unit\Menu;
use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\breakpoint\Tests\BreakpointTest.
* Contains \Drupal\Tests\breakpoint\Unit\BreakpointTest.
*/
namespace Drupal\breakpoint\Tests;
namespace Drupal\Tests\breakpoint\Unit;
use Drupal\breakpoint\Breakpoint;
use Drupal\Tests\UnitTestCase;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\comment\Tests\CommentLinkBuilderTest.
* Contains \Drupal\Tests\comment\Unit\CommentLinkBuilderTest.
*/
namespace Drupal\comment\Tests;
namespace Drupal\Tests\comment\Unit;
use Drupal\comment\CommentLinkBuilder;
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\comment\Tests\CommentManagerTest.
* Contains \Drupal\Tests\comment\Unit\CommentManagerTest.
*/
namespace Drupal\comment\Tests;
namespace Drupal\Tests\comment\Unit;
use Drupal\comment\CommentManager;
use Drupal\Tests\UnitTestCase;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\comment\Tests\CommentStatisticsTest.
* Contains \Drupal\Tests\comment\Unit\CommentStatisticsTest.
*/
namespace Drupal\comment\Tests;
namespace Drupal\Tests\comment\Unit;
use Drupal\comment\CommentStatistics;
use Drupal\Tests\UnitTestCase;
......
<?php
/**
* @file
* Contains \Drupal\comment\Tests\Entity\CommentTest
* Contains \Drupal\Tests\comment\Unit\Entity\CommentTest
*/
namespace Drupal\comment\Tests\Entity;
namespace Drupal\Tests\comment\Unit\Entity;
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Core\Entity\EntityType;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\config\Tests\Menu\ConfigLocalTasksTest.
* Contains \Drupal\Tests\config\Unit\Menu\ConfigLocalTasksTest.
*/
namespace Drupal\config\Tests\Menu;
namespace Drupal\Tests\config\Unit\Menu;
use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\config_translation\Tests\ConfigEntityMapperTest.
* Contains \Drupal\Tests\config_translation\Unit\ConfigEntityMapperTest.
*/
namespace Drupal\config_translation\Tests;
namespace Drupal\Tests\config_translation\Unit;
use Drupal\config_translation\ConfigEntityMapper;
use Drupal\Tests\UnitTestCase;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\config_translation\Tests\ConfigMapperManagerTest.
* Contains \Drupal\Tests\config_translation\Unit\ConfigMapperManagerTest.
*/
namespace Drupal\config_translation\Tests;
namespace Drupal\Tests\config_translation\Unit;
use Drupal\config_translation\ConfigMapperManager;
use Drupal\Core\Language\Language;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\config_translation\Tests\ConfigNamesMapperTest.
* Contains \Drupal\Tests\config_translation\Unit\ConfigNamesMapperTest.
*/
namespace Drupal\config_translation\Tests;
namespace Drupal\Tests\config_translation\Unit;
use Drupal\config_translation\ConfigNamesMapper;
use Drupal\Core\Config\ConfigFactoryInterface;
......@@ -33,7 +33,7 @@ class ConfigNamesMapperTest extends UnitTestCase {
*
* @see \Drupal\config_translation\ConfigNamesMapper
*
* @var \Drupal\config_translation\Tests\TestConfigNamesMapper
* @var \Drupal\Tests\config_translation\Unit\TestConfigNamesMapper
*/
protected $configNamesMapper;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\content_translation\Tests\Access\ContentTranslationManageAccessCheckTest.
* Contains \Drupal\Tests\content_translation\Unit\Access\ContentTranslationManageAccessCheckTest.
*/
namespace Drupal\content_translation\Tests\Access;
namespace Drupal\Tests\content_translation\Unit\Access;
use Drupal\content_translation\Access\ContentTranslationManageAccessCheck;
use Drupal\Core\Access\AccessInterface;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\block\Tests\Menu\BlockLocalTasksTest.
* Contains \Drupal\Tests\block\Unit\Menu\BlockLocalTasksTest.
*/
namespace Drupal\content_translation\Tests\Menu;
namespace Drupal\Tests\content_translation\Unit\Menu;
use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\editor\Tests\EditorConfigEntityUnitTest.
* Contains \Drupal\Tests\editor\Unit\EditorConfigEntityUnitTest.
*/
namespace Drupal\editor\Tests;
namespace Drupal\Tests\editor\Unit;
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\editor\Entity\Editor;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\editor\Tests\EditorXssFilter\StandardTest.
* Contains \Drupal\Tests\editor\Unit\EditorXssFilter\StandardTest.
*/
namespace Drupal\editor\Tests\EditorXssFilter;
namespace Drupal\Tests\editor\Unit\EditorXssFilter;
use Drupal\Tests\UnitTestCase;
use Drupal\filter\Plugin\FilterInterface;
......@@ -62,7 +62,7 @@ protected function setUp() {
* Drupal\Component\Utility\Xss. See \Drupal\Tests\Component\Utility\XssTest::testBlacklistMode()
* for more detailed test coverage.
*
* @see \Drupal\editor\Tests\editor\EditorXssFilter\StandardTest::testFilterXss()
* @see \Drupal\Tests\editor\Unit\editor\EditorXssFilter\StandardTest::testFilterXss()
* @see \Drupal\Tests\Component\Utility\XssTest::testBlacklistMode()
*/
public function providerTestFilterXss() {
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\field\Tests\FieldInstanceConfigEntityUnitTest.
* Contains \Drupal\Tests\field\Unit\FieldInstanceConfigEntityUnitTest.
*/
namespace Drupal\field\Tests;
namespace Drupal\Tests\field\Unit;
use Drupal\Core\Language\LanguageInterface;
use Drupal\Core\DependencyInjection\ContainerBuilder;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\field\Tests\FieldStorageConfigEntityUnitTest.
* Contains \Drupal\Tests\field\Unit\FieldStorageConfigEntityUnitTest.
*/
namespace Drupal\field\Tests;
namespace Drupal\Tests\field\Unit;
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\field\Entity\FieldStorageConfig;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\forum\Tests\Breadcrumb\ForumBreadcrumbBuilderBaseTest.
* Contains \Drupal\Tests\forum\Unit\Breadcrumb\ForumBreadcrumbBuilderBaseTest.
*/
namespace Drupal\forum\Tests\Breadcrumb;
namespace Drupal\Tests\forum\Unit\Breadcrumb;
use Drupal\Core\Link;
use Drupal\Tests\UnitTestCase;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\forum\Tests\Breadcrumb\ForumListingBreadcrumbBuilderTest.
* Contains \Drupal\Tests\forum\Unit\Breadcrumb\ForumListingBreadcrumbBuilderTest.
*/
namespace Drupal\forum\Tests\Breadcrumb;
namespace Drupal\Tests\forum\Unit\Breadcrumb;
use Drupal\Core\Link;
use Drupal\Tests\UnitTestCase;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\forum\Tests\Breadcrumb\ForumNodeBreadcrumbBuilderTest.
* Contains \Drupal\Tests\forum\Unit\Breadcrumb\ForumNodeBreadcrumbBuilderTest.
*/
namespace Drupal\forum\Tests\Breadcrumb;
namespace Drupal\Tests\forum\Unit\Breadcrumb;
use Drupal\Core\Link;
use Drupal\Tests\UnitTestCase;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\forum\Tests\ForumManagerTest.
* Contains \Drupal\Tests\forum\Unit\ForumManagerTest.
*/
namespace Drupal\forum\Tests;
namespace Drupal\Tests\forum\Unit;
use Drupal\Tests\UnitTestCase;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\hal\Tests\FieldItemNormalizerDenormalizeExceptionsUnitTest.
* Contains \Drupal\Tests\hal\Unit\FieldItemNormalizerDenormalizeExceptionsUnitTest.
*/
namespace Drupal\hal\Tests;
namespace Drupal\Tests\hal\Unit;
use Drupal\hal\Normalizer\FieldItemNormalizer;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\hal\Tests\FieldNormalizerDenormalizeExceptionsUnitTest.
* Contains \Drupal\Tests\hal\Unit\FieldNormalizerDenormalizeExceptionsUnitTest.
*/
namespace Drupal\hal\Tests;
namespace Drupal\Tests\hal\Unit;
use Drupal\hal\Normalizer\FieldNormalizer;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\hal\Tests\NormalizerDenormalizeExceptionsUnitTestBase.
* Contains \Drupal\Tests\hal\Unit\NormalizerDenormalizeExceptionsUnitTestBase.
*/
namespace Drupal\hal\Tests;
namespace Drupal\Tests\hal\Unit;
use Drupal\Tests\UnitTestCase;
......
<?php
/**
* @file
* Contains \Drupal\language\Tests\ConfigurableLanguageUnitTest.
* Contains \Drupal\Tests\language\Unit\ConfigurableLanguageUnitTest.
*/
namespace Drupal\language\Tests;
namespace Drupal\Tests\language\Unit;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\Tests\UnitTestCase;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\language\Tests\LanguageNegotiationUrlTest.
* Contains \Drupal\Tests\language\Unit\LanguageNegotiationUrlTest.
*/
namespace Drupal\language\Tests;
namespace Drupal\Tests\language\Unit;
use Drupal\Core\Session\UserSession;
use Drupal\Tests\UnitTestCase;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\language\Tests\Menu\LanguageLocalTasksTest.
* Contains \Drupal\Tests\language\Unit\Menu\LanguageLocalTasksTest.
*/
namespace Drupal\language\Tests\Menu;
namespace Drupal\Tests\language\Unit\Menu;
use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\locale\Tests\LocaleLookupTest.
* Contains \Drupal\Tests\locale\Unit\LocaleLookupTest.
*/
namespace Drupal\locale\Tests;
namespace Drupal\Tests\locale\Unit;
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\locale\LocaleLookup;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\locale\Tests\LocaleTranslationTest.
* Contains \Drupal\Tests\locale\Unit\LocaleTranslationTest.
*/
namespace Drupal\locale\Tests;
namespace Drupal\Tests\locale\Unit;
use Drupal\locale\LocaleTranslation;
use Drupal\Tests\UnitTestCase;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\locale\Tests\Menu\LocaleLocalTasksTest.
* Contains \Drupal\Tests\locale\Unit\Menu\LocaleLocalTasksTest.
*/
namespace Drupal\locale\Tests\Menu;
namespace Drupal\Tests\locale\Unit\Menu;
use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\migrate\Tests\MigrateExecutableTest.
* Contains \Drupal\Tests\migrate\Unit\MigrateExecutableTest.
*/
namespace Drupal\migrate\Tests;
namespace Drupal\Tests\migrate\Unit;
use Drupal\migrate\Entity\MigrationInterface;
use Drupal\migrate\Plugin\MigrateIdMapInterface;
......@@ -13,7 +13,7 @@
use Drupal\migrate\Row;
/**
* @coversDefaultClass \Drupal\migrate\Tests\MigrateExecutableTest
* @coversDefaultClass \Drupal\Tests\migrate\Unit\MigrateExecutableTest
* @group migrate
*/
class MigrateExecutableTest extends MigrateTestCase {
......@@ -35,7 +35,7 @@ class MigrateExecutableTest extends MigrateTestCase {
/**
* The tested migrate executable.
*
* @var \Drupal\migrate\Tests\TestMigrateExecutable
* @var \Drupal\Tests\migrate\Unit\TestMigrateExecutable
*/
protected $executable;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\migrate\Tests\MigrateExecuteableMemoryExceeded.
* Contains \Drupal\Tests\migrate\Unit\MigrateExecuteableMemoryExceeded.
*/
namespace Drupal\migrate\Tests;
namespace Drupal\Tests\migrate\Unit;
/**
* Tests the \Drupal\migrate\MigrateExecutable::memoryExceeded() method.
......@@ -31,7 +31,7 @@ class MigrateExecuteableMemoryExceededTest extends MigrateTestCase {
/**
* The tested migrate executable.
*
* @var \Drupal\migrate\Tests\TestMigrateExecutable
* @var \Drupal\Tests\migrate\Unit\TestMigrateExecutable
*/
protected $executable;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\migrate\Tests\MigrateSqlIdMapEnsureTablesTest.
* Contains \Drupal\Tests\migrate\Unit\MigrateSqlIdMapEnsureTablesTest.
*/
namespace Drupal\migrate\Tests;
namespace Drupal\Tests\migrate\Unit;
use Drupal\migrate\Plugin\MigrateIdMapInterface;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\migrate\Tests\MigrateSqlIdMapTestCase.
* Contains \Drupal\Tests\migrate\Unit\MigrateSqlIdMapTestCase.
*/
namespace Drupal\migrate\Tests;
namespace Drupal\Tests\migrate\Unit;
use Drupal\migrate\Entity\MigrationInterface;
use Drupal\migrate\MigrateException;
......@@ -54,7 +54,7 @@ class MigrateSqlIdMapTest extends MigrateTestCase {
* @param string $prefix
* (optional) The database prefix.
*
* @return \Drupal\migrate\Tests\TestSqlIdMap
* @return \Drupal\Tests\migrate\Unit\TestSqlIdMap
* A SQL ID map plugin test instance.