From 3c42666bfc2b02059b12bfd2d44c1bf675ede0df Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Mon, 22 Aug 2016 17:10:39 +0100
Subject: [PATCH] Issue #2787577 by alexpott, dawehner: When tests use multiple
 namespaces they should do so in a coding standards compliant way

---
 .../AggregatorPluginSettingsBaseTest.php      |  12 +--
 .../tests/src/Unit/CommentLinkBuilderTest.php |  12 +--
 .../src/Unit/LanguageNegotiationUrlTest.php   |  14 ++-
 .../tests/src/Unit/TestInfoParsingTest.php    |   8 +-
 .../Controller/ViewAjaxControllerTest.php     |   4 +-
 .../tests/src/Unit/EntityViewsDataTest.php    |  12 +--
 .../src/Unit/Plugin/Block/ViewsBlockTest.php  |  14 ++-
 .../Unit/Plugin/field/FieldPluginBaseTest.php |  14 +--
 .../views/field/EntityOperationsUnitTest.php  |   4 +-
 .../Unit/Routing/ViewPageControllerTest.php   |  14 ++-
 .../Utility/ArgumentsResolverTest.php         |  10 +-
 .../Asset/CssCollectionRendererUnitTest.php   |  86 ++++++++-------
 .../Tests/Core/Asset/CssOptimizerUnitTest.php | 100 ++++++++++--------
 .../Config/Entity/ConfigEntityStorageTest.php |  15 ++-
 .../Core/Entity/EntityResolverManagerTest.php |  35 +++---
 .../KeyValueEntityStorageTest.php             |  16 ++-
 .../Plugin/Discovery/HookDiscoveryTest.php    |  20 ++--
 .../Core/Render/Element/MachineNameTest.php   |  12 +--
 .../Session/PermissionsHashGeneratorTest.php  |  22 ++--
 .../Tests/Core/Utility/LinkGeneratorTest.php  |   4 +-
 20 files changed, 205 insertions(+), 223 deletions(-)

diff --git a/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php b/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php
index 022b7934314..87a5d934329 100644
--- a/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php
+++ b/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\aggregator\Unit\Plugin {
+namespace Drupal\Tests\aggregator\Unit\Plugin;
 
 use Drupal\aggregator\Form\SettingsForm;
 use Drupal\Core\Form\FormState;
@@ -105,11 +105,9 @@ class AggregatorPluginSettingsBaseTest extends UnitTestCase {
 
 }
 
-}
+// @todo Delete after https://www.drupal.org/node/2278383 is in.
+namespace Drupal\Core\Form;
 
-namespace {
-  // @todo Delete after https://www.drupal.org/node/1858196 is in.
-  if (!function_exists('drupal_set_message')) {
-    function drupal_set_message() {}
-  }
+if (!function_exists('drupal_set_message')) {
+  function drupal_set_message() {}
 }
diff --git a/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php b/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php
index 898e0ab57f0..61e93a11271 100644
--- a/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php
+++ b/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\comment\Unit {
+namespace Drupal\Tests\comment\Unit;
 
 use Drupal\comment\CommentLinkBuilder;
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
@@ -319,12 +319,10 @@ class CommentLinkBuilderTest extends UnitTestCase {
 
 }
 
-}
+namespace Drupal\comment;
 
-namespace {
-  if (!function_exists('history_read')) {
-    function history_read() {
-      return 0;
-    }
+if (!function_exists('history_read')) {
+  function history_read() {
+    return 0;
   }
 }
diff --git a/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php b/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php
index 8ecdbf77122..735abd67b68 100644
--- a/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php
+++ b/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\language\Unit {
+namespace Drupal\Tests\language\Unit;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Language\LanguageInterface;
@@ -252,13 +252,11 @@ class LanguageNegotiationUrlTest extends UnitTestCase {
 
 }
 
-}
-
 // @todo Remove as part of https://www.drupal.org/node/2481833.
-namespace {
-  if (!function_exists('base_path')) {
-    function base_path() {
-      return '/';
-    }
+namespace Drupal\language\Plugin\LanguageNegotiation;
+
+if (!function_exists('base_path')) {
+  function base_path() {
+    return '/';
   }
 }
diff --git a/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php b/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php
index 9a69d78af0b..58ba652aa19 100644
--- a/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php
+++ b/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php
@@ -5,7 +5,7 @@
  * Contains \Drupal\Tests\simpletest\Unit\TestInfoParsingTest.
  */
 
-namespace Drupal\Tests\simpletest\Unit {
+namespace Drupal\Tests\simpletest\Unit;
 
 use Composer\Autoload\ClassLoader;
 use Drupal\Core\Extension\Extension;
@@ -413,9 +413,7 @@ class TestTestDiscovery extends TestDiscovery {
 
 }
 
-}
-
-namespace Drupal\simpletest\Tests {
+namespace Drupal\simpletest\Tests;
 
 use Drupal\simpletest\WebTestBase;
 
@@ -426,5 +424,3 @@ use Drupal\simpletest\WebTestBase;
  */
 class ExampleSimpleTest extends WebTestBase {
 }
-
-}
diff --git a/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php b/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
index 332df31e229..d6b2a1e798d 100644
--- a/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
+++ b/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\views\Unit\Controller {
+namespace Drupal\Tests\views\Unit\Controller;
 
 use Drupal\Core\Render\RenderContext;
 use Drupal\Tests\UnitTestCase;
@@ -358,5 +358,3 @@ class ViewAjaxControllerTest extends UnitTestCase {
   }
 
 }
-
-}
diff --git a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
index 245b8f1692e..35e8613de1f 100644
--- a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
+++ b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
@@ -5,7 +5,7 @@
  * Contains \Drupal\Tests\views\Unit\EntityViewsDataTest.
  */
 
-namespace Drupal\Tests\views\Unit {
+namespace Drupal\Tests\views\Unit;
 
 use Drupal\Core\Config\Entity\ConfigEntityType;
 use Drupal\Core\Entity\ContentEntityType;
@@ -1100,12 +1100,10 @@ class TestEntityType extends EntityType {
 
 }
 
-}
+namespace Drupal\entity_test\Entity;
 
-namespace Drupal\entity_test\Entity {
-  if (!function_exists('t')) {
-    function t($string, array $args = []) {
-      return strtr($string, $args);
-    }
+if (!function_exists('t')) {
+  function t($string, array $args = []) {
+    return strtr($string, $args);
   }
 }
diff --git a/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php b/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php
index 114638a504c..bf4b1226607 100644
--- a/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\views\Unit\Plugin\Block {
+namespace Drupal\Tests\views\Unit\Plugin\Block;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Tests\UnitTestCase;
@@ -198,13 +198,11 @@ class ViewsBlockTest extends UnitTestCase {
 
 }
 
-}
+// @todo https://www.drupal.org/node/2571679 replace
+//   views_add_contextual_links().
+namespace Drupal\views\Plugin\Block;
 
-namespace {
-  // @todo https://www.drupal.org/node/2571679 replace
-  // views_add_contextual_links().
-  if (!function_exists('views_add_contextual_links')) {
-    function views_add_contextual_links() {
-    }
+if (!function_exists('views_add_contextual_links')) {
+  function views_add_contextual_links() {
   }
 }
diff --git a/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php b/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php
index 9672dc213d7..5135c4f003b 100644
--- a/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php
@@ -5,7 +5,7 @@
  * Contains \Drupal\Tests\views\Unit\Plugin\field\FieldPluginBaseTest.
  */
 
-namespace Drupal\Tests\views\Unit\Plugin\field {
+namespace Drupal\Tests\views\Unit\Plugin\field;
 
 use Drupal\Core\GeneratedUrl;
 use Drupal\Core\Language\Language;
@@ -692,12 +692,12 @@ class FieldPluginBaseTestField extends FieldPluginBase {
   }
 
 }
-}
+
 // @todo Remove as part of https://www.drupal.org/node/2529170.
-namespace {
-  if (!function_exists('base_path')) {
-    function base_path() {
-      return '/';
-    }
+namespace Drupal\views\Plugin\views\field;
+
+if (!function_exists('base_path')) {
+  function base_path() {
+    return '/';
   }
 }
diff --git a/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php b/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php
index d522bcf1585..5457baa6362 100644
--- a/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\views\Unit\Plugin\views\field {
+namespace Drupal\Tests\views\Unit\Plugin\views\field;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Plugin\views\field\EntityOperations;
@@ -165,5 +165,3 @@ class EntityOperationsUnitTest extends UnitTestCase {
   }
 
 }
-
-}
diff --git a/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php b/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php
index c0f6eb896d6..971c1c499ff 100644
--- a/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php
+++ b/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\views\Unit\Routing {
+namespace Drupal\Tests\views\Unit\Routing;
 
 use Drupal\Core\Routing\RouteMatch;
 use Drupal\Tests\UnitTestCase;
@@ -177,13 +177,11 @@ class ViewPageControllerTest extends UnitTestCase {
 
 }
 
-}
+// @todo https://www.drupal.org/node/2571679 replace
+//   views_add_contextual_links().
+namespace Drupal\views\Routing;
 
-namespace {
-  // @todo https://www.drupal.org/node/2571679 replace
-  // views_add_contextual_links()
-  if (!function_exists('views_add_contextual_links')) {
-    function views_add_contextual_links() {
-    }
+if (!function_exists('views_add_contextual_links')) {
+  function views_add_contextual_links() {
   }
 }
diff --git a/core/tests/Drupal/Tests/Component/Utility/ArgumentsResolverTest.php b/core/tests/Drupal/Tests/Component/Utility/ArgumentsResolverTest.php
index 0d6babc5585..878bbfd6d69 100644
--- a/core/tests/Drupal/Tests/Component/Utility/ArgumentsResolverTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/ArgumentsResolverTest.php
@@ -5,7 +5,7 @@
  * Contains \Drupal\Tests\Component\Utility\ArgumentsResolverTest.
  */
 
-namespace Drupal\Tests\Component\Utility {
+namespace Drupal\Tests\Component\Utility;
 
 use Drupal\Component\Utility\ArgumentsResolver;
 use Drupal\Tests\UnitTestCase;
@@ -187,7 +187,7 @@ class ArgumentsResolverTest extends UnitTestCase {
     $data = [];
     $data[] = [function($foo) {}];
     $data[] = [[new TestClass(), 'access']];
-    $data[] = ['test_access_arguments_resolver_access'];
+    $data[] = ['Drupal\Tests\Component\Utility\test_access_arguments_resolver_access'];
     return $data;
   }
 
@@ -214,9 +214,5 @@ interface TestInterface1 {
 interface TestInterface2 {
 }
 
-}
-
-namespace {
-  function test_access_arguments_resolver_access($foo) {
-  }
+function test_access_arguments_resolver_access($foo) {
 }
diff --git a/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
index 4b782130ce5..86026610535 100644
--- a/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
@@ -1,41 +1,6 @@
 <?php
 
-namespace {
-
-/**
- * CssCollectionRenderer uses file_create_url() & file_url_transform_relative(),
- * which *are* available when using the Simpletest test runner, but not when
- * using the PHPUnit test runner; hence this hack.
- */
-if (!function_exists('file_create_url')) {
-
-  /**
-   * Temporary mock for file_create_url(), until that is moved into
-   * Component/Utility.
-   */
-  function file_create_url($uri) {
-    return 'file_create_url:' . $uri;
-  }
-
-}
-if (!function_exists('file_url_transform_relative')) {
-
-  /**
-   * Temporary mock of file_url_transform_relative, until that is moved into
-   * Component/Utility.
-   */
-  function file_url_transform_relative($uri) {
-    return 'file_url_transform_relative:' . $uri;
-  }
-
-}
-
-}
-
-
-
-
-namespace Drupal\Tests\Core\Asset {
+namespace Drupal\Tests\Core\Asset;
 
 use Drupal\Core\Asset\CssCollectionRenderer;
 use Drupal\Tests\UnitTestCase;
@@ -502,4 +467,53 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
   }
 
 }
+
+/**
+ * Temporary mock for file_create_url(), until that is moved into
+ * Component/Utility.
+ */
+if (!function_exists('Drupal\Tests\Core\Asset\file_create_url')) {
+  function file_create_url($uri) {
+    return 'file_create_url:' . $uri;
+  }
+}
+
+/**
+ * Temporary mock of file_url_transform_relative, until that is moved into
+ * Component/Utility.
+ */
+if (!function_exists('Drupal\Tests\Core\Asset\file_url_transform_relative')) {
+  function file_url_transform_relative($uri) {
+    return 'file_url_transform_relative:' . $uri;
+  }
+}
+
+/**
+ * CssCollectionRenderer uses file_create_url() & file_url_transform_relative(),
+ * which *are* available when using the Simpletest test runner, but not when
+ * using the PHPUnit test runner; hence this hack.
+ */
+namespace Drupal\Core\Asset;
+
+if (!function_exists('Drupal\Core\Asset\file_create_url')) {
+
+  /**
+   * Temporary mock for file_create_url(), until that is moved into
+   * Component/Utility.
+   */
+  function file_create_url($uri) {
+    return \Drupal\Tests\Core\Asset\file_create_url($uri);
+  }
+
+}
+if (!function_exists('Drupal\Core\Asset\file_url_transform_relative')) {
+
+  /**
+   * Temporary mock of file_url_transform_relative, until that is moved into
+   * Component/Utility.
+   */
+  function file_url_transform_relative($uri) {
+    return \Drupal\Tests\Core\Asset\file_url_transform_relative($uri);
+  }
+
 }
diff --git a/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
index 831a1de7fab..23ff2ad79f1 100644
--- a/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
@@ -1,48 +1,6 @@
 <?php
 
-namespace {
-
-/**
- * CssOptimizer uses file_create_url(), file_uri_scheme() and
- * file_url_transform_relative(), which *are* available when using the
- * Simpletest test runner, but not when using the PHPUnit test runner; hence
- * this hack.
- */
-if (!function_exists('file_create_url')) {
-
-  /**
-   * Temporary mock for file_create_url(), until that is moved into
-   * Component/Utility.
-   */
-  function file_create_url($uri) {
-    return 'file_create_url:' . $uri;
-  }
-
-}
-
-if (!function_exists('file_uri_scheme')) {
-
-  function file_uri_scheme($uri) {
-    return FALSE;
-  }
-
-}
-if (!function_exists('file_url_transform_relative')) {
-
-  /**
-   * Temporary mock of file_url_transform_relative, until that is moved into
-   * Component/Utility.
-   */
-  function file_url_transform_relative($uri) {
-    return 'file_url_transform_relative:' . $uri;
-  }
-
-}
-
-}
-
-
-namespace Drupal\Tests\Core\Asset {
+namespace Drupal\Tests\Core\Asset;
 
 use Drupal\Core\Asset\CssOptimizer;
 use Drupal\Tests\UnitTestCase;
@@ -292,4 +250,60 @@ class CssOptimizerUnitTest extends UnitTestCase {
   }
 
 }
+
+/**
+ * Temporary mock for file_create_url(), until that is moved into
+ * Component/Utility.
+ */
+if (!function_exists('Drupal\Tests\Core\Asset\file_create_url')) {
+  function file_create_url($uri) {
+    return 'file_create_url:' . $uri;
+  }
+}
+
+/**
+ * Temporary mock of file_url_transform_relative, until that is moved into
+ * Component/Utility.
+ */
+if (!function_exists('Drupal\Tests\Core\Asset\file_url_transform_relative')) {
+  function file_url_transform_relative($uri) {
+    return 'file_url_transform_relative:' . $uri;
+  }
+}
+
+/**
+ * CssCollectionRenderer uses file_create_url() & file_url_transform_relative(),
+ * which *are* available when using the Simpletest test runner, but not when
+ * using the PHPUnit test runner; hence this hack.
+ */
+namespace Drupal\Core\Asset;
+
+if (!function_exists('Drupal\Core\Asset\file_create_url')) {
+
+  /**
+   * Temporary mock for file_create_url(), until that is moved into
+   * Component/Utility.
+   */
+  function file_create_url($uri) {
+    return \Drupal\Tests\Core\Asset\file_create_url($uri);
+  }
+
+}
+if (!function_exists('Drupal\Core\Asset\file_url_transform_relative')) {
+
+  /**
+   * Temporary mock of file_url_transform_relative, until that is moved into
+   * Component/Utility.
+   */
+  function file_url_transform_relative($uri) {
+    return \Drupal\Tests\Core\Asset\file_url_transform_relative($uri);
+  }
+
+}
+if (!function_exists('Drupal\Core\Asset\file_uri_scheme')) {
+
+  function file_uri_scheme($uri) {
+    return FALSE;
+  }
+
 }
diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
index 2c4a01b3e09..6f020237f3a 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\Core\Config\Entity {
+namespace Drupal\Tests\Core\Config\Entity;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
@@ -941,12 +941,11 @@ class ConfigEntityStorageTest extends UnitTestCase {
 
 }
 
+namespace Drupal\Core\Config\Entity;
+
+if (!defined('SAVED_NEW')) {
+  define('SAVED_NEW', 1);
 }
-namespace {
-  if (!defined('SAVED_NEW')) {
-    define('SAVED_NEW', 1);
-  }
-  if (!defined('SAVED_UPDATED')) {
-    define('SAVED_UPDATED', 2);
-  }
+if (!defined('SAVED_UPDATED')) {
+  define('SAVED_UPDATED', 2);
 }
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
index ede4d4bb81a..bacab58af12 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
@@ -5,7 +5,7 @@
  * Contains \Drupal\Tests\Core\Entity\EntityResolverManagerTest.
  */
 
-namespace Drupal\Tests\Core\Entity {
+namespace Drupal\Tests\Core\Entity;
 
 use Drupal\Core\Entity\Entity;
 use Drupal\Core\Entity\EntityInterface;
@@ -90,7 +90,7 @@ class EntityResolverManagerTest extends UnitTestCase {
   public function providerTestSetRouteOptionsWithStandardRoute() {
     return array(
       array('Drupal\Tests\Core\Entity\BasicControllerClass::exampleControllerMethod'),
-      array('test_function_controller'),
+      array('Drupal\Tests\Core\Entity\test_function_controller'),
     );
   }
 
@@ -120,7 +120,7 @@ class EntityResolverManagerTest extends UnitTestCase {
   public function providerTestSetRouteOptionsWithStandardRouteWithArgument() {
     return array(
       array('Drupal\Tests\Core\Entity\BasicControllerClass::exampleControllerMethodWithArgument'),
-      array('test_function_controller_with_argument'),
+      array('Drupal\Tests\Core\Entity\test_function_controller_with_argument'),
     );
   }
 
@@ -150,7 +150,7 @@ class EntityResolverManagerTest extends UnitTestCase {
   public function providerTestSetRouteOptionsWithContentController() {
     return array(
       array('Drupal\Tests\Core\Entity\BasicControllerClass::exampleControllerMethodWithArgument'),
-      array('test_function_controller_with_argument'),
+      array('Drupal\Tests\Core\Entity\test_function_controller_with_argument'),
     );
   }
 
@@ -183,7 +183,7 @@ class EntityResolverManagerTest extends UnitTestCase {
   public function providerTestSetRouteOptionsWithEntityTypeNoUpcasting() {
     return array(
       array('Drupal\Tests\Core\Entity\BasicControllerClass::exampleControllerWithEntityNoUpcasting'),
-      array('test_function_controller_no_upcasting'),
+      array('Drupal\Tests\Core\Entity\test_function_controller_no_upcasting'),
     );
   }
 
@@ -217,7 +217,7 @@ class EntityResolverManagerTest extends UnitTestCase {
   public function providerTestSetRouteOptionsWithEntityTypeUpcasting() {
     return array(
       array('Drupal\Tests\Core\Entity\BasicControllerClass::exampleControllerWithEntityUpcasting'),
-      array('test_function_controller_entity_upcasting'),
+      array('Drupal\Tests\Core\Entity\test_function_controller_entity_upcasting'),
     );
   }
 
@@ -547,21 +547,14 @@ class BasicFormNoContainerInjectionInterface implements FormInterface {
 
 }
 
+function test_function_controller() {
 }
 
-namespace {
-
-  use Drupal\Core\Entity\EntityInterface;
-
-  function test_function_controller() {
-  }
-
-  function test_function_controller_with_argument($argument) {
-  }
-
-  function test_function_controller_no_upcasting($entity_test) {
-  }
-
-  function test_function_controller_entity_upcasting(EntityInterface $entity_test) {
-  }
+function test_function_controller_with_argument($argument) {
+}
+
+function test_function_controller_no_upcasting($entity_test) {
+}
+
+function test_function_controller_entity_upcasting(EntityInterface $entity_test) {
 }
diff --git a/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
index 3c337bba831..4fbdba396c2 100644
--- a/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\Core\Entity\KeyValueStore {
+namespace Drupal\Tests\Core\Entity\KeyValueStore;
 
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
@@ -696,13 +696,11 @@ class KeyValueEntityStorageTest extends UnitTestCase {
 
 }
 
-}
+namespace Drupal\Core\Entity\KeyValueStore;
 
-namespace {
-  if (!defined('SAVED_NEW')) {
-    define('SAVED_NEW', 1);
-  }
-  if (!defined('SAVED_UPDATED')) {
-    define('SAVED_UPDATED', 2);
-  }
+if (!defined('SAVED_NEW')) {
+  define('SAVED_NEW', 1);
+}
+if (!defined('SAVED_UPDATED')) {
+  define('SAVED_UPDATED', 2);
 }
diff --git a/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php b/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php
index c139b88bf56..1472dc0c4d5 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\Core\Plugin\Discovery {
+namespace Drupal\Tests\Core\Plugin\Discovery;
 
 use Drupal\Core\Plugin\Discovery\HookDiscovery;
 use Drupal\Tests\UnitTestCase;
@@ -61,11 +61,11 @@ class HookDiscoveryTest extends UnitTestCase {
     $this->moduleHandler->expects($this->at(1))
       ->method('invoke')
       ->with('hook_discovery_test', 'test_plugin')
-      ->will($this->returnValue(hook_discovery_test_test_plugin()));
+      ->will($this->returnValue($this->hookDiscoveryTestTestPlugin()));
     $this->moduleHandler->expects($this->at(2))
       ->method('invoke')
       ->with('hook_discovery_test2', 'test_plugin')
-      ->will($this->returnValue(hook_discovery_test2_test_plugin()));
+      ->will($this->returnValue($this->hookDiscoveryTest2TestPlugin()));
 
     $definitions = $this->hookDiscovery->getDefinitions();
 
@@ -94,8 +94,8 @@ class HookDiscoveryTest extends UnitTestCase {
     $this->moduleHandler->expects($this->any())
       ->method('invoke')
       ->will($this->returnValueMap(array(
-          array('hook_discovery_test', 'test_plugin', array(), hook_discovery_test_test_plugin()),
-          array('hook_discovery_test2', 'test_plugin', array(), hook_discovery_test2_test_plugin()),
+          array('hook_discovery_test', 'test_plugin', array(), $this->hookDiscoveryTestTestPlugin()),
+          array('hook_discovery_test2', 'test_plugin', array(), $this->hookDiscoveryTest2TestPlugin()),
         )
       ));
 
@@ -129,20 +129,16 @@ class HookDiscoveryTest extends UnitTestCase {
     $this->hookDiscovery->getDefinition('test_non_existant', TRUE);
   }
 
-}
-
-}
-
-namespace {
-  function hook_discovery_test_test_plugin() {
+  protected function hookDiscoveryTestTestPlugin() {
     return array(
       'test_id_1' => array('class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Apple'),
       'test_id_2' => array('class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Orange'),
     );
   }
-  function hook_discovery_test2_test_plugin() {
+  protected function hookDiscoveryTest2TestPlugin() {
     return array(
       'test_id_3' => array('class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Cherry'),
     );
   }
+
 }
diff --git a/core/tests/Drupal/Tests/Core/Render/Element/MachineNameTest.php b/core/tests/Drupal/Tests/Core/Render/Element/MachineNameTest.php
index fe4406ded4c..c7ef72e3c5f 100644
--- a/core/tests/Drupal/Tests/Core/Render/Element/MachineNameTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/Element/MachineNameTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\Core\Render\Element {
+namespace Drupal\Tests\Core\Render\Element;
 
   use Drupal\Core\Form\FormState;
   use Drupal\Core\Form\FormStateInterface;
@@ -103,12 +103,10 @@ class MachineNameTest extends UnitTestCase {
 
 }
 
-}
+namespace Drupal\Core\Render\Element;
 
-namespace Drupal\Core\Render\Element {
-  if (!function_exists('t')) {
-    function t($string, array $args = []) {
-      return strtr($string, $args);
-    }
+if (!function_exists('t')) {
+  function t($string, array $args = []) {
+    return strtr($string, $args);
   }
 }
diff --git a/core/tests/Drupal/Tests/Core/Session/PermissionsHashGeneratorTest.php b/core/tests/Drupal/Tests/Core/Session/PermissionsHashGeneratorTest.php
index 3bb4f3aa99e..d5e8c32d82a 100644
--- a/core/tests/Drupal/Tests/Core/Session/PermissionsHashGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Session/PermissionsHashGeneratorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\Core\Session {
+namespace Drupal\Tests\Core\Session;
 
 use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Session\PermissionsHashGenerator;
@@ -246,19 +246,15 @@ class PermissionsHashGeneratorTest extends UnitTestCase {
 
 }
 
-}
+namespace Drupal\Core\Session;
 
-namespace {
-
-  // @todo remove once user_role_permissions() can be injected.
-  if (!function_exists('user_role_permissions')) {
-    function user_role_permissions(array $roles) {
-      $role_permissions = array();
-      foreach ($roles as $rid) {
-        $role_permissions[$rid] = array();
-      }
-      return $role_permissions;
+// @todo remove once user_role_permissions() can be injected.
+if (!function_exists('user_role_permissions')) {
+  function user_role_permissions(array $roles) {
+    $role_permissions = array();
+    foreach ($roles as $rid) {
+      $role_permissions[$rid] = array();
     }
+    return $role_permissions;
   }
-
 }
diff --git a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
index a123993a6e1..f4dc2dfa8e7 100644
--- a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\Core\Utility {
+namespace Drupal\Tests\Core\Utility;
 
 use Drupal\Component\Render\MarkupInterface;
 use Drupal\Core\GeneratedNoLink;
@@ -596,5 +596,3 @@ class LinkGeneratorTest extends UnitTestCase {
   }
 
 }
-
-}