From 50919a79347aa718fb6b8b8a351e051bc528e28f Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Wed, 5 Jun 2013 12:33:21 +0100
Subject: [PATCH] Issue #2003342 by jhedstrom: Convert system module's database
unit tests to phpunit.
---
.../Drupal/Tests/Core}/Database/EmptyStatementTest.php | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
rename core/{modules/system/lib/Drupal/system/Tests => tests/Drupal/Tests/Core}/Database/EmptyStatementTest.php (79%)
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/EmptyStatementTest.php b/core/tests/Drupal/Tests/Core/Database/EmptyStatementTest.php
similarity index 79%
rename from core/modules/system/lib/Drupal/system/Tests/Database/EmptyStatementTest.php
rename to core/tests/Drupal/Tests/Core/Database/EmptyStatementTest.php
index 636bd31e498c..9bf2c8071e39 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/EmptyStatementTest.php
+++ b/core/tests/Drupal/Tests/Core/Database/EmptyStatementTest.php
@@ -5,16 +5,16 @@
* Definition of Drupal\system\Tests\Database\EmptyStatementTest.
*/
-namespace Drupal\system\Tests\Database;
+namespace Drupal\Tests\Core\Database;
use Drupal\Core\Database\StatementEmpty;
use Drupal\Core\Database\StatementInterface;
-use Drupal\simpletest\UnitTestBase;
+use Drupal\Tests\UnitTestCase;
/**
* Tests the empty pseudo-statement class.
*/
-class EmptyStatementTest extends UnitTestBase {
+class EmptyStatementTest extends UnitTestCase {
public static function getInfo() {
return array(
'name' => 'Empty statement',
@@ -43,8 +43,6 @@ function testEmptyIteration() {
$this->fail('Iterating empty result set should not iterate.');
return;
}
-
- $this->pass('Iterating empty result set skipped iteration.');
}
/**
@@ -53,6 +51,6 @@ function testEmptyIteration() {
function testEmptyFetchAll() {
$result = new StatementEmpty();
- $this->assertEqual($result->fetchAll(), array(), 'Empty array returned from empty result set.');
+ $this->assertEquals($result->fetchAll(), array(), 'Empty array returned from empty result set.');
}
}
--
GitLab