From e746bd96f46a2faa6ed2f257734cd053ab90c05e Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 7 Dec 2015 14:37:15 +0000
Subject: [PATCH] Issue #2105583 by neclimdul, tim.plunkett, dawehner, Mile23:
 Add some sane strictness to phpunit tests to catch risky tests

---
 .../tests/fixtures/simpletest_phpunit_run_command_test.php | 1 +
 core/phpunit.xml.dist                                      | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/modules/simpletest/tests/fixtures/simpletest_phpunit_run_command_test.php b/core/modules/simpletest/tests/fixtures/simpletest_phpunit_run_command_test.php
index 872753e84e2d..c86a9e619d4b 100644
--- a/core/modules/simpletest/tests/fixtures/simpletest_phpunit_run_command_test.php
+++ b/core/modules/simpletest/tests/fixtures/simpletest_phpunit_run_command_test.php
@@ -17,6 +17,7 @@ class SimpletestPhpunitRunCommandTestWillDie extends UnitTestCase {
     if (getenv('SimpletestPhpunitRunCommandTestWillDie') === 'fail') {
       exit(2);
     }
+    $this->assertTrue(TRUE, 'Assertion to ensure test pass');
   }
 }
 
diff --git a/core/phpunit.xml.dist b/core/phpunit.xml.dist
index 48396388c467..2620fe925a29 100644
--- a/core/phpunit.xml.dist
+++ b/core/phpunit.xml.dist
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="tests/bootstrap.php" colors="true">
+<!-- TODO set checkForUnintentionallyCoveredCode="true" once https://www.drupal.org/node/2626832 is resolved. -->
+<phpunit bootstrap="tests/bootstrap.php" colors="true"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutChangesToGlobalState="true"
+         checkForUnintentionallyCoveredCode="false">
   <php>
     <!-- Set error reporting to E_ALL. -->
     <ini name="error_reporting" value="32767"/>