From 1815dfddf803a379c8e26e2137389be06cb258f8 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sat, 29 Apr 2017 23:49:13 +0100
Subject: [PATCH] Issue #2864121 by Lendude, GoZ, dawehner: Convert web tests
 to browser tests for statistics module

---
 .../src/Functional}/StatisticsAdminTest.php              | 9 ++++++---
 .../src/Functional}/StatisticsLoggingTest.php            | 6 +++---
 .../src/Functional}/StatisticsReportsTest.php            | 2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)
 rename core/modules/statistics/{src/Tests => tests/src/Functional}/StatisticsAdminTest.php (96%)
 rename core/modules/statistics/{src/Tests => tests/src/Functional}/StatisticsLoggingTest.php (97%)
 rename core/modules/statistics/{src/Tests => tests/src/Functional}/StatisticsReportsTest.php (98%)

diff --git a/core/modules/statistics/src/Tests/StatisticsAdminTest.php b/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
similarity index 96%
rename from core/modules/statistics/src/Tests/StatisticsAdminTest.php
rename to core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
index 3ce0457d43b1..f4c22bd8a77c 100644
--- a/core/modules/statistics/src/Tests/StatisticsAdminTest.php
+++ b/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
@@ -1,15 +1,18 @@
 <?php
 
-namespace Drupal\statistics\Tests;
+namespace Drupal\Tests\statistics\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\Traits\Core\CronRunTrait;
 
 /**
  * Tests the statistics admin.
  *
  * @group statistics
  */
-class StatisticsAdminTest extends WebTestBase {
+class StatisticsAdminTest extends BrowserTestBase {
+
+  use CronRunTrait;
 
   /**
    * Modules to enable.
diff --git a/core/modules/statistics/src/Tests/StatisticsLoggingTest.php b/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php
similarity index 97%
rename from core/modules/statistics/src/Tests/StatisticsLoggingTest.php
rename to core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php
index a75f89638dc4..09565aefae73 100644
--- a/core/modules/statistics/src/Tests/StatisticsLoggingTest.php
+++ b/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\statistics\Tests;
+namespace Drupal\Tests\statistics\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\node\Entity\Node;
 
 /**
@@ -13,7 +13,7 @@ use Drupal\node\Entity\Node;
  *
  * @group statistics
  */
-class StatisticsLoggingTest extends WebTestBase {
+class StatisticsLoggingTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/statistics/src/Tests/StatisticsReportsTest.php b/core/modules/statistics/tests/src/Functional/StatisticsReportsTest.php
similarity index 98%
rename from core/modules/statistics/src/Tests/StatisticsReportsTest.php
rename to core/modules/statistics/tests/src/Functional/StatisticsReportsTest.php
index ea597f40bbfb..edebca166c15 100644
--- a/core/modules/statistics/src/Tests/StatisticsReportsTest.php
+++ b/core/modules/statistics/tests/src/Functional/StatisticsReportsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\statistics\Tests;
+namespace Drupal\Tests\statistics\Functional;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;