tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.3' into 3.4

Browse Source
This commit is contained in:
Daniel Hensby 2016-05-22 11:17:28 +01:00
commit 706be1210f
No known key found for this signature in database
GPG Key ID: E38EC566FE29EB66
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dev/SapphireTest.php
View File

@ -47,7 +47,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
* @deprecated since version 4.0 * @deprecated since version 4.0
*/ */
protected $originalMailer; protected $originalMailer;
protected $originalMemberPasswordValidator; protected $originalMemberPasswordValidator;
protected $originalRequirements; protected $originalRequirements;
protected $originalIsRunningTest; protected $originalIsRunningTest;
@ -217,7 +217,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
Config::inst()->update('Director', 'rules', array( Config::inst()->update('Director', 'rules', array(
'$Controller//$Action/$ID/$OtherID' => '*' '$Controller//$Action/$ID/$OtherID' => '*'
)); ));
$fixtureFile = static::get_fixture_file(); $fixtureFile = static::get_fixture_file();
$prefix = defined('SS_DATABASE_PREFIX') ? SS_DATABASE_PREFIX : 'ss_'; $prefix = defined('SS_DATABASE_PREFIX') ? SS_DATABASE_PREFIX : 'ss_';
@ -226,13 +226,9 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
$this->model = DataModel::inst(); $this->model = DataModel::inst();
// Set up fixture // Set up fixture
if($fixtureFile || $this->usesDatabase || !self::using_temp_db()) { if($fixtureFile || $this->usesDatabase) {
if(substr(DB::get_conn()->getSelectedDatabase(), 0, strlen($prefix) + 5) if (!self::using_temp_db()) {
!= strtolower(sprintf('%stmpdb', $prefix))) {
//echo "Re-creating temp database... ";
self::create_temp_db(); self::create_temp_db();
//echo "done.\n";
} }
singleton('DataObject')->flushCache(); singleton('DataObject')->flushCache();
@ -371,7 +367,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
} }
} }
} }
//unnest injector / config now that the test suite is over //unnest injector / config now that the test suite is over
// this will reset all the extensions on the object too (see setUpOnce) // this will reset all the extensions on the object too (see setUpOnce)
Injector::unnest(); Injector::unnest();
@ -723,22 +719,22 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
. var_export($match, true) . ": " . var_export($item, true) . var_export($match, true) . ": " . var_export($item, true)
); );
} }
} }
/** /**
* Removes sequences of repeated whitespace characters from SQL queries * Removes sequences of repeated whitespace characters from SQL queries
* making them suitable for string comparison * making them suitable for string comparison
* *
* @param string $sql * @param string $sql
* @return string The cleaned and normalised SQL string * @return string The cleaned and normalised SQL string
*/ */
protected function normaliseSQL($sql) { protected function normaliseSQL($sql) {
return trim(preg_replace('/\s+/m', ' ', $sql)); return trim(preg_replace('/\s+/m', ' ', $sql));
} }
/** /**
* Asserts that two SQL queries are equivalent * Asserts that two SQL queries are equivalent
* *
* @param string $expectedSQL * @param string $expectedSQL
* @param string $actualSQL * @param string $actualSQL
* @param string $message * @param string $message
@ -753,7 +749,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
// Normalise SQL queries to remove patterns of repeating whitespace // Normalise SQL queries to remove patterns of repeating whitespace
$expectedSQL = $this->normaliseSQL($expectedSQL); $expectedSQL = $this->normaliseSQL($expectedSQL);
$actualSQL = $this->normaliseSQL($actualSQL); $actualSQL = $this->normaliseSQL($actualSQL);
$this->assertEquals($expectedSQL, $actualSQL, $message, $delta, $maxDepth, $canonicalize, $ignoreCase); $this->assertEquals($expectedSQL, $actualSQL, $message, $delta, $maxDepth, $canonicalize, $ignoreCase);
} }
@ -817,7 +813,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
public static function using_temp_db() { public static function using_temp_db() {
$dbConn = DB::get_conn(); $dbConn = DB::get_conn();
$prefix = defined('SS_DATABASE_PREFIX') ? SS_DATABASE_PREFIX : 'ss_'; $prefix = defined('SS_DATABASE_PREFIX') ? SS_DATABASE_PREFIX : 'ss_';
return $dbConn && (substr($dbConn->getSelectedDatabase(), 0, strlen($prefix) + 5) return $dbConn && (substr($dbConn->getSelectedDatabase(), 0, strlen($prefix) + 5)
== strtolower(sprintf('%stmpdb', $prefix))); == strtolower(sprintf('%stmpdb', $prefix)));
} }
@ -923,7 +919,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
if(!($SNG instanceof TestOnly)) $SNG->requireTable(); if(!($SNG instanceof TestOnly)) $SNG->requireTable();
} }
} }
// If we have additional dataobjects which need schema, do so here: // If we have additional dataobjects which need schema, do so here:
if($extraDataObjects) { if($extraDataObjects) {
foreach($extraDataObjects as $dataClass) { foreach($extraDataObjects as $dataClass) {
@ -1001,7 +997,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
// Remove all the test themes we created // Remove all the test themes we created
SS_TemplateLoader::instance()->popManifest(); SS_TemplateLoader::instance()->popManifest();
Config::unnest(); Config::unnest();
if ($e) throw $e; if ($e) throw $e;