Permalink
Browse files

- Merge [3494] and [3495].

  • Loading branch information...
1 parent 6be1ec7 commit 32787dc33574a9dd12169029f7dac8211d9b575f @sebastianbergmann committed Jul 22, 2008
@@ -82,7 +82,7 @@ class PHPUnit_Extensions_Database_DataSet_Persistors_FlatXml extends PHPUnit_Ext
*/
public function setFileName($filename)
{
- $this->filename = $filename;
+ $this->filename = $filename;
}
/**
@@ -119,11 +119,11 @@ protected function endDataSet(PHPUnit_Extensions_Database_DataSet_IDataSet $data
*/
protected function startTable(PHPUnit_Extensions_Database_DataSet_ITable $table)
{
- fwrite($this->fh, "\t<table name=\"{$table->getTableMetaData()->getTableName()}\">\n");
- foreach ($table->getTableMetaData()->getColumns() as $columnName)
- {
- fwrite($this->fh, "\t\t<column>{$columnName}</column>\n");
- }
+ fwrite($this->fh, "\t<table name=\"{$table->getTableMetaData()->getTableName()}\">\n");
+
+ foreach ($table->getTableMetaData()->getColumns() as $columnName) {
+ fwrite($this->fh, "\t\t<column>{$columnName}</column>\n");
+ }
}
/**
@@ -215,9 +215,9 @@ protected function tearDown()
$this->getDatabaseTester()->setTearDownOperation($this->getTearDownOperation());
$this->getDatabaseTester()->setDataSet($this->getDataSet());
$this->getDatabaseTester()->onTearDown();
-
+
/**
- * Destroy the tester after the test is run to keep DB connections
+ * Destroy the tester after the test is run to keep DB connections
* from piling up.
*/
$this->databaseTester = NULL;
@@ -188,7 +188,7 @@ public function __construct($theClass = '', $name = '')
}
$filename = $theClass->getFilename();
-
+
if (strpos($filename, 'eval()') === FALSE) {
PHPUnit_Util_Filter::addFileToFilter(realpath($filename), 'TESTS');
}
@@ -46,7 +46,7 @@
require_once 'PHPUnit/Extensions/Story/TestCase.php';
require_once 'BowlingGame.php';
-
+
class BowlingGameSpec extends PHPUnit_Extensions_Story_TestCase
{
/**
@@ -60,7 +60,7 @@ public function scoreForOneSpareIs16()
->and('Player rolls', 3)
->then('Score should be', 16);
}
-
+
public function runGiven(&$world, $action, $arguments)
{
switch($action) {
@@ -69,7 +69,7 @@ public function runGiven(&$world, $action, $arguments)
$world['rolls'] = 0;
}
break;
-
+
default: {
return $this->notImplemented($action);
}
@@ -84,7 +84,7 @@ public function runWhen(&$world, $action, $arguments)
$world['rolls']++;
}
break;
-
+
default: {
return $this->notImplemented($action);
}
@@ -98,11 +98,11 @@ public function runThen(&$world, $action, $arguments)
for ($i = $world['rolls']; $i < 20; $i++) {
$world['game']->roll(0);
}
-
+
$this->assertEquals($arguments[0], $world['game']->score());
}
break;
-
+
default: {
return $this->notImplemented($action);
}
@@ -10,7 +10,7 @@
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
-#
+#
# * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
@@ -10,7 +10,7 @@
--
-- * Redistributions of source code must retain the above copyright
-- notice, this list of conditions and the following disclaimer.
---
+--
-- * Redistributions in binary form must reproduce the above copyright
-- notice, this list of conditions and the following disclaimer in
-- the documentation and/or other materials provided with the

0 comments on commit 32787dc

Please sign in to comment.