From bb533c3a4ed478166d893bb583c17fc8689af1ac Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Sun, 13 Dec 2015 03:16:26 -0800 Subject: [PATCH 1/4] Issue #50: Support KernelTestBase tests natively. - Add test for KernelTestBase. - Move old test to Unit namespace. This fixes #50. --- environments/drupal-8.sh | 3 ++ .../tests/src/Kernel/DrupalTiTest.php | 42 +++++++++++++++++++ .../tests/src/{ => Unit}/DrupalTiTestTest.php | 4 +- 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 tests/drupal-8/drupal_ti_test/tests/src/Kernel/DrupalTiTest.php rename tests/drupal-8/drupal_ti_test/tests/src/{ => Unit}/DrupalTiTestTest.php (76%) diff --git a/environments/drupal-8.sh b/environments/drupal-8.sh index 5a490f3..e62bf58 100644 --- a/environments/drupal-8.sh +++ b/environments/drupal-8.sh @@ -24,6 +24,9 @@ export PATH="$DRUPAL_TI_DIST_DIR/usr/bin:$PATH" # Display used for running selenium browser. export DISPLAY=:99.0 +# export SIMPLETEST_DB for KernelTestBase, so it is available for all runners. +export SIMPLETEST_DB="$DRUPAL_TI_DB_URL" + # Use 'minimal' by default for Drupal 8. if [ -z "$DRUPAL_TI_INSTALL_PROFILE" ] then diff --git a/tests/drupal-8/drupal_ti_test/tests/src/Kernel/DrupalTiTest.php b/tests/drupal-8/drupal_ti_test/tests/src/Kernel/DrupalTiTest.php new file mode 100644 index 0000000..3054445 --- /dev/null +++ b/tests/drupal-8/drupal_ti_test/tests/src/Kernel/DrupalTiTest.php @@ -0,0 +1,42 @@ +installSchema('system', 'router'); + } + + /** + * @covers ::bar + */ + public function testKernelTestBase() { + $test = new DrupalTiTest(); + $this->assertEquals('foo', $test->bar()); + } +} diff --git a/tests/drupal-8/drupal_ti_test/tests/src/DrupalTiTestTest.php b/tests/drupal-8/drupal_ti_test/tests/src/Unit/DrupalTiTestTest.php similarity index 76% rename from tests/drupal-8/drupal_ti_test/tests/src/DrupalTiTestTest.php rename to tests/drupal-8/drupal_ti_test/tests/src/Unit/DrupalTiTestTest.php index 1612cbd..9e1dd4b 100644 --- a/tests/drupal-8/drupal_ti_test/tests/src/DrupalTiTestTest.php +++ b/tests/drupal-8/drupal_ti_test/tests/src/Unit/DrupalTiTestTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\Tests\drupal_ti_test\DrupalTiTestTest; + * Contains \Drupal\Tests\drupal_ti_test\Unit\DrupalTiTestTest; */ -namespace Drupal\Tests\drupal_ti_test; +namespace Drupal\Tests\drupal_ti_test\Unit; use Drupal\drupal_ti_test\DrupalTiTest; From 666bb16c08c099aec9b550ede66676fd8f26f9f9 Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Sun, 13 Dec 2015 03:24:25 -0800 Subject: [PATCH 2/4] Need to only run unit tests from phpunit runner. --- tests/drupal-8/drupal_ti_test/tests/phpunit.xml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/drupal-8/drupal_ti_test/tests/phpunit.xml.dist b/tests/drupal-8/drupal_ti_test/tests/phpunit.xml.dist index c583c49..d511650 100644 --- a/tests/drupal-8/drupal_ti_test/tests/phpunit.xml.dist +++ b/tests/drupal-8/drupal_ti_test/tests/phpunit.xml.dist @@ -3,7 +3,7 @@ - ./src/ + ./src/Unit/ From acaf251eb6ff8656303a2cc969618de7a7b7f239 Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Sun, 13 Dec 2015 08:51:13 -0800 Subject: [PATCH 3/4] Move test to right filename. --- .../tests/src/Kernel/{DrupalTiTest.php => DrupalTiTestTest.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/drupal-8/drupal_ti_test/tests/src/Kernel/{DrupalTiTest.php => DrupalTiTestTest.php} (100%) diff --git a/tests/drupal-8/drupal_ti_test/tests/src/Kernel/DrupalTiTest.php b/tests/drupal-8/drupal_ti_test/tests/src/Kernel/DrupalTiTestTest.php similarity index 100% rename from tests/drupal-8/drupal_ti_test/tests/src/Kernel/DrupalTiTest.php rename to tests/drupal-8/drupal_ti_test/tests/src/Kernel/DrupalTiTestTest.php From b207cd670da2710f87f75635cbb1954afdbaac90 Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Sun, 13 Dec 2015 08:53:43 -0800 Subject: [PATCH 4/4] Add required group annotation. --- .../drupal_ti_test/tests/src/Kernel/DrupalTiTestTest.php | 2 ++ .../drupal-8/drupal_ti_test/tests/src/Unit/DrupalTiTestTest.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tests/drupal-8/drupal_ti_test/tests/src/Kernel/DrupalTiTestTest.php b/tests/drupal-8/drupal_ti_test/tests/src/Kernel/DrupalTiTestTest.php index 3054445..f3f328b 100644 --- a/tests/drupal-8/drupal_ti_test/tests/src/Kernel/DrupalTiTestTest.php +++ b/tests/drupal-8/drupal_ti_test/tests/src/Kernel/DrupalTiTestTest.php @@ -12,6 +12,8 @@ /** * @coversDefaultClass \Drupal\drupal_ti_test\DrupalTiTest + * + * @group drupal_ti_test */ class DrupalTiTestTest extends KernelTestBase { diff --git a/tests/drupal-8/drupal_ti_test/tests/src/Unit/DrupalTiTestTest.php b/tests/drupal-8/drupal_ti_test/tests/src/Unit/DrupalTiTestTest.php index 9e1dd4b..987087e 100644 --- a/tests/drupal-8/drupal_ti_test/tests/src/Unit/DrupalTiTestTest.php +++ b/tests/drupal-8/drupal_ti_test/tests/src/Unit/DrupalTiTestTest.php @@ -11,6 +11,8 @@ /** * @coversDefaultClass \Drupal\drupal_ti_test\DrupalTiTest + * + * @group drupal_ti_test */ class DrupalTiTestTest extends \PHPUnit_Framework_TestCase {