Modified: incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/Operation/RowBasedTest.php URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/Operation/RowBasedTest.php?rev=719967&r1=719966&r2=719967&view=diff ============================================================================== --- incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/Operation/RowBasedTest.php (original) +++ incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/Operation/RowBasedTest.php Sun Nov 23 01:17:03 2008 @@ -54,7 +54,6 @@ require_once 'Extensions/Database/_files/DatabaseTestUtility.php'; - /** * @category Testing * @package PHPUnit @@ -65,124 +64,74 @@ * @link http://www.phpunit.de/ * @since File available since Release 3.2.0 */ -class Extensions_Database_Operation_RowBasedTest extends PHPUnit_Extensions_Database_TestCase -{ - protected function setUp() - { - if (!extension_loaded('pdo_sqlite')) { - $this->markTestSkipped('PDO/SQLite is required to run this test.'); - } +class Extensions_Database_Operation_RowBasedTest extends PHPUnit_Extensions_Database_TestCase { - parent::setUp(); + protected function setUp() { + if (! extension_loaded('pdo_sqlite')) { + $this->markTestSkipped('PDO/SQLite is required to run this test.'); } + + parent::setUp(); + } + + public function getConnection() { + return new PHPUnit_Extensions_Database_DB_DefaultDatabaseConnection(DBUnitTestUtility::getSQLiteMemoryDB(), 'sqlite'); + } + + public function getDataSet() { + $tables = array( + new PHPUnit_Extensions_Database_DataSet_DefaultTable(new PHPUnit_Extensions_Database_DataSet_DefaultTableMetaData('table1', array( + 'table1_id', 'column1', 'column2', 'column3', 'column4'))), + new PHPUnit_Extensions_Database_DataSet_DefaultTable(new PHPUnit_Extensions_Database_DataSet_DefaultTableMetaData('table2', array( + 'table2_id', 'column5', 'column6', 'column7', 'column8'))), + new PHPUnit_Extensions_Database_DataSet_DefaultTable(new PHPUnit_Extensions_Database_DataSet_DefaultTableMetaData('table3', array( + 'table3_id', 'column9', 'column10', 'column11', 'column12')))); + + return new PHPUnit_Extensions_Database_DataSet_DefaultDataSet($tables); + } - public function getConnection() - { - return new PHPUnit_Extensions_Database_DB_DefaultDatabaseConnection(DBUnitTestUtility::getSQLiteMemoryDB(), 'sqlite'); - } - - public function getDataSet() - { - $tables = array( - new PHPUnit_Extensions_Database_DataSet_DefaultTable( - new PHPUnit_Extensions_Database_DataSet_DefaultTableMetaData('table1', - array('table1_id', 'column1', 'column2', 'column3', 'column4')) - ), - new PHPUnit_Extensions_Database_DataSet_DefaultTable( - new PHPUnit_Extensions_Database_DataSet_DefaultTableMetaData('table2', - array('table2_id', 'column5', 'column6', 'column7', 'column8')) - ), - new PHPUnit_Extensions_Database_DataSet_DefaultTable( - new PHPUnit_Extensions_Database_DataSet_DefaultTableMetaData('table3', - array('table3_id', 'column9', 'column10', 'column11', 'column12')) - ), - ); - - return new PHPUnit_Extensions_Database_DataSet_DefaultDataSet($tables); - } - - public function testExcecute() - { - $connection = $this->getConnection(); - /* @var $connection PHPUnit_Extensions_Database_DB_DefaultDatabaseConnection */ - $table1 = new PHPUnit_Extensions_Database_DataSet_DefaultTable( - new PHPUnit_Extensions_Database_DataSet_DefaultTableMetaData('table1', array('table1_id', 'column1', 'column2', 'column3', 'column4')) - ); - - $table1->addRow(array( - 'table1_id' => 1, - 'column1' => 'foo', - 'column2' => 42, - 'column3' => 4.2, - 'column4' => 'bar' - )); - - $table1->addRow(array( - 'table1_id' => 2, - 'column1' => 'qwerty', - 'column2' => 23, - 'column3' => 2.3, - 'column4' => 'dvorak' - )); - - - $table2 = new PHPUnit_Extensions_Database_DataSet_DefaultTable( - new PHPUnit_Extensions_Database_DataSet_DefaultTableMetaData('table2', array('table2_id', 'column5', 'column6', 'column7', 'column8')) - ); - - $table2->addRow(array( - 'table2_id' => 1, - 'column5' => 'fdyhkn', - 'column6' => 64, - 'column7' => 4568.64, - 'column8' => 'hkladfg' - )); - - $dataSet = new PHPUnit_Extensions_Database_DataSet_DefaultDataSet(array($table1, $table2)); - - $mockOperation = $this->getMock('PHPUnit_Extensions_Database_Operation_RowBased', - array('buildOperationQuery', 'buildOperationArguments')); - - /* @var $mockOperation PHPUnit_Framework_MockObject_MockObject */ - $mockOperation->expects($this->at(0)) - ->method('buildOperationQuery') - ->with($connection->createDataSet()->getTableMetaData('table1'), $table1) - ->will( - $this->returnValue('INSERT INTO table1 (table1_id, column1, column2, column3, column4) VALUES (?, ?, ?, ?, ?)') - ); - - $mockOperation->expects($this->at(1)) - ->method('buildOperationArguments') - ->with($connection->createDataSet()->getTableMetaData('table1'), $table1, 0) - ->will( - $this->returnValue(array(1, 'foo', 42, 4.2, 'bar')) - ); - - $mockOperation->expects($this->at(2)) - ->method('buildOperationArguments') - ->with($connection->createDataSet()->getTableMetaData('table1'), $table1, 1) - ->will( - $this->returnValue(array(2, 'qwerty', 23, 2.3, 'dvorak')) - ); - - $mockOperation->expects($this->at(3)) - ->method('buildOperationQuery') - ->with($connection->createDataSet()->getTableMetaData('table2'), $table2) - ->will( - $this->returnValue('INSERT INTO table2 (table2_id, column5, column6, column7, column8) VALUES (?, ?, ?, ?, ?)') - ); - - $mockOperation->expects($this->at(4)) - ->method('buildOperationArguments') - ->with($connection->createDataSet()->getTableMetaData('table2'), $table2, 0) - ->will( - $this->returnValue(array(1, 'fdyhkn', 64, 4568.64, 'hkladfg')) - ); - - /* @var $mockOperation PHPUnit_Extensions_Database_Operation_RowBased */ - $mockOperation->execute($connection, $dataSet); - - $this->assertDataSetsEqual(new PHPUnit_Extensions_Database_DataSet_FlatXmlDataSet(dirname(__FILE__).'/../_files/XmlDataSets/RowBasedExecute.xml'), $connection->createDataSet(array('table1', 'table2'))); - } + public function testExcecute() { + $connection = $this->getConnection(); + /* @var $connection PHPUnit_Extensions_Database_DB_DefaultDatabaseConnection */ + $table1 = new PHPUnit_Extensions_Database_DataSet_DefaultTable(new PHPUnit_Extensions_Database_DataSet_DefaultTableMetaData('table1', array( + 'table1_id', 'column1', 'column2', 'column3', 'column4'))); + + $table1->addRow(array('table1_id' => 1, 'column1' => 'foo', 'column2' => 42, 'column3' => 4.2, + 'column4' => 'bar')); + + $table1->addRow(array('table1_id' => 2, 'column1' => 'qwerty', 'column2' => 23, 'column3' => 2.3, + 'column4' => 'dvorak')); + + $table2 = new PHPUnit_Extensions_Database_DataSet_DefaultTable(new PHPUnit_Extensions_Database_DataSet_DefaultTableMetaData('table2', array( + 'table2_id', 'column5', 'column6', 'column7', 'column8'))); + + $table2->addRow(array('table2_id' => 1, 'column5' => 'fdyhkn', 'column6' => 64, 'column7' => 4568.64, + 'column8' => 'hkladfg')); + + $dataSet = new PHPUnit_Extensions_Database_DataSet_DefaultDataSet(array($table1, $table2)); + + $mockOperation = $this->getMock('PHPUnit_Extensions_Database_Operation_RowBased', array( + 'buildOperationQuery', 'buildOperationArguments')); + + /* @var $mockOperation PHPUnit_Framework_MockObject_MockObject */ + $mockOperation->expects($this->at(0))->method('buildOperationQuery')->with($connection->createDataSet()->getTableMetaData('table1'), $table1)->will($this->returnValue('INSERT INTO table1 (table1_id, column1, column2, column3, column4) VALUES (?, ?, ?, ?, ?)')); + + $mockOperation->expects($this->at(1))->method('buildOperationArguments')->with($connection->createDataSet()->getTableMetaData('table1'), $table1, 0)->will($this->returnValue(array( + 1, 'foo', 42, 4.2, 'bar'))); + + $mockOperation->expects($this->at(2))->method('buildOperationArguments')->with($connection->createDataSet()->getTableMetaData('table1'), $table1, 1)->will($this->returnValue(array( + 2, 'qwerty', 23, 2.3, 'dvorak'))); + + $mockOperation->expects($this->at(3))->method('buildOperationQuery')->with($connection->createDataSet()->getTableMetaData('table2'), $table2)->will($this->returnValue('INSERT INTO table2 (table2_id, column5, column6, column7, column8) VALUES (?, ?, ?, ?, ?)')); + + $mockOperation->expects($this->at(4))->method('buildOperationArguments')->with($connection->createDataSet()->getTableMetaData('table2'), $table2, 0)->will($this->returnValue(array( + 1, 'fdyhkn', 64, 4568.64, 'hkladfg'))); + + /* @var $mockOperation PHPUnit_Extensions_Database_Operation_RowBased */ + $mockOperation->execute($connection, $dataSet); + + $this->assertDataSetsEqual(new PHPUnit_Extensions_Database_DataSet_FlatXmlDataSet(dirname(__FILE__) . '/../_files/XmlDataSets/RowBasedExecute.xml'), $connection->createDataSet(array( + 'table1', 'table2'))); + } } ?>
Modified: incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/DeleteOperationResult.xml URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/DeleteOperationResult.xml?rev=719967&r1=719966&r2=719967&view=diff ============================================================================== --- incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/DeleteOperationResult.xml (original) +++ incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/DeleteOperationResult.xml Sun Nov 23 01:17:03 2008 @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <dataset> - <table1 table1_id="1" column1="foo" column2="42" column3="4.2" column4="bar" /> - <table2 table2_id="1" column5="fdyhkn" column6="64" column7="4568.64" column8="hkladfg" /> - <table3 table3_id="1" column9="hgdshhh" column10="94" column11="8745.94" column12="ghsf;ugjhgdsfyhjhkdfa" /> - <table3 table3_id="3" column9="itgewqe" column10="16" column11="1562.65" column12="jkkjhgjhgcfddfg" /> + <table1 table1_id="1" column1="foo" column2="42" column3="4.2" + column4="bar" /> + <table2 table2_id="1" column5="fdyhkn" column6="64" column7="4568.64" + column8="hkladfg" /> + <table3 table3_id="1" column9="hgdshhh" column10="94" column11="8745.94" + column12="ghsf;ugjhgdsfyhjhkdfa" /> + <table3 table3_id="3" column9="itgewqe" column10="16" column11="1562.65" + column12="jkkjhgjhgcfddfg" /> </dataset> Modified: incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/FilteredTestComparison.xml URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/FilteredTestComparison.xml?rev=719967&r1=719966&r2=719967&view=diff ============================================================================== --- incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/FilteredTestComparison.xml (original) +++ incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/FilteredTestComparison.xml Sun Nov 23 01:17:03 2008 @@ -1,9 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <dataset> - <table1 table1_id="1" column1="foo" column2="42" column3="4.2" column4="bar" /> - <table1 table1_id="2" column1="qwerty" column2="23" column3="2.3" column4="dvorak" /> - <table2 table2_id="1" column5="fdyhkn" column6="64" column7="4568.64" column8="hkladfg" /> - <table3 table3_id="1" column9="hgdshhh" column10="94" column11="8745.94" column12="ghsf;ugjhgdsfyhjhkdfa" /> - <table3 table3_id="2" column9="asdfgh" column10="76" column11="9413.521" column12="ghgkj;guagfghjhfd" /> - <table3 table3_id="3" column9="itgewqe" column10="16" column11="1562.65" column12="jkkjhgjhgcfddfg" /> + <table1 table1_id="1" column1="foo" column2="42" column3="4.2" + column4="bar" /> + <table1 table1_id="2" column1="qwerty" column2="23" column3="2.3" + column4="dvorak" /> + <table2 table2_id="1" column5="fdyhkn" column6="64" column7="4568.64" + column8="hkladfg" /> + <table3 table3_id="1" column9="hgdshhh" column10="94" column11="8745.94" + column12="ghsf;ugjhgdsfyhjhkdfa" /> + <table3 table3_id="2" column9="asdfgh" column10="76" column11="9413.521" + column12="ghgkj;guagfghjhfd" /> + <table3 table3_id="3" column9="itgewqe" column10="16" column11="1562.65" + column12="jkkjhgjhgcfddfg" /> </dataset> Modified: incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/FilteredTestFixture.xml URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/FilteredTestFixture.xml?rev=719967&r1=719966&r2=719967&view=diff ============================================================================== --- incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/FilteredTestFixture.xml (original) +++ incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/FilteredTestFixture.xml Sun Nov 23 01:17:03 2008 @@ -2,7 +2,10 @@ <dataset> <table1 column1="foo" column2="42" column3="4.2" column4="bar" /> <table1 column1="qwerty" column2="23" column3="2.3" column4="dvorak" /> - <table3 column9="hgdshhh" column10="94" column11="8745.94" column12="ghsf;ugjhgdsfyhjhkdfa" /> - <table3 column9="asdfgh" column10="76" column11="9413.521" column12="ghgkj;guagfghjhfd" /> - <table3 column9="itgewqe" column10="16" column11="1562.65" column12="jkkjhgjhgcfddfg" /> + <table3 column9="hgdshhh" column10="94" column11="8745.94" + column12="ghsf;ugjhgdsfyhjhkdfa" /> + <table3 column9="asdfgh" column10="76" column11="9413.521" + column12="ghgkj;guagfghjhfd" /> + <table3 column9="itgewqe" column10="16" column11="1562.65" + column12="jkkjhgjhgcfddfg" /> </dataset> Modified: incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/FlatXmlDataSet.xml URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/FlatXmlDataSet.xml?rev=719967&r1=719966&r2=719967&view=diff ============================================================================== --- incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/FlatXmlDataSet.xml (original) +++ incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/FlatXmlDataSet.xml Sun Nov 23 01:17:03 2008 @@ -1,9 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <dataset> - <table1 table1_id="1" column1="tgfahgasdf" column2="200" column3="34.64" column4="yghkf;a hahfg8ja h;" /> - <table1 table1_id="2" column1="hk;afg" column2="654" column3="46.54" column4="24rwehhads" /> - <table1 table1_id="3" column1="ha;gyt" column2="462" column3="1654.4" column4="asfgklg" /> - <table2 table2_id="1" column5="fhah" column6="456" column7="46.5" column8="fsdbghfdas" /> + <table1 table1_id="1" column1="tgfahgasdf" column2="200" + column3="34.64" column4="yghkf;a hahfg8ja h;" /> + <table1 table1_id="2" column1="hk;afg" column2="654" column3="46.54" + column4="24rwehhads" /> + <table1 table1_id="3" column1="ha;gyt" column2="462" column3="1654.4" + column4="asfgklg" /> + <table2 table2_id="1" column5="fhah" column6="456" column7="46.5" + column8="fsdbghfdas" /> <table2 table2_id="2" column5="asdhfoih" column6="654" column8="43asdfhgj" /> <table2 table2_id="3" column5="ajsdlkfguitah" column6="654" /> </dataset> Modified: incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/InsertOperationResult.xml URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/InsertOperationResult.xml?rev=719967&r1=719966&r2=719967&view=diff ============================================================================== --- incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/InsertOperationResult.xml (original) +++ incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/InsertOperationResult.xml Sun Nov 23 01:17:03 2008 @@ -1,12 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <dataset> - <table1 table1_id="1" column1="foo" column2="42" column3="4.2" column4="bar" /> - <table1 table1_id="2" column1="qwerty" column2="23" column3="2.3" column4="dvorak" /> - <table1 table1_id="3" column1="ggfdsa" column2="4654" column3="45.65" column4="41gkjfdhyglj54dsfaf" /> - <table2 table2_id="1" column5="fdyhkn" column6="64" column7="4568.64" column8="hkladfg" /> - <table2 table2_id="2" column5="gfdsagfpwah" column6="464" column7="462.45" column8="hsafd;jhsadfyh;wafsfg gfv s,da b" /> - <table3 table3_id="1" column9="hgdshhh" column10="94" column11="8745.94" column12="ghsf;ugjhgdsfyhjhkdfa" /> - <table3 table3_id="2" column9="asdfgh" column10="76" column11="9413.521" column12="ghgkj;guagfghjhfd" /> - <table3 table3_id="3" column9="itgewqe" column10="16" column11="1562.65" column12="jkkjhgjhgcfddfg" /> - <table3 table3_id="4" column9="hoafsd" column10="54563" column11="14.54" column12="hsda8oh hklsdgsd hiisvinv mdsav;;" /> + <table1 table1_id="1" column1="foo" column2="42" column3="4.2" + column4="bar" /> + <table1 table1_id="2" column1="qwerty" column2="23" column3="2.3" + column4="dvorak" /> + <table1 table1_id="3" column1="ggfdsa" column2="4654" column3="45.65" + column4="41gkjfdhyglj54dsfaf" /> + <table2 table2_id="1" column5="fdyhkn" column6="64" column7="4568.64" + column8="hkladfg" /> + <table2 table2_id="2" column5="gfdsagfpwah" column6="464" + column7="462.45" column8="hsafd;jhsadfyh;wafsfg gfv s,da b" /> + <table3 table3_id="1" column9="hgdshhh" column10="94" column11="8745.94" + column12="ghsf;ugjhgdsfyhjhkdfa" /> + <table3 table3_id="2" column9="asdfgh" column10="76" column11="9413.521" + column12="ghgkj;guagfghjhfd" /> + <table3 table3_id="3" column9="itgewqe" column10="16" column11="1562.65" + column12="jkkjhgjhgcfddfg" /> + <table3 table3_id="4" column9="hoafsd" column10="54563" + column11="14.54" column12="hsda8oh hklsdgsd hiisvinv mdsav;;" /> </dataset> Modified: incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/InsertOperationTest.xml URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/InsertOperationTest.xml?rev=719967&r1=719966&r2=719967&view=diff ============================================================================== --- incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/InsertOperationTest.xml (original) +++ incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/InsertOperationTest.xml Sun Nov 23 01:17:03 2008 @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <dataset> - <table1 table1_id="3" column1="ggfdsa" column2="4654" column3="45.65" column4="41gkjfdhyglj54dsfaf" /> - <table2 table2_id="2" column5="gfdsagfpwah" column6="464" column7="462.45" column8="hsafd;jhsadfyh;wafsfg gfv s,da b" /> - <table3 table3_id="4" column9="hoafsd" column10="54563" column11="14.54" column12="hsda8oh hklsdgsd hiisvinv mdsav;;" /> + <table1 table1_id="3" column1="ggfdsa" column2="4654" column3="45.65" + column4="41gkjfdhyglj54dsfaf" /> + <table2 table2_id="2" column5="gfdsagfpwah" column6="464" + column7="462.45" column8="hsafd;jhsadfyh;wafsfg gfv s,da b" /> + <table3 table3_id="4" column9="hoafsd" column10="54563" + column11="14.54" column12="hsda8oh hklsdgsd hiisvinv mdsav;;" /> </dataset> Modified: incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/OperationsTestFixture.xml URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/OperationsTestFixture.xml?rev=719967&r1=719966&r2=719967&view=diff ============================================================================== --- incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/OperationsTestFixture.xml (original) +++ incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/OperationsTestFixture.xml Sun Nov 23 01:17:03 2008 @@ -1,9 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <dataset> - <table1 table1_id="1" column1="foo" column2="42" column3="4.2" column4="bar" /> - <table1 table1_id="2" column1="qwerty" column2="23" column3="2.3" column4="dvorak" /> - <table2 table2_id="1" column5="fdyhkn" column6="64" column7="4568.64" column8="hkladfg" /> - <table3 table3_id="1" column9="hgdshhh" column10="94" column11="8745.94" column12="ghsf;ugjhgdsfyhjhkdfa" /> - <table3 table3_id="2" column9="asdfgh" column10="76" column11="9413.521" column12="ghgkj;guagfghjhfd" /> - <table3 table3_id="3" column9="itgewqe" column10="16" column11="1562.65" column12="jkkjhgjhgcfddfg" /> + <table1 table1_id="1" column1="foo" column2="42" column3="4.2" + column4="bar" /> + <table1 table1_id="2" column1="qwerty" column2="23" column3="2.3" + column4="dvorak" /> + <table2 table2_id="1" column5="fdyhkn" column6="64" column7="4568.64" + column8="hkladfg" /> + <table3 table3_id="1" column9="hgdshhh" column10="94" column11="8745.94" + column12="ghsf;ugjhgdsfyhjhkdfa" /> + <table3 table3_id="2" column9="asdfgh" column10="76" column11="9413.521" + column12="ghgkj;guagfghjhfd" /> + <table3 table3_id="3" column9="itgewqe" column10="16" column11="1562.65" + column12="jkkjhgjhgcfddfg" /> </dataset> Modified: incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/ReplaceOperationResult.xml URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/ReplaceOperationResult.xml?rev=719967&r1=719966&r2=719967&view=diff ============================================================================== --- incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/ReplaceOperationResult.xml (original) +++ incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/ReplaceOperationResult.xml Sun Nov 23 01:17:03 2008 @@ -1,12 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <dataset> - <table1 table1_id="1" column1="foo" column2="42" column3="4.2" column4="bar" /> - <table1 table1_id="2" column1="jgfdasg" column2="4654" column3="45.65" column4="41gkjfdhyglj54dsfaf" /> - <table1 table1_id="3" column1="ggfdsa" column2="45" column3="1.4" column4="asfhajj" /> - <table2 table2_id="1" column5="gfdsagfpwah" column6="464" column7="462.45" column8="hsafd;jhsadfyh;wafsfg gfv s,da b" /> - <table2 table2_id="2" column5="gasupj" column6="9165" column7="456.65" column8="asfdh sdghkj" /> - <table3 table3_id="1" column9="hgdshhh" column10="94" column11="8745.94" column12="ghsf;ugjhgdsfyhjhkdfa" /> - <table3 table3_id="2" column9="hoafsd" column10="54563" column11="14.54" column12="hsda8oh hklsdgsd hiisvinv mdsav;;" /> - <table3 table3_id="3" column9="itgewqe" column10="16" column11="1562.65" column12="jkkjhgjhgcfddfg" /> - <table3 table3_id="4" column9="asdfgaf" column10="152" column11="465.4" column12="dsafhl;a sji[uh ;" /> + <table1 table1_id="1" column1="foo" column2="42" column3="4.2" + column4="bar" /> + <table1 table1_id="2" column1="jgfdasg" column2="4654" column3="45.65" + column4="41gkjfdhyglj54dsfaf" /> + <table1 table1_id="3" column1="ggfdsa" column2="45" column3="1.4" + column4="asfhajj" /> + <table2 table2_id="1" column5="gfdsagfpwah" column6="464" + column7="462.45" column8="hsafd;jhsadfyh;wafsfg gfv s,da b" /> + <table2 table2_id="2" column5="gasupj" column6="9165" column7="456.65" + column8="asfdh sdghkj" /> + <table3 table3_id="1" column9="hgdshhh" column10="94" column11="8745.94" + column12="ghsf;ugjhgdsfyhjhkdfa" /> + <table3 table3_id="2" column9="hoafsd" column10="54563" + column11="14.54" column12="hsda8oh hklsdgsd hiisvinv mdsav;;" /> + <table3 table3_id="3" column9="itgewqe" column10="16" column11="1562.65" + column12="jkkjhgjhgcfddfg" /> + <table3 table3_id="4" column9="asdfgaf" column10="152" column11="465.4" + column12="dsafhl;a sji[uh ;" /> </dataset> Modified: incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/ReplaceOperationTest.xml URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/ReplaceOperationTest.xml?rev=719967&r1=719966&r2=719967&view=diff ============================================================================== --- incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/ReplaceOperationTest.xml (original) +++ incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/ReplaceOperationTest.xml Sun Nov 23 01:17:03 2008 @@ -1,9 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <dataset> - <table1 table1_id="2" column1="jgfdasg" column2="4654" column3="45.65" column4="41gkjfdhyglj54dsfaf" /> - <table1 table1_id="3" column1="ggfdsa" column2="45" column3="1.4" column4="asfhajj" /> - <table2 table2_id="1" column5="gfdsagfpwah" column6="464" column7="462.45" column8="hsafd;jhsadfyh;wafsfg gfv s,da b" /> - <table2 table2_id="2" column5="gasupj" column6="9165" column7="456.65" column8="asfdh sdghkj" /> - <table3 table3_id="2" column9="hoafsd" column10="54563" column11="14.54" column12="hsda8oh hklsdgsd hiisvinv mdsav;;" /> - <table3 table3_id="4" column9="asdfgaf" column10="152" column11="465.4" column12="dsafhl;a sji[uh ;" /> + <table1 table1_id="2" column1="jgfdasg" column2="4654" column3="45.65" + column4="41gkjfdhyglj54dsfaf" /> + <table1 table1_id="3" column1="ggfdsa" column2="45" column3="1.4" + column4="asfhajj" /> + <table2 table2_id="1" column5="gfdsagfpwah" column6="464" + column7="462.45" column8="hsafd;jhsadfyh;wafsfg gfv s,da b" /> + <table2 table2_id="2" column5="gasupj" column6="9165" column7="456.65" + column8="asfdh sdghkj" /> + <table3 table3_id="2" column9="hoafsd" column10="54563" + column11="14.54" column12="hsda8oh hklsdgsd hiisvinv mdsav;;" /> + <table3 table3_id="4" column9="asdfgaf" column10="152" column11="465.4" + column12="dsafhl;a sji[uh ;" /> </dataset> Modified: incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/RowBasedExecute.xml URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/RowBasedExecute.xml?rev=719967&r1=719966&r2=719967&view=diff ============================================================================== --- incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/RowBasedExecute.xml (original) +++ incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/RowBasedExecute.xml Sun Nov 23 01:17:03 2008 @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <dataset> - <table1 table1_id="1" column1="foo" column2="42" column3="4.2" column4="bar" /> - <table1 table1_id="2" column1="qwerty" column2="23" column3="2.3" column4="dvorak" /> - <table2 table2_id="1" column5="fdyhkn" column6="64" column7="4568.64" column8="hkladfg" /> + <table1 table1_id="1" column1="foo" column2="42" column3="4.2" + column4="bar" /> + <table1 table1_id="2" column1="qwerty" column2="23" column3="2.3" + column4="dvorak" /> + <table2 table2_id="1" column5="fdyhkn" column6="64" column7="4568.64" + column8="hkladfg" /> </dataset> Modified: incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/UpdateOperationResult.xml URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/UpdateOperationResult.xml?rev=719967&r1=719966&r2=719967&view=diff ============================================================================== --- incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/UpdateOperationResult.xml (original) +++ incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/UpdateOperationResult.xml Sun Nov 23 01:17:03 2008 @@ -1,9 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <dataset> - <table1 table1_id="1" column1="foo" column2="42" column3="4.2" column4="bar" /> - <table1 table1_id="2" column1="ggfdsa" column2="4654" column3="45.65" column4="41gkjfdhyglj54dsfaf" /> - <table2 table2_id="1" column5="gfdsagfpwah" column6="464" column7="462.45" column8="hsafd;jhsadfyh;wafsfg gfv s,da b" /> - <table3 table3_id="1" column9="hgdshhh" column10="94" column11="8745.94" column12="ghsf;ugjhgdsfyhjhkdfa" /> - <table3 table3_id="2" column9="hoafsd" column10="54563" column11="14.54" column12="hsda8oh hklsdgsd hiisvinv mdsav;;" /> - <table3 table3_id="3" column9="itgewqe" column10="16" column11="1562.65" column12="jkkjhgjhgcfddfg" /> + <table1 table1_id="1" column1="foo" column2="42" column3="4.2" + column4="bar" /> + <table1 table1_id="2" column1="ggfdsa" column2="4654" column3="45.65" + column4="41gkjfdhyglj54dsfaf" /> + <table2 table2_id="1" column5="gfdsagfpwah" column6="464" + column7="462.45" column8="hsafd;jhsadfyh;wafsfg gfv s,da b" /> + <table3 table3_id="1" column9="hgdshhh" column10="94" column11="8745.94" + column12="ghsf;ugjhgdsfyhjhkdfa" /> + <table3 table3_id="2" column9="hoafsd" column10="54563" + column11="14.54" column12="hsda8oh hklsdgsd hiisvinv mdsav;;" /> + <table3 table3_id="3" column9="itgewqe" column10="16" column11="1562.65" + column12="jkkjhgjhgcfddfg" /> </dataset> Modified: incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/UpdateOperationTest.xml URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/UpdateOperationTest.xml?rev=719967&r1=719966&r2=719967&view=diff ============================================================================== --- incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/UpdateOperationTest.xml (original) +++ incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/UpdateOperationTest.xml Sun Nov 23 01:17:03 2008 @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <dataset> - <table1 table1_id="2" column1="ggfdsa" column2="4654" column3="45.65" column4="41gkjfdhyglj54dsfaf" /> - <table2 table2_id="1" column5="gfdsagfpwah" column6="464" column7="462.45" column8="hsafd;jhsadfyh;wafsfg gfv s,da b" /> - <table3 table3_id="2" column9="hoafsd" column10="54563" column11="14.54" column12="hsda8oh hklsdgsd hiisvinv mdsav;;" /> + <table1 table1_id="2" column1="ggfdsa" column2="4654" column3="45.65" + column4="41gkjfdhyglj54dsfaf" /> + <table2 table2_id="1" column5="gfdsagfpwah" column6="464" + column7="462.45" column8="hsafd;jhsadfyh;wafsfg gfv s,da b" /> + <table3 table3_id="2" column9="hoafsd" column10="54563" + column11="14.54" column12="hsda8oh hklsdgsd hiisvinv mdsav;;" /> </dataset> Modified: incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/XmlDataSet.xml URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/XmlDataSet.xml?rev=719967&r1=719966&r2=719967&view=diff ============================================================================== --- incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/XmlDataSet.xml (original) +++ incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/Database/_files/XmlDataSets/XmlDataSet.xml Sun Nov 23 01:17:03 2008 @@ -11,7 +11,7 @@ <value>tgfahgasdf</value> <value>200</value> <value>34.64</value> - <value>yghkf;a hahfg8ja h;</value> + <value>yghkf;a hahfg8ja h;</value> </row> <row> <value>2</value> @@ -56,10 +56,14 @@ <null /> </row> </table> - <table1 table1_id="1" column1="tgfahgasdf" column2="200" column3="34.64" column4="yghkf;a hahfg8ja h;" /> - <table1 table1_id="2" column1="hk;afg" column2="654" column3="46.54" column4="24rwehhads" /> - <table1 table1_id="3" column1="ha;gyt" column2="462" column3="1654.4" column4="asfgklg" /> - <table2 table2_id="1" column5="fhah" column6="456" column7="46.5" column8="fsdbghfdas" /> + <table1 table1_id="1" column1="tgfahgasdf" column2="200" + column3="34.64" column4="yghkf;a hahfg8ja h;" /> + <table1 table1_id="2" column1="hk;afg" column2="654" column3="46.54" + column4="24rwehhads" /> + <table1 table1_id="3" column1="ha;gyt" column2="462" column3="1654.4" + column4="asfgklg" /> + <table2 table2_id="1" column5="fhah" column6="456" column7="46.5" + column8="fsdbghfdas" /> <table2 table2_id="2" column5="asdhfoih" column6="654" column8="43asdfhgj" /> <table2 table2_id="3" column5="ajsdlkfguitah" column6="654" /> </dataset> Modified: incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/OutputTestCaseTest.php URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/OutputTestCaseTest.php?rev=719967&r1=719966&r2=719967&view=diff ============================================================================== --- incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/OutputTestCaseTest.php (original) +++ incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/OutputTestCaseTest.php Sun Nov 23 01:17:03 2008 @@ -60,42 +60,38 @@ * @link http://www.phpunit.de/ * @since Class available since Release 3.0.0 */ -class Extensions_OutputTestCaseTest extends PHPUnit_Framework_TestCase -{ - public function testExpectOutputStringFooActualFoo() - { - $test = new OutputTestCase('testExpectOutputStringFooActualFoo'); - $result = $test->run(); +class Extensions_OutputTestCaseTest extends PHPUnit_Framework_TestCase { - $this->assertEquals(1, count($result)); - $this->assertTrue($result->wasSuccessful()); - } - - public function testExpectOutputStringFooActualBar() - { - $test = new OutputTestCase('testExpectOutputStringFooActualBar'); - $result = $test->run(); - - $this->assertEquals(1, count($result)); - $this->assertFalse($result->wasSuccessful()); - } - - public function testExpectOutputRegexFooActualFoo() - { - $test = new OutputTestCase('testExpectOutputRegexFooActualFoo'); - $result = $test->run(); - - $this->assertEquals(1, count($result)); - $this->assertTrue($result->wasSuccessful()); - } - - public function testExpectOutputRegexFooActualBar() - { - $test = new OutputTestCase('testExpectOutputRegexFooActualBar'); - $result = $test->run(); - - $this->assertEquals(1, count($result)); - $this->assertFalse($result->wasSuccessful()); - } + public function testExpectOutputStringFooActualFoo() { + $test = new OutputTestCase('testExpectOutputStringFooActualFoo'); + $result = $test->run(); + + $this->assertEquals(1, count($result)); + $this->assertTrue($result->wasSuccessful()); + } + + public function testExpectOutputStringFooActualBar() { + $test = new OutputTestCase('testExpectOutputStringFooActualBar'); + $result = $test->run(); + + $this->assertEquals(1, count($result)); + $this->assertFalse($result->wasSuccessful()); + } + + public function testExpectOutputRegexFooActualFoo() { + $test = new OutputTestCase('testExpectOutputRegexFooActualFoo'); + $result = $test->run(); + + $this->assertEquals(1, count($result)); + $this->assertTrue($result->wasSuccessful()); + } + + public function testExpectOutputRegexFooActualBar() { + $test = new OutputTestCase('testExpectOutputRegexFooActualBar'); + $result = $test->run(); + + $this->assertEquals(1, count($result)); + $this->assertFalse($result->wasSuccessful()); + } } ?> Modified: incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/PerformanceTestCaseTest.php URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/PerformanceTestCaseTest.php?rev=719967&r1=719966&r2=719967&view=diff ============================================================================== --- incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/PerformanceTestCaseTest.php (original) +++ incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/PerformanceTestCaseTest.php Sun Nov 23 01:17:03 2008 @@ -62,24 +62,22 @@ * @link http://www.phpunit.de/ * @since Class available since Release 2.0.0 */ -class Extensions_PerformanceTestCaseTest extends PHPUnit_Framework_TestCase -{ - public function testDoesNotExceedMaxRunningTime() - { - $test = new Sleep('testSleepTwoSeconds'); - $test->setMaxRunningTime(3); +class Extensions_PerformanceTestCaseTest extends PHPUnit_Framework_TestCase { - $result = $test->run(); - $this->assertEquals(0, $result->failureCount()); - } + public function testDoesNotExceedMaxRunningTime() { + $test = new Sleep('testSleepTwoSeconds'); + $test->setMaxRunningTime(3); + + $result = $test->run(); + $this->assertEquals(0, $result->failureCount()); + } - public function testExceedsMaxRunningTime() - { - $test = new Sleep('testSleepTwoSeconds'); - $test->setMaxRunningTime(1); - - $result = $test->run(); - $this->assertEquals(1, $result->failureCount()); - } + public function testExceedsMaxRunningTime() { + $test = new Sleep('testSleepTwoSeconds'); + $test->setMaxRunningTime(1); + + $result = $test->run(); + $this->assertEquals(1, $result->failureCount()); + } } ?> Modified: incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/RepeatedTestTest.php URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/RepeatedTestTest.php?rev=719967&r1=719966&r2=719967&view=diff ============================================================================== --- incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/RepeatedTestTest.php (original) +++ incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/RepeatedTestTest.php Sun Nov 23 01:17:03 2008 @@ -63,56 +63,50 @@ * @link http://www.phpunit.de/ * @since Class available since Release 2.0.0 */ -class Extensions_RepeatedTestTest extends PHPUnit_Framework_TestCase -{ - protected $suite; - - public function __construct() - { - $this->suite = new PHPUnit_Framework_TestSuite; +class Extensions_RepeatedTestTest extends PHPUnit_Framework_TestCase { + protected $suite; - $this->suite->addTest(new Success); - $this->suite->addTest(new Success); - } - - public function testRepeatedOnce() - { - $test = new PHPUnit_Extensions_RepeatedTest($this->suite, 1); - $this->assertEquals(2, count($test)); - - $result = $test->run(); - $this->assertEquals(2, count($result)); - } - - public function testRepeatedMoreThanOnce() - { - $test = new PHPUnit_Extensions_RepeatedTest($this->suite, 3); - $this->assertEquals(6, count($test)); - - $result = $test->run(); - $this->assertEquals(6, count($result)); - } - - public function testRepeatedZero() - { - $test = new PHPUnit_Extensions_RepeatedTest($this->suite, 0); - $this->assertEquals(0, count($test)); - - $result = $test->run(); - $this->assertEquals(0, count($result)); - } - - public function testRepeatedNegative() - { - try { - $test = new PHPUnit_Extensions_RepeatedTest($this->suite, -1); - } - - catch (Exception $e) { - return; - } + public function __construct() { + $this->suite = new PHPUnit_Framework_TestSuite(); + + $this->suite->addTest(new Success()); + $this->suite->addTest(new Success()); + } + + public function testRepeatedOnce() { + $test = new PHPUnit_Extensions_RepeatedTest($this->suite, 1); + $this->assertEquals(2, count($test)); + + $result = $test->run(); + $this->assertEquals(2, count($result)); + } + + public function testRepeatedMoreThanOnce() { + $test = new PHPUnit_Extensions_RepeatedTest($this->suite, 3); + $this->assertEquals(6, count($test)); + + $result = $test->run(); + $this->assertEquals(6, count($result)); + } + + public function testRepeatedZero() { + $test = new PHPUnit_Extensions_RepeatedTest($this->suite, 0); + $this->assertEquals(0, count($test)); + + $result = $test->run(); + $this->assertEquals(0, count($result)); + } + + public function testRepeatedNegative() { + try { + $test = new PHPUnit_Extensions_RepeatedTest($this->suite, - 1); + } - $this->fail('Should throw an Exception'); + catch (Exception $e) { + return; } + + $this->fail('Should throw an Exception'); + } } ?> Modified: incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/SeleniumTestCaseTest.php URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/SeleniumTestCaseTest.php?rev=719967&r1=719966&r2=719967&view=diff ============================================================================== --- incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/SeleniumTestCaseTest.php (original) +++ incubator/shindig/trunk/php/external/PHPUnit/Tests/Extensions/SeleniumTestCaseTest.php Sun Nov 23 01:17:03 2008 @@ -60,105 +60,96 @@ * @link http://www.phpunit.de/ * @since Class available since Release 3.0.0 */ -class Extensions_SeleniumTestCaseTest extends PHPUnit_Extensions_SeleniumTestCase -{ - public function setUp() - { - if (!PHPUNIT_TESTSUITE_EXTENSION_SELENIUM_ENABLED) { - $this->markTestSkipped( - 'The Selenium tests are disabled.' - ); - } - - $this->setHost(PHPUNIT_TESTSUITE_EXTENSION_SELENIUM_HOST); - $this->setPort(PHPUNIT_TESTSUITE_EXTENSION_SELENIUM_PORT); - $this->setBrowser(PHPUNIT_TESTSUITE_EXTENSION_SELENIUM_BROWSER); - $this->setBrowserUrl('http://www.openqa.org/'); - $this->setTimeout(10000); - } - - public function testOpen() - { - $this->open('http://www.openqa.org/selenium-core/demo/passing/html/test_open.html'); - $this->assertTextPresent('This is a test of the open command.'); - } - - public function testClick() - { - $this->open('http://www.openqa.org/selenium-core/demo/passing/html/test_click_page1.html'); - $this->assertElementContainsText('nextPage', 'Click here for next page'); - $this->clickAndWait('nextPage'); - $this->assertLocationEquals('http://www.openqa.org/selenium-core/demo/passing/html/test_click_page2.html'); - $this->assertTextPresent('This is a test of the click command.'); - $this->clickAndWait('previousPage'); - $this->assertLocationEquals('http://www.openqa.org/selenium-core/demo/passing/html/test_click_page1.html'); - } - - public function testType() - { - $this->open('http://www.openqa.org/selenium-core/demo/passing/html/test_type_page1.html'); - $this->assertElementPresent('username'); - $this->type('username', 'TestUser'); - $this->assertElementValueEquals('username', 'TestUser'); - $this->assertElementPresent('password'); - $this->type('password', 'testUserPassword'); - $this->assertElementValueEquals('password', 'testUserPassword'); - $this->clickAndWait('submitButton'); - $this->assertTextPresent('Welcome, TestUser!'); - } +class Extensions_SeleniumTestCaseTest extends PHPUnit_Extensions_SeleniumTestCase { - public function testOpenFail() - { - $this->open('http://www.openqa.org/selenium-core/demo/failing/html/test_open.html'); - - try { - $this->assertTextPresent('This test has been modified so it will fail.'); - } - - catch (Exception $e) { - return; - } - - $this->fail(); - } - - public function testTypeFail() - { - $this->open('http://www.openqa.org/selenium-core/demo/failing/html/test_type_page1.html'); - $this->assertElementPresent('username'); - $this->type('username', 'TestUser'); - $this->assertElementValueEquals('username', 'TestUser'); - $this->assertElementPresent('password'); - $this->type('password', 'usersPassword'); - - try { - $this->assertElementValueEquals('password', 'testUserPassword'); - } - - catch (Exception $e) { - return; - } - - $this->fail(); - } - - public function testInPlaceEditor() - { - $this->open('http://www.openqa.org/selenium-core/ajaxdemo/scriptaculous-js-1.6.1/test/functional/ajax_inplaceeditor_test.html'); - $this->mouseOver('tobeedited'); - $this->click('tobeedited'); - $this->assertNotVisible('tobeedited'); - $this->assertElementPresent('tobeedited-inplaceeditor'); - $this->click('link=cancel'); - $this->assertElementContainsText('tobeedited', 'To be edited'); - $this->assertVisible('tobeedited'); - $this->click('tobeedited'); - $this->click("//[EMAIL PROTECTED]'editor_ok_button']"); - $this->assertVisible('tobeedited'); -# $this->waitForText('tobeedited', 'Server received: To be edited'); - // Workaround for not yet implemented waitForText - sleep(1); - $this->assertElementContainsText('tobeedited', 'Server received: To be edited'); - } + public function setUp() { + if (! PHPUNIT_TESTSUITE_EXTENSION_SELENIUM_ENABLED) { + $this->markTestSkipped('The Selenium tests are disabled.'); + } + + $this->setHost(PHPUNIT_TESTSUITE_EXTENSION_SELENIUM_HOST); + $this->setPort(PHPUNIT_TESTSUITE_EXTENSION_SELENIUM_PORT); + $this->setBrowser(PHPUNIT_TESTSUITE_EXTENSION_SELENIUM_BROWSER); + $this->setBrowserUrl('http://www.openqa.org/'); + $this->setTimeout(10000); + } + + public function testOpen() { + $this->open('http://www.openqa.org/selenium-core/demo/passing/html/test_open.html'); + $this->assertTextPresent('This is a test of the open command.'); + } + + public function testClick() { + $this->open('http://www.openqa.org/selenium-core/demo/passing/html/test_click_page1.html'); + $this->assertElementContainsText('nextPage', 'Click here for next page'); + $this->clickAndWait('nextPage'); + $this->assertLocationEquals('http://www.openqa.org/selenium-core/demo/passing/html/test_click_page2.html'); + $this->assertTextPresent('This is a test of the click command.'); + $this->clickAndWait('previousPage'); + $this->assertLocationEquals('http://www.openqa.org/selenium-core/demo/passing/html/test_click_page1.html'); + } + + public function testType() { + $this->open('http://www.openqa.org/selenium-core/demo/passing/html/test_type_page1.html'); + $this->assertElementPresent('username'); + $this->type('username', 'TestUser'); + $this->assertElementValueEquals('username', 'TestUser'); + $this->assertElementPresent('password'); + $this->type('password', 'testUserPassword'); + $this->assertElementValueEquals('password', 'testUserPassword'); + $this->clickAndWait('submitButton'); + $this->assertTextPresent('Welcome, TestUser!'); + } + + public function testOpenFail() { + $this->open('http://www.openqa.org/selenium-core/demo/failing/html/test_open.html'); + + try { + $this->assertTextPresent('This test has been modified so it will fail.'); + } + + catch (Exception $e) { + return; + } + + $this->fail(); + } + + public function testTypeFail() { + $this->open('http://www.openqa.org/selenium-core/demo/failing/html/test_type_page1.html'); + $this->assertElementPresent('username'); + $this->type('username', 'TestUser'); + $this->assertElementValueEquals('username', 'TestUser'); + $this->assertElementPresent('password'); + $this->type('password', 'usersPassword'); + + try { + $this->assertElementValueEquals('password', 'testUserPassword'); + } + + catch (Exception $e) { + return; + } + + $this->fail(); + } + + public function testInPlaceEditor() { + $this->open('http://www.openqa.org/selenium-core/ajaxdemo/scriptaculous-js-1.6.1/test/functional/ajax_inplaceeditor_test.html'); + $this->mouseOver('tobeedited'); + $this->click('tobeedited'); + $this->assertNotVisible('tobeedited'); + $this->assertElementPresent('tobeedited-inplaceeditor'); + $this->click('link=cancel'); + $this->assertElementContainsText('tobeedited', 'To be edited'); + $this->assertVisible('tobeedited'); + $this->click('tobeedited'); + $this->click("//[EMAIL PROTECTED]'editor_ok_button']"); + $this->assertVisible('tobeedited'); + # $this->waitForText('tobeedited', 'Server received: To be edited'); + // Workaround for not yet implemented waitForText + sleep(1); + $this->assertElementContainsText('tobeedited', 'Server received: To be edited'); + } } ?> Modified: incubator/shindig/trunk/php/external/PHPUnit/Tests/Framework/AllTests.php URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/PHPUnit/Tests/Framework/AllTests.php?rev=719967&r1=719966&r2=719967&view=diff ============================================================================== --- incubator/shindig/trunk/php/external/PHPUnit/Tests/Framework/AllTests.php (original) +++ incubator/shindig/trunk/php/external/PHPUnit/Tests/Framework/AllTests.php Sun Nov 23 01:17:03 2008 @@ -48,9 +48,9 @@ PHPUnit_Util_Filter::addFileToFilter(__FILE__); -if (!defined('PHPUnit_MAIN_METHOD')) { - define('PHPUnit_MAIN_METHOD', 'Framework_AllTests::main'); - chdir(dirname(dirname(__FILE__))); +if (! defined('PHPUnit_MAIN_METHOD')) { + define('PHPUnit_MAIN_METHOD', 'Framework_AllTests::main'); + chdir(dirname(dirname(__FILE__))); } require_once 'PHPUnit/Framework/TestSuite.php'; @@ -78,31 +78,29 @@ * @link http://www.phpunit.de/ * @since Class available since Release 2.0.0 */ -class Framework_AllTests -{ - public static function main() - { - PHPUnit_TextUI_TestRunner::run(self::suite()); - } - - public static function suite() - { - $suite = new PHPUnit_Framework_TestSuite('PHPUnit_Framework'); - - $suite->addTestSuite('Framework_AssertTest'); - $suite->addTestSuite('Framework_ComparisonFailureTest'); - $suite->addTestSuite('Framework_ConstraintTest'); - $suite->addTestSuite('Framework_MockObjectTest'); - $suite->addTestSuite('Framework_SuiteTest'); - $suite->addTestSuite('Framework_TestCaseTest'); - $suite->addTestSuite('Framework_TestImplementorTest'); - $suite->addTestSuite('Framework_TestListenerTest'); +class Framework_AllTests { - return $suite; - } + public static function main() { + PHPUnit_TextUI_TestRunner::run(self::suite()); + } + + public static function suite() { + $suite = new PHPUnit_Framework_TestSuite('PHPUnit_Framework'); + + $suite->addTestSuite('Framework_AssertTest'); + $suite->addTestSuite('Framework_ComparisonFailureTest'); + $suite->addTestSuite('Framework_ConstraintTest'); + $suite->addTestSuite('Framework_MockObjectTest'); + $suite->addTestSuite('Framework_SuiteTest'); + $suite->addTestSuite('Framework_TestCaseTest'); + $suite->addTestSuite('Framework_TestImplementorTest'); + $suite->addTestSuite('Framework_TestListenerTest'); + + return $suite; + } } if (PHPUnit_MAIN_METHOD == 'Framework_AllTests::main') { - Framework_AllTests::main(); + Framework_AllTests::main(); } ?>
