From 0f99714804a157244040e2d45e186de6c2982eaa Mon Sep 17 00:00:00 2001 From: xue <> Date: Mon, 23 Jan 2006 02:37:25 +0000 Subject: Added TPanel and TTable FT. --- .gitattributes | 2 ++ framework/Web/UI/WebControls/TTable.php | 2 +- .../quickstart_tests/Controls/PanelTestCase.php | 18 ++++++++++++++++++ .../quickstart_tests/Controls/TableTestCase.php | 20 ++++++++++++++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 tests/FunctionalTests/quickstart_tests/Controls/PanelTestCase.php create mode 100644 tests/FunctionalTests/quickstart_tests/Controls/TableTestCase.php diff --git a/.gitattributes b/.gitattributes index 81f5e3a9..fee3f5f6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -644,6 +644,8 @@ tests/FunctionalTests/protected/tests/HomePageTest.php -text tests/FunctionalTests/quickstart_tests/Controls/HyperLinkTestCase.php -text tests/FunctionalTests/quickstart_tests/Controls/ImageTestCase.php -text tests/FunctionalTests/quickstart_tests/Controls/LabelTestCase.php -text +tests/FunctionalTests/quickstart_tests/Controls/PanelTestCase.php -text +tests/FunctionalTests/quickstart_tests/Controls/TableTestCase.php -text tests/FunctionalTests/quickstart_tests/Fundamentals/HangmanTestCase.php -text tests/FunctionalTests/quickstart_tests/Fundamentals/HelloWorldTestCase.php -text tests/FunctionalTests/selenium/SeleneseRunner.html -text diff --git a/framework/Web/UI/WebControls/TTable.php b/framework/Web/UI/WebControls/TTable.php index 3ca3d51d..dab0fb60 100644 --- a/framework/Web/UI/WebControls/TTable.php +++ b/framework/Web/UI/WebControls/TTable.php @@ -270,7 +270,7 @@ class TTable extends TWebControl if(($caption=$this->getCaption())!=='') { if(($align=$this->getCaptionAlign())!=='NotSet') - $writer->addAttribute('align',$align); + $writer->addAttribute('align',strtolower($align)); $writer->renderBeginTag('caption'); $writer->write($caption); $writer->renderEndTag(); diff --git a/tests/FunctionalTests/quickstart_tests/Controls/PanelTestCase.php b/tests/FunctionalTests/quickstart_tests/Controls/PanelTestCase.php new file mode 100644 index 00000000..f5f5ccfd --- /dev/null +++ b/tests/FunctionalTests/quickstart_tests/Controls/PanelTestCase.php @@ -0,0 +1,18 @@ +open("../../demos/quickstart/?page=Controls.Samples.TPanel.Home", ""); + $this->verifyTextPresent("This is panel content with", ""); + $this->verifyElementPresent("//span[text()='label']"); + $this->verifyTextPresent("grouping text", ""); + $this->click("//input[@name='ctl0\$body\$ctl17' and @value='ctl0\$body\$ctl17']", ""); + $this->verifyTextNotPresent("You have clicked on 'button2'."); + $this->clickAndWait("//input[@type='submit' and @value='button2']", ""); + $this->verifyTextPresent("You have clicked on 'button2'."); + } +} + +?> \ No newline at end of file diff --git a/tests/FunctionalTests/quickstart_tests/Controls/TableTestCase.php b/tests/FunctionalTests/quickstart_tests/Controls/TableTestCase.php new file mode 100644 index 00000000..56ae8db9 --- /dev/null +++ b/tests/FunctionalTests/quickstart_tests/Controls/TableTestCase.php @@ -0,0 +1,20 @@ +open("../../demos/quickstart/?page=Controls.Samples.TTable.Home", ""); + + $this->verifyElementPresent("//table[@cellpadding='2' and @cellspacing='0' and @rules='all' and @border='1']"); + $this->verifyElementPresent("//table/caption[@align='bottom' and text()='This is table caption']"); + $this->verifyElementPresent("//th[text()='header cell 2']"); + $this->verifyElementPresent("//tr[@align='right']/td[text()='text']"); + $this->verifyElementPresent("//td[@align='center' and @colspan='2' and contains(text(),'cell 5')]"); + + $this->verifyElementPresent("//th[text()='Header 1']"); + $this->verifyElementPresent("//td[text()='Cell 1']"); + } +} + +?> \ No newline at end of file -- cgit v1.2.3