From dcaa0390c1d1335f47f0dd4b8784dc550e3d9f93 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Mon, 6 Jan 2014 22:44:30 +0100 Subject: Removed all @version $Id comments: they were managed by svn and are useless with git (cherry picked from commit 3e9969766153839abfb7de59e0c778a604bfbf55) Conflicts: framework/Web/UI/ActiveControls/TCallbackClientScript.php framework/Web/UI/JuiControls/TJuiAutoComplete.php framework/Web/UI/JuiControls/TJuiControlAdapter.php framework/Web/UI/JuiControls/TJuiDraggable.php framework/Web/UI/JuiControls/TJuiDroppable.php framework/Web/UI/JuiControls/TJuiResizable.php framework/Web/UI/JuiControls/TJuiSelectable.php framework/Web/UI/JuiControls/TJuiSortable.php --- .../tickets/protected/controls/ToggleImageButton.php | 1 - .../tickets/protected/pages/ExtendedToggleImageButton.php | 7 +++---- tests/FunctionalTests/tickets/protected/pages/Ticket659.php | 5 ++--- tests/FunctionalTests/tickets/protected/pages/ToggleTest.php | 5 ++--- 4 files changed, 7 insertions(+), 11 deletions(-) (limited to 'tests/FunctionalTests/tickets/protected') diff --git a/tests/FunctionalTests/tickets/protected/controls/ToggleImageButton.php b/tests/FunctionalTests/tickets/protected/controls/ToggleImageButton.php index 9aecda84..0165edac 100755 --- a/tests/FunctionalTests/tickets/protected/controls/ToggleImageButton.php +++ b/tests/FunctionalTests/tickets/protected/controls/ToggleImageButton.php @@ -6,7 +6,6 @@ * @author Christophe BOULAIN (Christophe.Boulain@ceram.fr) * @copyright Copyright © 2007, CERAM Sophia Antipolis * @license url nameoflicense - * @version $Id: ToggleImageButton.php 2043 2007-06-30 15:07:50Z xue $ * */ diff --git a/tests/FunctionalTests/tickets/protected/pages/ExtendedToggleImageButton.php b/tests/FunctionalTests/tickets/protected/pages/ExtendedToggleImageButton.php index 934efcef..7bc53ba3 100755 --- a/tests/FunctionalTests/tickets/protected/pages/ExtendedToggleImageButton.php +++ b/tests/FunctionalTests/tickets/protected/pages/ExtendedToggleImageButton.php @@ -1,16 +1,15 @@ Date: Tue, 14 Jan 2014 22:36:10 +0100 Subject: Removed TJavascriptLogger from demos and tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Any browser’s development tool is way better, and it stops exceptions from being catched by the browser’s console (cherry picked from commit 0a136fe37491281ada5084b6eb5a72d4ca8d948a) --- demos/chat/protected/pages/Home.page | 9 ++++----- .../pages/ActiveControls/Samples/TActiveButton/Home.page | 1 - .../pages/ActiveControls/Samples/TActiveCheckBox/Home.page | 1 - .../ActiveControls/Samples/TActiveCustomValidator/Home.page | 1 - .../pages/ActiveControls/Samples/TActiveHyperLink/Home.page | 1 - .../pages/ActiveControls/Samples/TActivePager/Home.page | 1 - .../pages/ActiveControls/Samples/TActivePanel/Home.page | 1 - .../pages/ActiveControls/Samples/TActiveTableRow/Home.page | 1 - .../ActiveControls/Samples/TCallbackClientSide/Home.page | 1 - .../pages/ActiveControls/Samples/TCallbackOptions/Home.page | 1 - .../protected/pages/Controls/Samples/TPanel/Home.page | 1 - demos/quickstart/protected/pages/Tutorial/AjaxChat.page | 7 +++---- demos/quickstart/protected/pages/Tutorial/fr/AjaxChat.page | 5 ++--- .../active-controls/protected/pages/ActiveBricksTest.page | 2 -- .../active-controls/protected/pages/ActiveButtonTest.page | 2 -- .../active-controls/protected/pages/ActiveCheckBoxTest.page | 1 - .../protected/pages/ActiveControlExpressionTag.page | 1 - .../protected/pages/ActiveControlWithTinyMce.page | 1 - .../active-controls/protected/pages/ActiveDropDownList.page | 2 -- .../protected/pages/ActiveHiddenFieldTest.page | 5 ++--- .../protected/pages/ActiveHyperLinkTest.page | 4 +--- .../protected/pages/ActiveImageButtonTest.page | 2 -- .../protected/pages/ActiveLinkButtonTest.page | 2 -- .../protected/pages/ActiveListBoxMasterTest.page | 2 -- .../active-controls/protected/pages/ActiveListBoxTest.page | 2 -- .../active-controls/protected/pages/ActivePanelTest.page | 1 - .../protected/pages/ActivePanelVisibleTest.page | 1 - .../protected/pages/ActiveRadioButtonListTest.page | 2 -- .../protected/pages/ActiveRadioButtonTest.page | 1 - .../protected/pages/ActiveRedirectionTest.page | 1 - .../protected/pages/ActiveTextBoxCallback.page | 1 - .../active-controls/protected/pages/AutoCompleteTest.page | 5 ++--- .../active-controls/protected/pages/Callback.page | 10 ++++------ .../protected/pages/CallbackCustomValidatorTest.page | 2 -- .../active-controls/protected/pages/ClientSideDispatch.page | 11 +++++------ .../active-controls/protected/pages/ControlAdapterTest.page | 5 ++--- .../protected/pages/CustomTemplateControlTest.page | 3 --- .../protected/pages/CustomValidatorByPass.page | 13 ++++++------- .../active-controls/protected/pages/DelayedCallback.page | 1 - .../active-controls/protected/pages/DisplayStyleTest.page | 1 - .../protected/pages/DynamicRepeaterDataTest.page | 1 - .../protected/pages/EventTriggeredCallback.page | 1 - .../active-controls/protected/pages/GerTurno2.page | 3 +-- .../protected/pages/InPlaceWithValidator.page | 13 ++++++------- .../active-controls/protected/pages/LargePageStateTest.page | 1 - .../protected/pages/LargePageStateTest2.page | 1 - .../active-controls/protected/pages/MessagesPanelTest.page | 1 - .../active-controls/protected/pages/MyTabPanelTest.page | 1 - .../protected/pages/NestedActiveControls.page | 7 +++---- .../active-controls/protected/pages/NullStateTest.page | 1 - .../active-controls/protected/pages/PopulateActiveList.page | 1 - .../active-controls/protected/pages/PostLoadingTest.page | 2 -- .../protected/pages/RadioButtonListTest.page | 9 ++++----- .../active-controls/protected/pages/RatingList.page | 1 - .../protected/pages/RepeaterWithActiveControls.page | 1 - .../active-controls/protected/pages/ReplaceContentTest.page | 1 - .../protected/pages/Sessioned/PageStateTest.page | 1 - .../protected/pages/TActiveCheckBoxListTest.page | 2 -- .../protected/pages/TActiveFileUploadAutoPostBackTest.page | 8 +++----- .../protected/pages/TInPlaceTextBoxTest.page | 4 +--- .../protected/pages/TextBoxValidationCallback.page | 1 - .../protected/pages/TimeTriggeredCallbackTest.page | 1 - .../protected/pages/ValueTriggerCallbackTest.page | 1 - .../FunctionalTests/features/protected/controls/Layout.tpl | 1 - tests/FunctionalTests/tickets/protected/pages/Layout.tpl | 9 ++++----- .../tickets/protected/pages/Ticket653/Layout.tpl | 9 ++++----- tests/FunctionalTests/validators/protected/pages/Layout.tpl | 1 - 67 files changed, 57 insertions(+), 141 deletions(-) (limited to 'tests/FunctionalTests/tickets/protected') diff --git a/demos/chat/protected/pages/Home.page b/demos/chat/protected/pages/Home.page index b896cd28..7740c062 100755 --- a/demos/chat/protected/pages/Home.page +++ b/demos/chat/protected/pages/Home.page @@ -1,5 +1,5 @@ - + Prado Chat Demo @@ -17,14 +17,14 @@
- - OnClick="processMessage"/>
- @@ -39,7 +39,6 @@ }); - </com:TForm> -<com:TJavascriptLogger /> @@ -572,7 +571,7 @@ public function getUserMessages($user) $content = ''; foreach($this->findAll('for_user = ?', $user) as $message) $content .= $this->formatMessage($message); - $this->deleteAll('for_user = ? OR created_on < ?', + $this->deleteAll('for_user = ? OR created_on < ?', $user, time() - 300); //5 min inactivity return $content; } @@ -581,7 +580,7 @@ protected function formatMessage($message) { $user = htmlspecialchars($message->from_user); $content = htmlspecialchars($message->message); - return "
{$user}:" + return "
{$user}:" ." {$content}
"; } diff --git a/demos/quickstart/protected/pages/Tutorial/fr/AjaxChat.page b/demos/quickstart/protected/pages/Tutorial/fr/AjaxChat.page index 66bb0e43..39d7f9e5 100755 --- a/demos/quickstart/protected/pages/Tutorial/fr/AjaxChat.page +++ b/demos/quickstart/protected/pages/Tutorial/fr/AjaxChat.page @@ -430,7 +430,6 @@ and a button to send the message. Text="Send" />
</com:TForm> -<com:TJavascriptLogger /> @@ -571,7 +570,7 @@ public function getUserMessages($user) $content = ''; foreach($this->findAll('for_user = ?', $user) as $message) $content .= $this->formatMessage($message); - $this->deleteAll('for_user = ? OR created_on < ?', + $this->deleteAll('for_user = ? OR created_on < ?', $user, time() - 300); //5 min inactivity return $content; } @@ -580,7 +579,7 @@ protected function formatMessage($message) { $user = htmlspecialchars($message->from_user); $content = htmlspecialchars($message->message); - return "
{$user}:" + return "
{$user}:" ." {$content}
"; } diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveBricksTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveBricksTest.page index 7cb8c6b3..4ea65f04 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ActiveBricksTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveBricksTest.page @@ -37,6 +37,4 @@ AIP - - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveButtonTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveButtonTest.page index 2e192c19..a5788625 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ActiveButtonTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveButtonTest.page @@ -6,6 +6,4 @@ - - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveCheckBoxTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveCheckBoxTest.page index 431d42f2..cea4d3d8 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ActiveCheckBoxTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveCheckBoxTest.page @@ -25,5 +25,4 @@ position: absolute; right: 0; top: 0"> Loading...
- \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveControlExpressionTag.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveControlExpressionTag.page index 7b983cd7..b4ce61d4 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ActiveControlExpressionTag.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveControlExpressionTag.page @@ -22,6 +22,5 @@ - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveControlWithTinyMce.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveControlWithTinyMce.page index aa3be754..c6748403 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ActiveControlWithTinyMce.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveControlWithTinyMce.page @@ -7,5 +7,4 @@ - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveDropDownList.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveDropDownList.page index dc71a228..4fcd789a 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ActiveDropDownList.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveDropDownList.page @@ -26,6 +26,4 @@ - - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveHiddenFieldTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveHiddenFieldTest.page index f0fc4b92..837cc580 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ActiveHiddenFieldTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveHiddenFieldTest.page @@ -1,9 +1,9 @@

Active HiddenField Test Case

- + - +
@@ -12,5 +12,4 @@
- \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.page index 59098052..740c3b21 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.page @@ -1,6 +1,6 @@

Active HyperLink Test Case

- +
@@ -8,6 +8,4 @@ - -
\ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveImageButtonTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveImageButtonTest.page index 7696261a..ff0f588f 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ActiveImageButtonTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveImageButtonTest.page @@ -19,6 +19,4 @@ - - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveLinkButtonTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveLinkButtonTest.page index cb9f0322..39c53fe8 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ActiveLinkButtonTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveLinkButtonTest.page @@ -6,6 +6,4 @@ - - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxMasterTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxMasterTest.page index f7c6baaf..115b833a 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxMasterTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxMasterTest.page @@ -23,6 +23,4 @@
- - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxTest.page index 318d53c3..bf13a61b 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxTest.page @@ -22,6 +22,4 @@ - -
\ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page index 7ab4bab9..a836de5b 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page @@ -18,5 +18,4 @@ }) }) - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.page index 0795e46b..cb2802e5 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.page @@ -12,6 +12,5 @@ bar - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonListTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonListTest.page index 26feb594..1c59cfed 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonListTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonListTest.page @@ -17,6 +17,4 @@ - - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonTest.page index 2bb4c9de..18e4fc37 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonTest.page @@ -34,5 +34,4 @@ position: absolute; right: 0; top: 0"> Loading... - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveRedirectionTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveRedirectionTest.page index 5f7959c5..fa0d8caa 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ActiveRedirectionTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveRedirectionTest.page @@ -3,6 +3,5 @@ - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveTextBoxCallback.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveTextBoxCallback.page index b05ce62e..d0a750ac 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ActiveTextBoxCallback.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveTextBoxCallback.page @@ -2,5 +2,4 @@

ActiveTextBox Callback Test

- \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/AutoCompleteTest.page b/tests/FunctionalTests/active-controls/protected/pages/AutoCompleteTest.page index 477764c3..f4fffc63 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/AutoCompleteTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/AutoCompleteTest.page @@ -58,7 +58,7 @@
  • << <%# $this->Data %> - >> + >>
  • @@ -79,7 +79,7 @@ OnSuggest="suggestCountries" OnCallback="callback_requested" OnSuggestionSelected="suggestion_selected" - ResultPanel.CssClass="autocomplete" + ResultPanel.CssClass="autocomplete" MinChars="4" Frequency="2" />


    @@ -91,5 +91,4 @@




    - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/Callback.page b/tests/FunctionalTests/active-controls/protected/pages/Callback.page index d8744760..3404cf6e 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/Callback.page +++ b/tests/FunctionalTests/active-controls/protected/pages/Callback.page @@ -1,15 +1,13 @@ - + } +
    Click Me!
    - -
    \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/CallbackCustomValidatorTest.page b/tests/FunctionalTests/active-controls/protected/pages/CallbackCustomValidatorTest.page index a99fbf55..4c82da40 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/CallbackCustomValidatorTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/CallbackCustomValidatorTest.page @@ -37,6 +37,4 @@ - - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ClientSideDispatch.page b/tests/FunctionalTests/active-controls/protected/pages/ClientSideDispatch.page index acf56bfe..de4ea482 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ClientSideDispatch.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ClientSideDispatch.page @@ -7,21 +7,20 @@ var link1 = Prado.CallbackRequest.getRequestById('<%= $this->link1->ClientID %>'); Prado.Callback('<%= $this->callback1->UniqueID %>', link1.getCallbackParameter()); - + - - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ControlAdapterTest.page b/tests/FunctionalTests/active-controls/protected/pages/ControlAdapterTest.page index f0f3044d..c5642712 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ControlAdapterTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ControlAdapterTest.page @@ -1,10 +1,10 @@

    Control Adapter - State Tracking Tests

    - - +
    @@ -19,5 +19,4 @@
    -
    \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/CustomTemplateControlTest.page b/tests/FunctionalTests/active-controls/protected/pages/CustomTemplateControlTest.page index 3bed7d5b..4c0eaf03 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/CustomTemplateControlTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/CustomTemplateControlTest.page @@ -10,7 +10,4 @@ - - - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.page b/tests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.page index 08b7bb3e..28f27b8f 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.page +++ b/tests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.page @@ -10,19 +10,19 @@ Username:
    -
    Password:
    - @@ -33,6 +33,5 @@ - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/DelayedCallback.page b/tests/FunctionalTests/active-controls/protected/pages/DelayedCallback.page index b8fba648..d3447635 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/DelayedCallback.page +++ b/tests/FunctionalTests/active-controls/protected/pages/DelayedCallback.page @@ -3,5 +3,4 @@ - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/DisplayStyleTest.page b/tests/FunctionalTests/active-controls/protected/pages/DisplayStyleTest.page index df1db27a..09ec16ed 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/DisplayStyleTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/DisplayStyleTest.page @@ -17,6 +17,5 @@ here. - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/DynamicRepeaterDataTest.page b/tests/FunctionalTests/active-controls/protected/pages/DynamicRepeaterDataTest.page index 913f6a17..7863fafe 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/DynamicRepeaterDataTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/DynamicRepeaterDataTest.page @@ -11,6 +11,5 @@
    - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/EventTriggeredCallback.page b/tests/FunctionalTests/active-controls/protected/pages/EventTriggeredCallback.page index 889636f3..80d94cbb 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/EventTriggeredCallback.page +++ b/tests/FunctionalTests/active-controls/protected/pages/EventTriggeredCallback.page @@ -27,5 +27,4 @@
    - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/GerTurno2.page b/tests/FunctionalTests/active-controls/protected/pages/GerTurno2.page index f4bf644c..2952c36c 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/GerTurno2.page +++ b/tests/FunctionalTests/active-controls/protected/pages/GerTurno2.page @@ -1,7 +1,7 @@ - @@ -11,6 +11,5 @@ - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/InPlaceWithValidator.page b/tests/FunctionalTests/active-controls/protected/pages/InPlaceWithValidator.page index ba3a35db..2a80a57a 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/InPlaceWithValidator.page +++ b/tests/FunctionalTests/active-controls/protected/pages/InPlaceWithValidator.page @@ -60,19 +60,18 @@ ValidationGroup="Group" />
    - - + + />
    - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest.page b/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest.page index 701bd74c..c265f9d2 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest.page @@ -4,7 +4,6 @@ - diff --git a/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest2.page b/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest2.page index 0b662617..168b7b8c 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest2.page +++ b/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest2.page @@ -5,7 +5,6 @@ - diff --git a/tests/FunctionalTests/active-controls/protected/pages/MessagesPanelTest.page b/tests/FunctionalTests/active-controls/protected/pages/MessagesPanelTest.page index ab4798a8..248d1760 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/MessagesPanelTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/MessagesPanelTest.page @@ -3,5 +3,4 @@ - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.page b/tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.page index 7371086a..5e04cd28 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.page @@ -36,6 +36,5 @@ This is the contents of panel C - diff --git a/tests/FunctionalTests/active-controls/protected/pages/NestedActiveControls.page b/tests/FunctionalTests/active-controls/protected/pages/NestedActiveControls.page index 9d3a3d61..a7875c0d 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/NestedActiveControls.page +++ b/tests/FunctionalTests/active-controls/protected/pages/NestedActiveControls.page @@ -3,10 +3,10 @@ - Something lalala + Something lalala - + @@ -23,6 +23,5 @@ }) }) - - + diff --git a/tests/FunctionalTests/active-controls/protected/pages/NullStateTest.page b/tests/FunctionalTests/active-controls/protected/pages/NullStateTest.page index 2ce98f5b..64643177 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/NullStateTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/NullStateTest.page @@ -5,6 +5,5 @@ - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/PopulateActiveList.page b/tests/FunctionalTests/active-controls/protected/pages/PopulateActiveList.page index c7bf0952..24cdb366 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/PopulateActiveList.page +++ b/tests/FunctionalTests/active-controls/protected/pages/PopulateActiveList.page @@ -12,6 +12,5 @@ - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page b/tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page index 09ab2fbc..885b368f 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page @@ -19,6 +19,4 @@ }) - - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/RadioButtonListTest.page b/tests/FunctionalTests/active-controls/protected/pages/RadioButtonListTest.page index 7de9c6ab..9d900e15 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/RadioButtonListTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/RadioButtonListTest.page @@ -6,8 +6,8 @@ Display="Dynamic" ValidationGroup="Group" /> -
    - + @@ -16,15 +16,14 @@



    + ValidationGroup="Group" /> - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/RatingList.page b/tests/FunctionalTests/active-controls/protected/pages/RatingList.page index ba9c2e5d..d50e5929 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/RatingList.page +++ b/tests/FunctionalTests/active-controls/protected/pages/RatingList.page @@ -93,6 +93,5 @@ Loading... - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/RepeaterWithActiveControls.page b/tests/FunctionalTests/active-controls/protected/pages/RepeaterWithActiveControls.page index b94fdbfb..59410b0b 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/RepeaterWithActiveControls.page +++ b/tests/FunctionalTests/active-controls/protected/pages/RepeaterWithActiveControls.page @@ -56,6 +56,5 @@ - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ReplaceContentTest.page b/tests/FunctionalTests/active-controls/protected/pages/ReplaceContentTest.page index 7842cde9..6127c313 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ReplaceContentTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ReplaceContentTest.page @@ -26,6 +26,5 @@ Main Panel - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/Sessioned/PageStateTest.page b/tests/FunctionalTests/active-controls/protected/pages/Sessioned/PageStateTest.page index fdd4a604..194f35d6 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/Sessioned/PageStateTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/Sessioned/PageStateTest.page @@ -42,6 +42,5 @@ - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/TActiveCheckBoxListTest.page b/tests/FunctionalTests/active-controls/protected/pages/TActiveCheckBoxListTest.page index f3332bad..460d2f71 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/TActiveCheckBoxListTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/TActiveCheckBoxListTest.page @@ -19,6 +19,4 @@ - - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.page b/tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.page index 41390e52..66c2a0c4 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.page @@ -2,13 +2,11 @@

    TActiveFileUpload AutoPostBack Functional Test

    - + - + - - - + \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/TInPlaceTextBoxTest.page b/tests/FunctionalTests/active-controls/protected/pages/TInPlaceTextBoxTest.page index 8c0a0d71..33ba6dda 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/TInPlaceTextBoxTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/TInPlaceTextBoxTest.page @@ -61,7 +61,7 @@ - - - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/TextBoxValidationCallback.page b/tests/FunctionalTests/active-controls/protected/pages/TextBoxValidationCallback.page index 79fc17e0..1746c628 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/TextBoxValidationCallback.page +++ b/tests/FunctionalTests/active-controls/protected/pages/TextBoxValidationCallback.page @@ -14,7 +14,6 @@ Maxlength="12" ValidationGroup="post" OnCallback="lookupZipCode"/> - diff --git a/tests/FunctionalTests/active-controls/protected/pages/TimeTriggeredCallbackTest.page b/tests/FunctionalTests/active-controls/protected/pages/TimeTriggeredCallbackTest.page index a285f03d..680922a3 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/TimeTriggeredCallbackTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/TimeTriggeredCallbackTest.page @@ -17,5 +17,4 @@ position: absolute; right: 0; top: 0"> Loading... - \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/ValueTriggerCallbackTest.page b/tests/FunctionalTests/active-controls/protected/pages/ValueTriggerCallbackTest.page index 1281cc5c..4097f69c 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ValueTriggerCallbackTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ValueTriggerCallbackTest.page @@ -9,6 +9,5 @@ - \ No newline at end of file diff --git a/tests/FunctionalTests/features/protected/controls/Layout.tpl b/tests/FunctionalTests/features/protected/controls/Layout.tpl index dbd433b8..66b42f6c 100755 --- a/tests/FunctionalTests/features/protected/controls/Layout.tpl +++ b/tests/FunctionalTests/features/protected/controls/Layout.tpl @@ -27,7 +27,6 @@ - \ No newline at end of file diff --git a/tests/FunctionalTests/tickets/protected/pages/Layout.tpl b/tests/FunctionalTests/tickets/protected/pages/Layout.tpl index bf2f8fab..b245a50d 100755 --- a/tests/FunctionalTests/tickets/protected/pages/Layout.tpl +++ b/tests/FunctionalTests/tickets/protected/pages/Layout.tpl @@ -1,7 +1,7 @@ - - + @@ -30,7 +30,6 @@
    - diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket653/Layout.tpl b/tests/FunctionalTests/tickets/protected/pages/Ticket653/Layout.tpl index bf2f8fab..b245a50d 100755 --- a/tests/FunctionalTests/tickets/protected/pages/Ticket653/Layout.tpl +++ b/tests/FunctionalTests/tickets/protected/pages/Ticket653/Layout.tpl @@ -1,7 +1,7 @@ - - + @@ -30,7 +30,6 @@
    - diff --git a/tests/FunctionalTests/validators/protected/pages/Layout.tpl b/tests/FunctionalTests/validators/protected/pages/Layout.tpl index 25dbea09..47591ef3 100755 --- a/tests/FunctionalTests/validators/protected/pages/Layout.tpl +++ b/tests/FunctionalTests/validators/protected/pages/Layout.tpl @@ -33,7 +33,6 @@
    -
    \ No newline at end of file -- cgit v1.2.3 From 94e54d3023ed89281f89125f3ad0553afb9312cb Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Wed, 5 Mar 2014 23:02:18 +0100 Subject: Started cleaning tests' selenium2 compatibility layer (cherry picked from commit 4ce02f6973aa40c313364b5ff7990f2244309790) Conflicts: tests/FunctionalTests/tickets/tests/Ticket220TestCase.php tests/FunctionalTests/tickets/tests/Ticket719TestCase.php tests/FunctionalTests/tickets/tests/Ticket769TestCase.php tests/FunctionalTests/validators/tests/CompareValidatorTestCase.php tests/FunctionalTests/validators/tests/DataTypeValidatorTestCase.php tests/FunctionalTests/validators/tests/DatePickerTestCase.php --- .../active-controls/tests/ActiveButtonTestCase.php | 2 +- .../tests/ActiveCheckBoxListTestCase.php | 20 +-- .../tests/ActiveCheckBoxTestCase.php | 30 ++-- .../tests/ActiveControlExpressTagTestCase.php | 6 +- .../tests/ActiveDatePickerTestCase.php | 36 ++--- .../tests/ActiveDropDownListTestCase.php | 10 +- .../tests/ActiveHiddenFieldTestCase.php | 8 +- .../tests/ActiveHyperLinkTestCase.php | 4 +- .../tests/ActiveImageButtonTestCase.php | 6 +- .../tests/ActiveLinkButtonTestCase.php | 4 +- .../tests/ActiveListBoxMasterTestCase.php | 16 +- .../tests/ActiveListBoxTestCase.php | 16 +- .../active-controls/tests/ActivePanelTestCase.php | 8 +- .../tests/ActiveRadioButtonListTestCase.php | 16 +- .../tests/ActiveRadioButtonTestCase.php | 36 ++--- .../active-controls/tests/AutoCompleteTestCase.php | 16 +- .../active-controls/tests/CalculatorTestCase.php | 6 +- .../tests/CallbackAdapterTestCase.php | 57 ++++---- .../tests/CallbackOptionsTestCase.php | 8 +- .../tests/CustomTemplateTestCase.php | 6 +- .../tests/DelayedCallbackTestCase.php | 6 +- .../active-controls/tests/EventTriggerTestCase.php | 4 +- .../tests/NestedActiveControlsTestCase.php | 10 +- .../active-controls/tests/PopulateListTestCase.php | 6 +- .../active-controls/tests/PostLoadingTestCase.php | 10 +- .../tests/ReplaceContentTestCase.php | 24 +-- .../tests/TextBoxCallbackTestCase.php | 2 +- .../tests/TextBoxGroupValidationTestCase.php | 2 +- .../tests/TimeTriggeredCallbackTestCase.php | 4 +- .../tests/ValueTriggerCallbackTestCase.php | 2 +- .../ActiveRatingListTestCase.php | 38 ++--- .../features/protected/pages/I18N/BasicI18N.php | 14 +- .../FunctionalTests/features/tests/MyTestCase.php | 2 +- .../ActiveControls/ActiveButtonTestCase.php | 12 +- .../ActiveControls/ActiveCheckBoxTestCase.php | 44 +++--- .../ActiveCustomValidatorTestCase.php | 8 +- tests/FunctionalTests/quickstart/Advanced/I18N.php | 70 ++++----- .../quickstart/Controls/BulletedListTestCase.php | 26 ++-- .../quickstart/Controls/ButtonTestCase.php | 12 +- .../quickstart/Controls/CheckBoxListTestCase.php | 30 ++-- .../quickstart/Controls/CheckBoxTestCase.php | 32 ++-- .../quickstart/Controls/DataGrid1TestCase.php | 30 ++-- .../quickstart/Controls/DataGrid2TestCase.php | 40 ++--- .../quickstart/Controls/DataGrid3TestCase.php | 56 +++---- .../quickstart/Controls/DataGrid4TestCase.php | 30 ++-- .../quickstart/Controls/DataGrid5TestCase.php | 162 ++++++++++----------- .../quickstart/Controls/DataGrid6TestCase.php | 64 ++++---- .../quickstart/Controls/DataList1TestCase.php | 18 +-- .../quickstart/Controls/DataList2TestCase.php | 68 +++++---- .../quickstart/Controls/DropDownListTestCase.php | 40 ++--- .../quickstart/Controls/ExpressionTestCase.php | 4 +- .../quickstart/Controls/HtmlAreaTestCase.php | 2 +- .../quickstart/Controls/HyperLinkTestCase.php | 6 +- .../quickstart/Controls/ImageButtonTestCase.php | 14 +- .../quickstart/Controls/ImageTestCase.php | 4 +- .../quickstart/Controls/LabelTestCase.php | 14 +- .../quickstart/Controls/LinkButtonTestCase.php | 18 +-- .../quickstart/Controls/ListBoxTestCase.php | 54 +++---- .../quickstart/Controls/MultiViewTestCase.php | 22 +-- .../quickstart/Controls/PagerTestCase.php | 78 +++++----- .../quickstart/Controls/PanelTestCase.php | 12 +- .../Controls/RadioButtonListTestCase.php | 30 ++-- .../quickstart/Controls/RadioButtonTestCase.php | 46 +++--- .../quickstart/Controls/Repeater1TestCase.php | 24 +-- .../quickstart/Controls/Repeater2TestCase.php | 12 +- .../quickstart/Controls/Repeater3TestCase.php | 10 +- .../quickstart/Controls/StatementsTestCase.php | 4 +- .../quickstart/Controls/TabPanelTestCase.php | 10 +- .../quickstart/Controls/TextBoxTestCase.php | 24 +-- .../quickstart/Controls/Wizard1TestCase.php | 18 +-- .../quickstart/Controls/Wizard2TestCase.php | 18 +-- .../quickstart/Controls/Wizard3TestCase.php | 34 ++--- .../quickstart/Controls/Wizard4TestCase.php | 32 ++-- .../quickstart/Controls/Wizard5TestCase.php | 22 +-- .../quickstart/Fundamentals/HangmanTestCase.php | 46 +++--- .../protected/pages/Ticket703/Ticket703.php | 10 +- .../tickets/tests/Issue120TestCase.php | 4 +- .../tickets/tests/Issue216TestCase.php | 8 +- .../tickets/tests/Ticket121TestCase.php | 6 +- .../tickets/tests/Ticket163TestCase.php | 6 +- .../tickets/tests/Ticket169TestCase.php | 2 +- .../tickets/tests/Ticket191TestCase.php | 4 +- .../tickets/tests/Ticket205TestCase.php | 9 +- .../tickets/tests/Ticket207TestCase.php | 16 +- .../tickets/tests/Ticket21TestCase.php | 8 +- .../tickets/tests/Ticket220TestCase.php | 4 +- .../tickets/tests/Ticket225TestCase.php | 8 +- .../tickets/tests/Ticket239TestCase.php | 68 ++++----- .../tickets/tests/Ticket274TestCase.php | 4 +- .../tickets/tests/Ticket278TestCase.php | 14 +- .../tickets/tests/Ticket27TestCase.php | 12 +- .../tickets/tests/Ticket284TestCase.php | 4 +- .../tickets/tests/Ticket285TestCase.php | 4 +- .../tickets/tests/Ticket28TestCase.php | 6 +- .../tickets/tests/Ticket290TestCase.php | 2 +- .../tickets/tests/Ticket433TestCase.php | 2 +- .../tickets/tests/Ticket439TestCase.php | 2 +- .../tickets/tests/Ticket463TestCase.php | 4 +- .../tickets/tests/Ticket470TestCase.php | 12 +- .../tickets/tests/Ticket477TestCase.php | 4 +- .../tickets/tests/Ticket488TestCase.php | 10 +- .../tickets/tests/Ticket504TestCase.php | 10 +- .../tickets/tests/Ticket507TestCase.php | 4 +- .../tickets/tests/Ticket521TestCase.php | 2 +- .../tickets/tests/Ticket526TestCase.php | 4 +- .../tickets/tests/Ticket535TestCase.php | 16 +- .../tickets/tests/Ticket538TestCase.php | 6 +- .../tickets/tests/Ticket54TestCase.php | 2 +- .../tickets/tests/Ticket573TestCase.php | 2 +- .../tickets/tests/Ticket578TestCase.php | 6 +- .../tickets/tests/Ticket585TestCase.php | 6 +- .../tickets/tests/Ticket586TestCase.php | 4 +- .../tickets/tests/Ticket587TestCase.php | 2 +- .../tickets/tests/Ticket592TestCase.php | 24 +-- .../tickets/tests/Ticket595TestCase.php | 24 +-- .../tickets/tests/Ticket622TestCase.php | 8 +- .../tickets/tests/Ticket653TestCase.php | 2 +- .../tickets/tests/Ticket656TestCase.php | 4 +- .../tickets/tests/Ticket659TestCase.php | 4 +- .../tickets/tests/Ticket660TestCase.php | 6 +- .../tickets/tests/Ticket669TestCase.php | 16 +- .../tickets/tests/Ticket670TestCase.php | 4 +- .../tickets/tests/Ticket671TestCase.php | 8 +- .../tickets/tests/Ticket671_reopenedTestCase.php | 10 +- .../tickets/tests/Ticket679TestCase.php | 14 +- .../tickets/tests/Ticket691TestCase.php | 2 +- .../tickets/tests/Ticket698TestCase.php | 4 +- .../tickets/tests/Ticket700TestCase.php | 72 ++++----- .../tickets/tests/Ticket703TestCase.php | 11 +- .../tickets/tests/Ticket708TestCase.php | 8 +- .../tickets/tests/Ticket719TestCase.php | 14 +- .../tickets/tests/Ticket722TestCase.php | 6 +- .../tickets/tests/Ticket72TestCase.php | 6 +- .../tickets/tests/Ticket745TestCase.php | 5 +- .../tickets/tests/Ticket769TestCase.php | 12 +- .../tickets/tests/Ticket785TestCase.php | 8 +- .../tickets/tests/Ticket828TestCase.php | 28 ++-- .../tickets/tests/Ticket849TestCase.php | 4 +- .../tickets/tests/Ticket876TestCase.php | 6 +- .../tickets/tests/Ticket886TestCase.php | 4 +- .../tickets/tests/Ticket897TestCase.php | 4 +- .../tickets/tests/Ticket900TestCase.php | 6 +- .../tickets/tests/Ticket922TestCase.php | 2 +- .../tickets/tests/Ticket93TestCase.php | 2 +- .../validators/tests/ButtonTestCase.php | 26 ++-- .../validators/tests/CheckBoxTestCase.php | 30 ++-- .../validators/tests/CompareValidatorTestCase.php | 12 +- .../tests/ConditionalValidationTestCase.php | 56 +++---- .../validators/tests/CustomValidatorTestCase.php | 6 +- .../validators/tests/DataTypeValidatorTestCase.php | 10 +- .../validators/tests/DatePickerTestCase.php | 78 +++++----- .../validators/tests/ImageButtonTestCase.php | 26 ++-- .../validators/tests/LinkButtonTestCase.php | 26 ++-- .../validators/tests/ListControlTestCase.php | 28 ++-- .../validators/tests/RangeValidatorTestCase.php | 154 ++++++++++---------- .../validators/tests/RegExpValidatorTestCase.php | 30 ++-- .../validators/tests/RequiredFieldTestCase.php | 46 +++--- .../validators/tests/RequiredListTestCase.php | 28 ++-- .../validators/tests/ValidationSummaryTestCase.php | 16 +- tests/test_tools/PradoGenericSelenium2Test.php | 90 +----------- 160 files changed, 1484 insertions(+), 1538 deletions(-) (limited to 'tests/FunctionalTests/tickets/protected') diff --git a/tests/FunctionalTests/active-controls/tests/ActiveButtonTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveButtonTestCase.php index a98c14be..acbdbb2a 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveButtonTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveButtonTestCase.php @@ -6,7 +6,7 @@ class ActiveButtonTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveButtonTest"); - $this->assertTextPresent("TActiveButton Functional Test"); + $this->assertContains("TActiveButton Functional Test", $this->source()); $this->assertText("{$base}label1", "Label 1"); $this->clickOnElement("{$base}button2"); $this->pause(800); diff --git a/tests/FunctionalTests/active-controls/tests/ActiveCheckBoxListTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveCheckBoxListTestCase.php index e1e0ba4b..c032c084 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveCheckBoxListTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveCheckBoxListTestCase.php @@ -6,38 +6,38 @@ class ActiveCheckBoxListTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=TActiveCheckBoxListTest"); - $this->assertTextPresent("TActiveCheckBoxList Test Case"); + $this->assertContains("TActiveCheckBoxList Test Case", $this->source()); $this->assertText("{$base}label1", "Label 1"); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertCheckBoxes(array(1,2,3)); - $this->click("{$base}button2"); + $this->byId("{$base}button2")->click(); $this->pause(800); $this->assertCheckBoxes(array()); - $this->click("{$base}button3"); + $this->byId("{$base}button3")->click(); $this->pause(800); $this->assertCheckBoxes(array(0)); - $this->click("{$base}button4"); + $this->byId("{$base}button4")->click(); $this->pause(800); $this->assertCheckBoxes(array(4)); - $this->click("{$base}button5"); + $this->byId("{$base}button5")->click(); $this->pause(800); $this->assertCheckBoxes(array(1,4)); - $this->click("{$base}list1_c2"); + $this->byId("{$base}list1_c2")->click(); $this->pause(800); $this->assertText("{$base}label1", "Selection: value 2, value 3, value 5"); - $this->click("{$base}list1_c2"); + $this->byId("{$base}list1_c2")->click(); $this->pause(800); $this->assertText("{$base}label1", "Selection: value 2, value 5"); @@ -49,9 +49,9 @@ class ActiveCheckBoxListTestCase extends PradoGenericSelenium2Test for($i = 0; $i < $total; $i++) { if(in_array($i, $checks)) - $this->assertChecked("{$base}list1_c{$i}"); + $this->assertTrue($this->byId("{$base}list1_c{$i}")->selected()); else - $this->assertNotChecked("{$base}list1_c{$i}"); + $this->assertFalse($this->byId("{$base}list1_c{$i}")->selected()); } } } diff --git a/tests/FunctionalTests/active-controls/tests/ActiveCheckBoxTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveCheckBoxTestCase.php index beedebc7..782b35be 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveCheckBoxTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveCheckBoxTestCase.php @@ -6,53 +6,53 @@ class ActiveCheckBoxTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveCheckBoxTest"); - $this->assertTextPresent("Active CheckBox Test"); + $this->assertContains("Active CheckBox Test", $this->source()); $this->assertText("{$base}checkbox1_label", "CheckBox 1"); $this->assertText("{$base}checkbox2_label", "CheckBox 2"); $this->assertText("{$base}label1", 'Label 1'); - $this->click("{$base}change_text1"); + $this->byId("{$base}change_text1")->click(); $this->pause(800); $this->assertText("{$base}checkbox1_label", 'Hello CheckBox 1'); - $this->click("{$base}change_text2"); + $this->byId("{$base}change_text2")->click(); $this->pause(800); $this->assertText("{$base}checkbox2_label", 'CheckBox 2 World'); //check box 1 - $this->click("{$base}change_checked1"); + $this->byId("{$base}change_checked1")->click(); $this->pause(800); - $this->assertChecked("{$base}checkbox1"); + $this->assertTrue($this->byId("{$base}checkbox1")->selected()); - $this->click("{$base}change_checked1"); + $this->byId("{$base}change_checked1")->click(); $this->pause(800); - $this->assertNotChecked("{$base}checkbox1"); + $this->assertFalse($this->byId("{$base}checkbox1")->selected()); //check box 2 - $this->click("{$base}change_checked2"); + $this->byId("{$base}change_checked2")->click(); $this->pause(800); - $this->assertChecked("{$base}checkbox2"); + $this->assertTrue($this->byId("{$base}checkbox2")->selected()); - $this->click("{$base}change_checked2"); + $this->byId("{$base}change_checked2")->click(); $this->pause(800); - $this->assertNotChecked("{$base}checkbox2"); + $this->assertFalse($this->byId("{$base}checkbox2")->selected()); //click checkbox 1 - $this->click("{$base}checkbox1"); + $this->byId("{$base}checkbox1")->click(); $this->pause(800); $this->assertText("{$base}label1", "Label 1:Hello CheckBox 1 Checked"); - $this->click("{$base}checkbox1"); + $this->byId("{$base}checkbox1")->click(); $this->pause(800); $this->assertText("{$base}label1", "Label 1:Hello CheckBox 1 Not Checked"); //click checkbox 2 - $this->click("{$base}checkbox2"); + $this->byId("{$base}checkbox2")->click(); $this->pause(800); $this->assertText("{$base}label1", "Label 1:CheckBox 2 World Checked"); - $this->click("{$base}checkbox2"); + $this->byId("{$base}checkbox2")->click(); $this->pause(800); $this->assertText("{$base}label1", "Label 1:CheckBox 2 World Not Checked"); diff --git a/tests/FunctionalTests/active-controls/tests/ActiveControlExpressTagTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveControlExpressTagTestCase.php index d5c8b4f0..c41988cc 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveControlExpressTagTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveControlExpressTagTestCase.php @@ -6,11 +6,11 @@ class ActiveControlExpressionTagTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url('active-controls/index.php?page=ActiveControlExpressionTag'); - $this->assertTextPresent('Active Control With Expression Tag Test'); - $this->assertTextNotPresent('Text box content:'); + $this->assertContains('Active Control With Expression Tag Test', $this->source()); + $this->assertNotContains('Text box content:', $this->source()); $this->type("{$base}textbox1", 'Hello world'); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertText("repeats", 'result - 1 result - two'); diff --git a/tests/FunctionalTests/active-controls/tests/ActiveDatePickerTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveDatePickerTestCase.php index 0d6e2203..570a6717 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveDatePickerTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveDatePickerTestCase.php @@ -5,45 +5,45 @@ class ActiveDatePickerTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveDatePicker"); - $this->assertTextPresent("TActiveDatePicker test"); + $this->assertContains("TActiveDatePicker test", $this->source()); $this->assertText("{$base}status", ""); $this->assertValue("{$base}datepicker", date('m-d-Y')); - $this->click("{$base}increaseButton"); + $this->byId("{$base}increaseButton")->click(); $this->pause(800); $this->assertValue("{$base}datepicker", date('m-d-Y', strtotime('+ 1 day'))); $this->assertText("{$base}status", date('m-d-Y', strtotime('+ 1 day'))); - $this->click("{$base}increaseButton"); + $this->byId("{$base}increaseButton")->click(); $this->pause(800); $this->assertValue("{$base}datepicker", date('m-d-Y', strtotime('+ 2 day'))); $this->assertText("{$base}status", date('m-d-Y', strtotime('+ 2 day'))); - $this->click("{$base}todayButton"); + $this->byId("{$base}todayButton")->click(); $this->pause(800); $this->assertValue("{$base}datepicker", date('m-d-Y')); $this->assertText("{$base}status", date('m-d-Y')); - $this->click("{$base}decreaseButton"); + $this->byId("{$base}decreaseButton")->click(); $this->pause(800); $this->assertValue("{$base}datepicker", date('m-d-Y', strtotime('- 1 day'))); $this->assertText("{$base}status", date('m-d-Y', strtotime('- 1 day'))); - $this->click("{$base}datepicker"); + $this->byId("{$base}datepicker")->click(); $this->pause(800); - $this->click("css=input.todayButton"); + $this->byCssSelector("input.todayButton")->click(); $this->pause(800); $this->assertValue("{$base}datepicker", date('m-d-Y')); $this->assertText("{$base}status", date('m-d-Y')); - $this->click("css=input.nextMonthButton"); + $this->byCssSelector("input.nextMonthButton")->click(); $this->pause(800); $this->assertValue("{$base}datepicker", date('m-d-Y', strtotime('+ 1 month'))); $this->assertText("{$base}status", date('m-d-Y', strtotime('+1 month'))); - $this->click("{$base}toggleButton"); + $this->byId("{$base}toggleButton")->click(); $this->pause(2000); - $this->click("{$base}todayButton"); + $this->byId("{$base}todayButton")->click(); $this->pause(800); $this->assertSelected("{$base}datepicker_month", date('m')); $this->assertText("{$base}status", date('m-d-Y')); - $this->click("{$base}increaseButton"); + $this->byId("{$base}increaseButton")->click(); $this->pause(800); $dateToCheck=strtotime('+ 1 day'); $this->assertSelected("{$base}datepicker_month", date('m', $dateToCheck)); @@ -51,7 +51,7 @@ class ActiveDatePickerTestCase extends PradoGenericSelenium2Test $this->assertSelected("{$base}datepicker_year", date('Y', $dateToCheck)); $this->assertText("{$base}status", date('m-d-Y', $dateToCheck)); - $this->click("{$base}increaseButton"); + $this->byId("{$base}increaseButton")->click(); $this->pause(800); $dateToCheck=strtotime('+ 2 day'); $this->assertSelected("{$base}datepicker_month", date('m', $dateToCheck)); @@ -59,7 +59,7 @@ class ActiveDatePickerTestCase extends PradoGenericSelenium2Test $this->assertSelected("{$base}datepicker_year", date('Y', $dateToCheck)); $this->assertText("{$base}status", date('m-d-Y', $dateToCheck)); - $this->click("{$base}todayButton"); + $this->byId("{$base}todayButton")->click(); $this->pause(800); $dateToCheck=time(); $this->assertSelected("{$base}datepicker_month", date('m', $dateToCheck)); @@ -67,7 +67,7 @@ class ActiveDatePickerTestCase extends PradoGenericSelenium2Test $this->assertSelected("{$base}datepicker_year", date('Y', $dateToCheck)); $this->assertText("{$base}status", date('m-d-Y', $dateToCheck)); - $this->click("{$base}decreaseButton"); + $this->byId("{$base}decreaseButton")->click(); $this->pause(800); $dateToCheck=strtotime('- 1 day'); $this->assertSelected("{$base}datepicker_month", date('m', $dateToCheck)); @@ -75,9 +75,9 @@ class ActiveDatePickerTestCase extends PradoGenericSelenium2Test $this->assertSelected("{$base}datepicker_year", date('Y', $dateToCheck)); $this->assertText("{$base}status", date('m-d-Y', $dateToCheck)); - $this->click("{$base}datepickerbutton"); + $this->byId("{$base}datepickerbutton")->click(); $this->pause(800); - $this->click("css=input.todayButton"); + $this->byCssSelector("input.todayButton")->click(); $this->pause(800); $dateToCheck=time(); $this->assertSelected("{$base}datepicker_month", date('m', $dateToCheck)); @@ -85,7 +85,7 @@ class ActiveDatePickerTestCase extends PradoGenericSelenium2Test $this->assertSelected("{$base}datepicker_year", date('Y', $dateToCheck)); $this->assertText("{$base}status", date('m-d-Y', $dateToCheck)); - $this->click("css=input.nextMonthButton"); + $this->byCssSelector("input.nextMonthButton")->click(); $this->pause(800); $dateToCheck=strtotime('+ 1 month'); $this->assertSelected("{$base}datepicker_month", date('m', $dateToCheck)); @@ -93,7 +93,7 @@ class ActiveDatePickerTestCase extends PradoGenericSelenium2Test $this->assertSelected("{$base}datepicker_year", date('Y', $dateToCheck)); $this->assertText("{$base}status", date('m-d-Y', $dateToCheck)); - $this->click('ctl0_ctl1'); + $this->byId('ctl0_ctl1')->click(); $this->pause(800); $this->assertText("{$base}status2", ""); diff --git a/tests/FunctionalTests/active-controls/tests/ActiveDropDownListTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveDropDownListTestCase.php index f3bc8dc8..cb8c953f 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveDropDownListTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveDropDownListTestCase.php @@ -6,19 +6,19 @@ class ActiveDropDownListTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveDropDownList"); - $this->assertTextPresent('Active Drop Down List Test Case'); + $this->assertContains('Active Drop Down List Test Case', $this->source()); $this->assertText("{$base}label1", "Label 1"); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertSelected("{$base}list1", "item 4"); - $this->click("{$base}button2"); + $this->byId("{$base}button2")->click(); $this->pause(800); $this->assertSelectedValue("{$base}list1", 'value 1'); - $this->click("{$base}button3"); + $this->byId("{$base}button3")->click(); $this->pause(800); $this->assertSelected("{$base}list1", "item 2"); @@ -36,7 +36,7 @@ class ActiveDropDownListTestCase extends PradoGenericSelenium2Test $this->pause(800); $this->assertText("{$base}label2", "Selection 2: value 3 - item 5"); - $this->click("{$base}button4"); + $this->byId("{$base}button4")->click(); $this->pause(800); $this->assertSelected("{$base}list1", 'item 3'); $this->pause(300); diff --git a/tests/FunctionalTests/active-controls/tests/ActiveHiddenFieldTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveHiddenFieldTestCase.php index 2aedee05..d4b82068 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveHiddenFieldTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveHiddenFieldTestCase.php @@ -9,14 +9,14 @@ class ActiveHiddenFieldTestCase extends PradoGenericSelenium2Test $fieldEmpty = 'No longer empty'; $fieldUsed = 'My value'; - $this->assertTextPresent('Value of current hidden field'); - $this->click("{$base}Button1"); + $this->assertContains('Value of current hidden field', $this->source()); + $this->byId("{$base}Button1")->click(); $this->pause(800); $this->assertText("{$base}ResponseLabel", $fieldEmpty); - $this->click("{$base}Button2"); + $this->byId("{$base}Button2")->click(); $this->pause(800); $this->assertText("{$base}ResponseLabel", $fieldUsed); - $this->click("{$base}Button3"); + $this->byId("{$base}Button3")->click(); $this->pause(800); $this->assertText("{$base}ResponseLabel", $fieldEmpty.'|'.$fieldUsed); } diff --git a/tests/FunctionalTests/active-controls/tests/ActiveHyperLinkTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveHyperLinkTestCase.php index 47a90851..6329d826 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveHyperLinkTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveHyperLinkTestCase.php @@ -6,11 +6,11 @@ class ActiveHyperLinkTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveHyperLinkTest"); - $this->assertTextPresent("Active HyperLink Test Case"); + $this->assertContains("Active HyperLink Test Case", $this->source()); $this->assertText("{$base}link1", "Link 1"); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertText("{$base}link1", "Pradosoft.com"); } diff --git a/tests/FunctionalTests/active-controls/tests/ActiveImageButtonTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveImageButtonTestCase.php index 0d9f219d..0ef2e082 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveImageButtonTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveImageButtonTestCase.php @@ -6,11 +6,11 @@ class ActiveImageButtonTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveImageButtonTest"); - $this->assertTextPresent("TActiveImageButton Functional Test"); + $this->assertContains("TActiveImageButton Functional Test", $this->source()); $this->assertText("{$base}label1", "Label 1"); - $this->click("{$base}image1"); + $this->byId("{$base}image1")->click(); $this->pause(800); //unable to determine mouse position - $this->assertTextPresent("regexp:Image clicked at x=\d+, y=\d+"); + $this->assertRegExp('/Image clicked at x=\d+, y=\d+/', $this->source()); } } diff --git a/tests/FunctionalTests/active-controls/tests/ActiveLinkButtonTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveLinkButtonTestCase.php index 3e67b516..1f7c40ea 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveLinkButtonTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveLinkButtonTestCase.php @@ -6,9 +6,9 @@ class ActiveLinkButtonTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveLinkButtonTest"); - $this->assertTextPresent("TActiveLinkButton Functional Test"); + $this->assertContains("TActiveLinkButton Functional Test", $this->source()); $this->assertText("{$base}label1", "Label 1"); - $this->click("{$base}button2"); + $this->byId("{$base}button2")->click(); $this->pause(800); $this->assertText("{$base}label1", "Button 1 was clicked using callback!"); } diff --git a/tests/FunctionalTests/active-controls/tests/ActiveListBoxMasterTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveListBoxMasterTestCase.php index 31b80bff..be2bf174 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveListBoxMasterTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveListBoxMasterTestCase.php @@ -5,35 +5,35 @@ class ActiveListBoxMasterTestCase extends PradoGenericSelenium2Test function test() { $this->url("active-controls/index.php?page=ActiveListBoxMasterTest"); - $this->assertTextPresent('Active List Box Functional Test'); + $this->assertContains('Active List Box Functional Test', $this->source()); $base = 'ctl0_body_'; $this->assertText("{$base}label1", "Label 1"); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertEquals($this->getSelectedLabels("{$base}list1"), array('item 2', 'item 3', 'item 4')); - $this->click("{$base}button3"); + $this->byId("{$base}button3")->click(); $this->pause(800); $this->assertEquals($this->getSelectedLabels("{$base}list1"), array('item 1')); - $this->click("{$base}button4"); + $this->byId("{$base}button4")->click(); $this->pause(800); $this->assertEquals($this->getSelectedLabels("{$base}list1"), array('item 5')); - $this->click("{$base}button5"); + $this->byId("{$base}button5")->click(); $this->pause(800); $this->assertEquals($this->getSelectedLabels("{$base}list1"), array('item 2', 'item 5')); - $this->click("{$base}button2"); + $this->byId("{$base}button2")->click(); $this->pause(800); $this->assertNotSomethingSelected("{$base}list1"); - $this->click("{$base}button6"); + $this->byId("{$base}button6")->click(); $this->pause(800); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertEquals($this->getSelectedLabels("{$base}list1"), array('item 2', 'item 3', 'item 4')); diff --git a/tests/FunctionalTests/active-controls/tests/ActiveListBoxTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveListBoxTestCase.php index 8818f78e..1830f5ab 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveListBoxTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveListBoxTestCase.php @@ -6,33 +6,33 @@ class ActiveListBoxTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveListBoxTest"); - $this->assertTextPresent('Active List Box Functional Test'); + $this->assertContains('Active List Box Functional Test', $this->source()); $this->assertText("{$base}label1", "Label 1"); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertEquals($this->getSelectedLabels("{$base}list1"), array('item 2', 'item 3', 'item 4')); - $this->click("{$base}button3"); + $this->byId("{$base}button3")->click(); $this->pause(800); $this->assertEquals($this->getSelectedLabels("{$base}list1"), array('item 1')); - $this->click("{$base}button4"); + $this->byId("{$base}button4")->click(); $this->pause(800); $this->assertEquals($this->getSelectedLabels("{$base}list1"), array('item 5')); - $this->click("{$base}button5"); + $this->byId("{$base}button5")->click(); $this->pause(800); $this->assertEquals($this->getSelectedLabels("{$base}list1"), array('item 2', 'item 5')); - $this->click("{$base}button2"); + $this->byId("{$base}button2")->click(); $this->pause(800); $this->assertNotSomethingSelected("{$base}list1"); - $this->click("{$base}button6"); + $this->byId("{$base}button6")->click(); $this->pause(800); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertEquals($this->getSelectedLabels("{$base}list1"), array('item 2', 'item 3', 'item 4')); diff --git a/tests/FunctionalTests/active-controls/tests/ActivePanelTestCase.php b/tests/FunctionalTests/active-controls/tests/ActivePanelTestCase.php index 528b542c..73ab3ad0 100755 --- a/tests/FunctionalTests/active-controls/tests/ActivePanelTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActivePanelTestCase.php @@ -6,10 +6,10 @@ class ActivePanelTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActivePanelTest"); - $this->assertTextPresent("Active Panel replacement tests"); - $this->assertTextNotPresent('Something lalala'); - $this->click("div1"); + $this->assertContains("Active Panel replacement tests", $this->source()); + $this->assertNotContains('Something lalala', $this->source()); + $this->byId("div1")->click(); $this->pause(800); - $this->assertTextPresent("Something lalala"); + $this->assertContains("Something lalala", $this->source()); } } diff --git a/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonListTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonListTestCase.php index 597567a0..82408732 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonListTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonListTestCase.php @@ -6,28 +6,28 @@ class ActiveRadioButtonListTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveRadioButtonListTest"); - $this->assertTextPresent("TActiveRadioButtonList Test Case"); + $this->assertContains("TActiveRadioButtonList Test Case", $this->source()); $this->assertText("{$base}label1", "Label 1"); - $this->click("{$base}button3"); + $this->byId("{$base}button3")->click(); $this->pause(800); $this->assertCheckBoxes(array(0)); - $this->click("{$base}button2"); + $this->byId("{$base}button2")->click(); $this->pause(800); $this->assertCheckBoxes(array()); - $this->click("{$base}button4"); + $this->byId("{$base}button4")->click(); $this->pause(800); $this->assertCheckBoxes(array(4)); - $this->click("{$base}list1_c2"); + $this->byId("{$base}list1_c2")->click(); $this->pause(800); $this->assertText("{$base}label1", "Selection: value 3"); - $this->click("{$base}list1_c3"); + $this->byId("{$base}list1_c3")->click(); $this->pause(800); $this->assertText("{$base}label1", "Selection: value 4"); @@ -39,9 +39,9 @@ class ActiveRadioButtonListTestCase extends PradoGenericSelenium2Test for($i = 0; $i < $total; $i++) { if(in_array($i, $checks)) - $this->assertChecked("{$base}list1_c{$i}"); + $this->assertTrue($this->byId("{$base}list1_c{$i}")->selected()); else - $this->assertNotChecked("{$base}list1_c{$i}"); + $this->assertFalse($this->byId("{$base}list1_c{$i}")->selected()); } } } diff --git a/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonTestCase.php index 04837ef4..7606e46b 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonTestCase.php @@ -6,47 +6,47 @@ class ActiveRadioButtonTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveRadioButtonTest"); - $this->assertTextPresent("Active Radio Button Test"); + $this->assertContains("Active Radio Button Test", $this->source()); $this->assertText("{$base}label1", 'Label 1'); - $this->assertNotChecked("{$base}radio1"); - $this->assertNotChecked("{$base}radio2"); - $this->assertNotChecked("{$base}radio3"); + $this->assertFalse($this->byId("{$base}radio1")->selected()); + $this->assertFalse($this->byId("{$base}radio2")->selected()); + $this->assertFalse($this->byId("{$base}radio3")->selected()); $this->assertText("{$base}radio1_label", 'Radio Button 1'); $this->assertText("{$base}radio2_label", 'Radio Button 2'); $this->assertText("{$base}radio3_label", 'Radio Button 3'); - $this->click("{$base}change_text1"); + $this->byId("{$base}change_text1")->click(); $this->pause(800); $this->assertText("{$base}radio1_label", 'Hello Radio Button 1'); $this->assertText("{$base}radio2_label", 'Radio Button 2'); $this->assertText("{$base}radio3_label", 'Radio Button 3'); - $this->click("{$base}change_text2"); + $this->byId("{$base}change_text2")->click(); $this->pause(800); $this->assertText("{$base}radio1_label", 'Hello Radio Button 1'); $this->assertText("{$base}radio2_label", 'Radio Button 2 World'); $this->assertText("{$base}radio3_label", 'Radio Button 3'); - $this->click("{$base}change_radio1"); + $this->byId("{$base}change_radio1")->click(); $this->pause(800); - $this->assertChecked("{$base}radio1"); - $this->assertNotChecked("{$base}radio2"); - $this->assertNotChecked("{$base}radio3"); + $this->assertTrue($this->byId("{$base}radio1")->selected()); + $this->assertFalse($this->byId("{$base}radio2")->selected()); + $this->assertFalse($this->byId("{$base}radio3")->selected()); - $this->click("{$base}change_radio2"); + $this->byId("{$base}change_radio2")->click(); $this->pause(800); - $this->assertNotChecked("{$base}radio1"); - $this->assertChecked("{$base}radio2"); - $this->assertNotChecked("{$base}radio3"); + $this->assertFalse($this->byId("{$base}radio1")->selected()); + $this->assertTrue($this->byId("{$base}radio2")->selected()); + $this->assertFalse($this->byId("{$base}radio3")->selected()); - $this->click("{$base}radio3"); + $this->byId("{$base}radio3")->click(); $this->pause(800); - $this->assertNotChecked("{$base}radio1"); - $this->assertChecked("{$base}radio2"); - $this->assertChecked("{$base}radio3"); + $this->assertFalse($this->byId("{$base}radio1")->selected()); + $this->assertTrue($this->byId("{$base}radio2")->selected()); + $this->assertTrue($this->byId("{$base}radio3")->selected()); $this->assertText("{$base}label1", 'Label 1:Radio Button 3 Checked'); diff --git a/tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php b/tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php index f6dfc22b..058aae01 100755 --- a/tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php @@ -6,37 +6,37 @@ class AutoCompleteTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=AutoCompleteTest"); - $this->assertTextPresent("TAutoComplete Test"); + $this->assertContains("TAutoComplete Test", $this->source()); $this->assertText("{$base}label1", "Label 1"); - $this->click("{$base}textbox3"); + $this->byId("{$base}textbox3")->click(); $this->keys('a'); $this->pause(500); - $this->assertTextPresent('Andorra'); + $this->assertContains('Andorra', $this->source()); $this->assertText("{$base}label1", "suggestion for a"); $this->keys('u'); $this->pause(500); - $this->assertTextPresent('Australia'); + $this->assertContains('Australia', $this->source()); $this->assertText("{$base}label1", "suggestion for au"); - $this->click("css=#{$base}textbox3_result ul li"); + $this->byCssSelector("#{$base}textbox3_result ul li")->click(); $this->pause(500); $this->assertText("{$base}label1", "Label 1: Austria"); - $this->click("{$base}textbox2"); + $this->byId("{$base}textbox2")->click(); $this->keys('cu'); $this->pause(500); - $this->click("css=#{$base}textbox2_result ul li"); + $this->byCssSelector("#{$base}textbox2_result ul li")->click(); $this->pause(500); $this->assertText("{$base}label1", "Label 1: Cuba"); $this->keys(PHPUnit_Extensions_Selenium2TestCase_Keys::END); $this->keys(',me'); $this->pause(500); - $this->click("css=#{$base}textbox2_result ul li"); + $this->byCssSelector("#{$base}textbox2_result ul li")->click(); $this->pause(500); $this->assertText("{$base}label1", "Label 1: Cuba,Mexico"); } diff --git a/tests/FunctionalTests/active-controls/tests/CalculatorTestCase.php b/tests/FunctionalTests/active-controls/tests/CalculatorTestCase.php index 28cbb870..9bef7d00 100755 --- a/tests/FunctionalTests/active-controls/tests/CalculatorTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/CalculatorTestCase.php @@ -6,16 +6,16 @@ class CalculatorTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=Calculator"); - $this->assertTextPresent("Callback Enabled Calculator"); + $this->assertContains("Callback Enabled Calculator", $this->source()); $this->assertNotVisible("{$base}summary"); - $this->click("{$base}sum"); + $this->byId("{$base}sum")->click(); $this->assertVisible("{$base}summary"); $this->type("{$base}a", "2"); $this->type("{$base}b", "5"); - $this->click("{$base}sum"); + $this->byId("{$base}sum")->click(); $this->pause(500); $this->assertNotVisible("{$base}summary"); diff --git a/tests/FunctionalTests/active-controls/tests/CallbackAdapterTestCase.php b/tests/FunctionalTests/active-controls/tests/CallbackAdapterTestCase.php index 75de3419..25dabe24 100755 --- a/tests/FunctionalTests/active-controls/tests/CallbackAdapterTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/CallbackAdapterTestCase.php @@ -6,53 +6,60 @@ class CallbackAdapterTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ControlAdapterTest"); - $this->assertTextPresent('Control Adapter - State Tracking Tests'); + $this->assertContains('Control Adapter - State Tracking Tests', $this->source()); - $this->click("{$base}button2"); - $this->assertAlert('ok'); + $this->byId("{$base}button2")->click(); + $this->assertEquals('ok', $this->alertText()); + $this->acceptAlert(); - $this->click("{$base}test6"); + $this->byId("{$base}test6")->click(); $this->pause(800); - $this->click("{$base}test7"); + $this->byId("{$base}test7")->click(); $this->pause(800); - $this->click("{$base}test8"); + $this->byId("{$base}test8")->click(); $this->pause(800); - $this->click("{$base}test9"); + $this->byId("{$base}test9")->click(); $this->pause(800); - $this->click("{$base}button1"); - $this->assertAlert('haha!'); - - $this->click("{$base}button2"); - $this->assertAlert('ok'); - $this->assertAlert('baz!'); + $this->byId("{$base}button1")->click(); + $this->assertEquals('haha!', $this->alertText()); + $this->acceptAlert(); + $this->byId("{$base}button2")->click(); + $this->assertEquals('ok', $this->alertText()); + $this->acceptAlert(); + $this->assertEquals('baz!', $this->alertText()); + $this->acceptAlert(); } /* function testIE() { $this->url("active-controls/index.php?page=ControlAdapterTest"); - $this->assertTextPresent('Control Adapter - State Tracking Tests'); + $this->assertContains('Control Adapter - State Tracking Tests', $this->source()); - $this->click("{$base}button2"); - $this->assertAlert('ok'); + $this->byId("{$base}button2")->click(); + $this->assertEquals('ok', $this->alertText()); + $this->acceptAlert(); - $this->click('test6'); + $this->byId('test6')->click(); $this->pause(800); - $this->click('test7'); + $this->byId('test7')->click(); $this->pause(800); - $this->click('test8'); + $this->byId('test8')->click(); $this->pause(800); - $this->click('test9'); + $this->byId('test9')->click(); $this->pause(800); - $this->click("{$base}button1"); - $this->assertAlert('haha!'); + $this->byId("{$base}button1")->click(); + $this->assertEquals('haha!', $this->alertText()); + $this->acceptAlert(); //IE alerts in diffrent order - $this->click("{$base}button2"); - $this->assertAlert('baz!'); - $this->assertAlert('ok'); + $this->byId("{$base}button2")->click(); + $this->assertEquals('baz!', $this->alertText()); + $this->acceptAlert(); + $this->assertEquals('ok', $this->alertText()); + $this->acceptAlert(); } */ } diff --git a/tests/FunctionalTests/active-controls/tests/CallbackOptionsTestCase.php b/tests/FunctionalTests/active-controls/tests/CallbackOptionsTestCase.php index 634f4015..4c2c7070 100755 --- a/tests/FunctionalTests/active-controls/tests/CallbackOptionsTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/CallbackOptionsTestCase.php @@ -6,25 +6,25 @@ class CallbackOptionsTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=CallbackOptionsTest"); - $this->assertTextPresent("TCallbackOptions Test"); + $this->assertContains("TCallbackOptions Test", $this->source()); $this->assertText("label1", "Label 1"); $this->assertText("label2", "Label 2"); $this->assertText("label3", "Label 3"); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertText("label1", "Button 1 has returned"); $this->assertText("label2", "Label 2"); $this->assertText("label3", "Label 3"); - $this->click("{$base}button2"); + $this->byId("{$base}button2")->click(); $this->pause(800); $this->assertText("label1", "Button 1 has returned"); $this->assertText("label2", "Button 2 has returned"); $this->assertText("label3", "Label 3"); - $this->click("{$base}button3"); + $this->byId("{$base}button3")->click(); $this->pause(800); $this->assertText("label1", "Button 1 has returned"); $this->assertText("label2", "Button 2 has returned"); diff --git a/tests/FunctionalTests/active-controls/tests/CustomTemplateTestCase.php b/tests/FunctionalTests/active-controls/tests/CustomTemplateTestCase.php index d17cf90f..3b594b39 100755 --- a/tests/FunctionalTests/active-controls/tests/CustomTemplateTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/CustomTemplateTestCase.php @@ -6,15 +6,15 @@ class CustomTemplateTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url('active-controls/index.php?page=CustomTemplateControlTest'); - $this->assertTextPresent('Add Dynamic Custom TTemplateControl Test'); + $this->assertContains('Add Dynamic Custom TTemplateControl Test', $this->source()); $this->assertText("{$base}label1", 'Label 1'); $this->type("{$base}foo", 'Foo Bar!'); - $this->click("{$base}button2"); + $this->byId("{$base}button2")->click(); $this->pause(800); $this->assertVisible("{$base}ctl0_ThePanel"); - $this->assertTextPresent("Client ID: {$base}ctl0_ThePanel"); + $this->assertContains("Client ID: {$base}ctl0_ThePanel", $this->source()); $this->assertText("{$base}label1", 'Button 1 was clicked Foo Bar! using callback!... and this is the textbox text: Foo Bar!'); } diff --git a/tests/FunctionalTests/active-controls/tests/DelayedCallbackTestCase.php b/tests/FunctionalTests/active-controls/tests/DelayedCallbackTestCase.php index 2b1eec75..49c268ad 100755 --- a/tests/FunctionalTests/active-controls/tests/DelayedCallbackTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/DelayedCallbackTestCase.php @@ -6,11 +6,11 @@ class DelayedCallbackTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=DelayedCallback"); - $this->assertTextPresent("Delayed Callback Test"); + $this->assertContains("Delayed Callback Test", $this->source()); $this->assertText("{$base}status", ""); - $this->click("{$base}button1"); - $this->click("{$base}button2"); + $this->byId("{$base}button1")->click(); + $this->byId("{$base}button2")->click(); $this->pause("5000"); $this->assertText("{$base}status", "Callback 1 returned after 4s"); diff --git a/tests/FunctionalTests/active-controls/tests/EventTriggerTestCase.php b/tests/FunctionalTests/active-controls/tests/EventTriggerTestCase.php index 7c73a8e8..dacdeaaa 100755 --- a/tests/FunctionalTests/active-controls/tests/EventTriggerTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/EventTriggerTestCase.php @@ -6,11 +6,11 @@ class EventTriggerTestCase extends PradoGenericSelenium2Test { $base = "ctl0_Content_"; $this->url("active-controls/index.php?page=EventTriggeredCallback"); - $this->assertTextPresent("Event Triggered Callback Test"); + $this->assertContains("Event Triggered Callback Test", $this->source()); $this->assertText("{$base}label1", 'Label 1'); - $this->click("button1"); + $this->byId("button1")->click(); $this->pause(800); $this->assertText("{$base}label1", 'button 1 clicked'); diff --git a/tests/FunctionalTests/active-controls/tests/NestedActiveControlsTestCase.php b/tests/FunctionalTests/active-controls/tests/NestedActiveControlsTestCase.php index 1b686d0a..f08a6f78 100755 --- a/tests/FunctionalTests/active-controls/tests/NestedActiveControlsTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/NestedActiveControlsTestCase.php @@ -6,17 +6,17 @@ class NestedActiveControlsTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=NestedActiveControls"); - $this->assertTextPresent("Nested Active Controls Test"); + $this->assertContains("Nested Active Controls Test", $this->source()); $this->assertText("{$base}label1", "Label 1"); $this->assertText("{$base}label2", "Label 2"); - $this->assertTextNotPresent("Label 3"); + $this->assertNotContains("Label 3", $this->source()); - $this->click("div1"); + $this->byId("div1")->click(); $this->pause(800); - $this->assertTextPresent("Something lalala"); + $this->assertContains("Something lalala", $this->source()); $this->assertText("{$base}label3", "Label 3"); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertText("{$base}label1", "Label 1: Button 1 Clicked"); $this->assertText("{$base}label2", "Label 2: Button 1 Clicked"); diff --git a/tests/FunctionalTests/active-controls/tests/PopulateListTestCase.php b/tests/FunctionalTests/active-controls/tests/PopulateListTestCase.php index 92944429..e7f7f287 100755 --- a/tests/FunctionalTests/active-controls/tests/PopulateListTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/PopulateListTestCase.php @@ -6,16 +6,16 @@ class PopulateListTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=PopulateActiveList"); - $this->assertTextPresent("Populate active list controls"); + $this->assertContains("Populate active list controls", $this->source()); $this->assertText("{$base}label1", ""); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->select("{$base}list1", "World"); $this->pause(800); $this->assertText("{$base}label1", "list1: World"); - $this->click("{$base}button2"); + $this->byId("{$base}button2")->click(); $this->pause(800); $this->select("{$base}list2", "Prado"); $this->pause(800); diff --git a/tests/FunctionalTests/active-controls/tests/PostLoadingTestCase.php b/tests/FunctionalTests/active-controls/tests/PostLoadingTestCase.php index 99f21585..271a2ffb 100755 --- a/tests/FunctionalTests/active-controls/tests/PostLoadingTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/PostLoadingTestCase.php @@ -6,16 +6,16 @@ class PostLoadingTestCase extends PradoGenericSelenium2Test { $base="ctl0_Content_"; $this->url('active-controls/index.php?page=PostLoadingTest'); - $this->assertTextPresent('PostLoading Test'); + $this->assertContains('PostLoading Test', $this->source()); - $this->assertTextNotPresent('Hello World'); + $this->assertNotContains('Hello World', $this->source()); - $this->click('div1'); + $this->byId('div1')->click(); $this->pause(800); $this->type("{$base}MyTextBox", 'Hello World'); - $this->click("{$base}MyButton"); + $this->byId("{$base}MyButton")->click(); $this->pause(800); - $this->assertTextPresent('Result is Hello World'); + $this->assertContains('Result is Hello World', $this->source()); } } diff --git a/tests/FunctionalTests/active-controls/tests/ReplaceContentTestCase.php b/tests/FunctionalTests/active-controls/tests/ReplaceContentTestCase.php index 8f38ac17..c3345d6a 100755 --- a/tests/FunctionalTests/active-controls/tests/ReplaceContentTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ReplaceContentTestCase.php @@ -6,21 +6,21 @@ class ReplaceContentTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url('active-controls/index.php?page=ReplaceContentTest'); - $this->assertTextPresent('Callback Replace Content Test'); + $this->assertContains('Callback Replace Content Test', $this->source()); $this->assertText("{$base}subpanel", 'Sub Panel'); $this->assertText("{$base}panel1", "Main Panel\nSub Panel"); $this->type("{$base}content", 'something'); - $this->click("{$base}btn_append"); + $this->byId("{$base}btn_append")->click(); $this->pause(800); $this->assertText("{$base}subpanel", 'Sub Panel something'); $this->assertText("{$base}panel1", "Main Panel\nSub Panel something"); $this->type("{$base}content", 'more'); - $this->click("{$base}btn_prepend"); + $this->byId("{$base}btn_prepend")->click(); $this->pause(800); $this->assertText("{$base}subpanel", 'more Sub Panel something'); @@ -28,18 +28,18 @@ class ReplaceContentTestCase extends PradoGenericSelenium2Test $this->type("{$base}content", 'prado'); - $this->click("{$base}btn_before"); + $this->byId("{$base}btn_before")->click(); $this->pause(800); $this->assertText("{$base}subpanel", 'more Sub Panel something'); $this->assertText("{$base}panel1", "Main Panel prado\nmore Sub Panel something"); $this->type("{$base}content", ' php '); - $this->click("{$base}btn_after"); + $this->byId("{$base}btn_after")->click(); $this->pause(800); $this->type("{$base}content", 'mauahahaha'); - $this->click("{$base}btn_replace"); + $this->byId("{$base}btn_replace")->click(); $this->pause(1000); $this->assertText("{$base}panel1", 'Main Panel pradomauahahaha php'); @@ -48,21 +48,21 @@ class ReplaceContentTestCase extends PradoGenericSelenium2Test function testIE() { $this->url('active-controls/index.php?page=ReplaceContentTest'); - $this->assertTextPresent('Callback Replace Content Test'); + $this->assertContains('Callback Replace Content Test', $this->source()); $this->assertText("{$base}subpanel", 'Sub Panel'); $this->assertText("{$base}panel1", 'regexp:Main Panel\s*Sub Panel'); $this->type("{$base}content", 'something'); - $this->click('btn_append'); + $this->byId('btn_append')->click(); $this->pause(800); $this->assertText("{$base}subpanel", 'Sub Panel something'); $this->assertText("{$base}panel1", 'regexp:Main Panel\s*Sub Panel\s*something'); $this->type("{$base}content", 'more'); - $this->click('btn_prepend'); + $this->byId('btn_prepend')->click(); $this->pause(800); $this->assertText("{$base}subpanel", 'regexp:more\s*Sub Panel\s*something'); @@ -70,18 +70,18 @@ class ReplaceContentTestCase extends PradoGenericSelenium2Test $this->type("{$base}content", 'prado'); - $this->click('btn_before'); + $this->byId('btn_before')->click(); $this->pause(800); $this->assertText("{$base}subpanel", 'regexp:more\s*Sub Panel\s*something'); $this->assertText("{$base}panel1", 'regexp:Main Panel\s*prado\s*more\s*Sub Panel\s*something'); $this->type("{$base}content", ' php '); - $this->click('btn_after'); + $this->byId('btn_after')->click(); $this->pause(800); $this->type("{$base}content", 'mauahahaha'); - $this->click('btn_replace'); + $this->byId('btn_replace')->click(); $this->pause(1000); $this->assertText("{$base}panel1", 'Main Panel pradomauahahahaphp'); diff --git a/tests/FunctionalTests/active-controls/tests/TextBoxCallbackTestCase.php b/tests/FunctionalTests/active-controls/tests/TextBoxCallbackTestCase.php index d6728298..559c80a6 100755 --- a/tests/FunctionalTests/active-controls/tests/TextBoxCallbackTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/TextBoxCallbackTestCase.php @@ -6,7 +6,7 @@ class TextBoxCallbackTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveTextBoxCallback"); - $this->assertTextPresent("ActiveTextBox Callback Test"); + $this->assertContains("ActiveTextBox Callback Test", $this->source()); $this->assertText("{$base}label1", "Label 1"); $this->type("{$base}textbox1", "hello!"); diff --git a/tests/FunctionalTests/active-controls/tests/TextBoxGroupValidationTestCase.php b/tests/FunctionalTests/active-controls/tests/TextBoxGroupValidationTestCase.php index 1a5e1b2f..2562a18b 100755 --- a/tests/FunctionalTests/active-controls/tests/TextBoxGroupValidationTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/TextBoxGroupValidationTestCase.php @@ -6,7 +6,7 @@ class TextBoxGroupValidationTestCase extends PradoGenericSelenium2Test { $base="ctl0_Content_"; $this->url("active-controls/index.php?page=TextBoxValidationCallback"); - $this->assertTextPresent('TextBox AutoPostBack With Group Validation'); + $this->assertContains('TextBox AutoPostBack With Group Validation', $this->source()); $this->assertNotVisible("{$base}validator1"); $this->type("{$base}ZipCode", 'test'); diff --git a/tests/FunctionalTests/active-controls/tests/TimeTriggeredCallbackTestCase.php b/tests/FunctionalTests/active-controls/tests/TimeTriggeredCallbackTestCase.php index ee0cde18..741c7a2d 100755 --- a/tests/FunctionalTests/active-controls/tests/TimeTriggeredCallbackTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/TimeTriggeredCallbackTestCase.php @@ -6,11 +6,11 @@ class TimeTriggeredCallbackTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=TimeTriggeredCallbackTest"); - $this->assertTextPresent("TimeTriggeredCallback + ViewState Tests"); + $this->assertContains("TimeTriggeredCallback + ViewState Tests", $this->source()); $this->assertText("{$base}label1", "ViewState Counter :"); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(8000); diff --git a/tests/FunctionalTests/active-controls/tests/ValueTriggerCallbackTestCase.php b/tests/FunctionalTests/active-controls/tests/ValueTriggerCallbackTestCase.php index e89a65e4..8b0428a9 100755 --- a/tests/FunctionalTests/active-controls/tests/ValueTriggerCallbackTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ValueTriggerCallbackTestCase.php @@ -6,7 +6,7 @@ class ValueTriggerTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ValueTriggerCallbackTest"); - $this->assertTextPresent("Value Trigger Callback Test"); + $this->assertContains("Value Trigger Callback Test", $this->source()); $this->assertText("{$base}label1", 'Label 1'); diff --git a/tests/FunctionalTests/active-controlstests/ActiveRatingListTestCase.php b/tests/FunctionalTests/active-controlstests/ActiveRatingListTestCase.php index d4aa6788..6b2f6f97 100755 --- a/tests/FunctionalTests/active-controlstests/ActiveRatingListTestCase.php +++ b/tests/FunctionalTests/active-controlstests/ActiveRatingListTestCase.php @@ -26,7 +26,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test $base='ctl0_Content_'; // Verify we're on the right page. $this->url("active-controls/index.php?page=ActiveRatingListCheckBoxesTest"); - $this->assertTextPresent("TActiveRatingList Check Boxes Test Case"); + $this->assertContains("TActiveRatingList Check Boxes Test Case", $this->source()); $this->assertCheckBoxes("{$base}RatingList", array(2), 6); // Change the list and make sure the radio buttons get updated properly. @@ -44,7 +44,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test $base='ctl0_Content_'; // Verify we're on the right page. $this->url("active-controls/index.php?page=ActiveRatingListRatingTest"); - $this->assertTextPresent("TActiveRatingList Rating Test Case"); + $this->assertContains("TActiveRatingList Rating Test Case", $this->source()); // Check the list, make sure it starts out with 5 stars. $this->assertText("{$base}Status", "Rating: 5"); @@ -55,7 +55,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test $this->assertText("{$base}Status", "Rating: 1"); // Then set Rating to three on the server side and make sure it's correct. - $this->click("{$base}SetRating"); + $this->byId("{$base}SetRating")->click(); $this->pause(800); $this->assertText("{$base}Status", "Rating: 3"); } @@ -65,7 +65,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test $base='ctl0_Content_'; // Verify we're on the right page. $this->url("active-controls/index.php?page=ActiveRatingListSelectedIndexTest"); - $this->assertTextPresent("TActiveRatingList SelectedIndex Test Case"); + $this->assertContains("TActiveRatingList SelectedIndex Test Case", $this->source()); $this->assertText("{$base}Status", "SelectedIndex: 1"); // Click on 5 stars and make sure the SelectedIndex property updates. @@ -74,7 +74,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test $this->assertText("{$base}Status", "SelectedIndex: 4"); // Then set SelectedIndex to 5 on the server side and make sure it's correct. - $this->click("{$base}SetSelectedIndex"); + $this->byId("{$base}SetSelectedIndex")->click(); $this->pause(800); $this->assertText("{$base}Status", "SelectedIndex: 5"); } @@ -84,7 +84,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test $base='ctl0_Content_'; // Verify we're on the right page. $this->url("active-controls/index.php?page=ActiveRatingListAutoPostBackTest"); - $this->assertTextPresent("TActiveRatingList AutoPostBack Test Case"); + $this->assertContains("TActiveRatingList AutoPostBack Test Case", $this->source()); $this->assertText("{$base}Status", "AutoPostback=false"); // Make sure that it doesn't auto post when clicked. @@ -93,7 +93,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test $this->assertText("{$base}Status", "AutoPostback=false"); // Then submit with an active button and make sure it updates. - $this->click("{$base}Submit"); + $this->byId("{$base}Submit")->click(); $this->pause(800); $this->assertText("{$base}Status", "4 : Good"); } @@ -103,7 +103,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test $base='ctl0_Content_'; // Verify we're on the right page. $this->url("active-controls/index.php?page=ActiveRatingListAllowInputTest"); - $this->assertTextPresent("TActiveRatingList AllowInput Test Case"); + $this->assertContains("TActiveRatingList AllowInput Test Case", $this->source()); $this->assertText("{$base}Status", "AllowInput=false"); $this->assertCheckBoxes("{$base}RatingList", array(3), 6); @@ -119,7 +119,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test $base='ctl0_Content_'; // Verify we're on the right page. $this->url("active-controls/index.php?page=ActiveRatingListReadOnlyTest"); - $this->assertTextPresent("TActiveRatingList ReadOnly Test Case"); + $this->assertContains("TActiveRatingList ReadOnly Test Case", $this->source()); $this->assertText("{$base}Status", "ReadOnly=true"); $this->assertCheckBoxes("{$base}RatingList", array(0), 6); @@ -129,7 +129,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test $this->assertCheckBoxes("{$base}RatingList", array(0), 6); // Then set ReadOnly to false, and make sure it works. - $this->click("{$base}Writable"); + $this->byId("{$base}Writable")->click(); $this->pause(800); $this->assertText("{$base}Status", "ReadOnly=false"); $this->assertCheckBoxes("{$base}RatingList", array(0), 6); @@ -141,7 +141,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test $this->assertCheckBoxes("{$base}RatingList", array(1), 6); // Then set ReadOnly to true, and make sure it doesn't work anymore. - $this->click("{$base}ReadOnly"); + $this->byId("{$base}ReadOnly")->click(); $this->pause(800); $this->assertText("{$base}Status", "ReadOnly=true"); $this->assertCheckBoxes("{$base}RatingList", array(1), 6); @@ -158,7 +158,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test $base='ctl0_Content_'; // Verify we're on the right page. $this->url("active-controls/index.php?page=ActiveRatingListEnabledTest"); - $this->assertTextPresent("TActiveRatingList Enabled Test Case"); + $this->assertContains("TActiveRatingList Enabled Test Case", $this->source()); $this->assertText("{$base}Status", "Enabled=false"); $this->assertCheckBoxes("{$base}RatingList", array(5), 6); @@ -168,7 +168,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test $this->assertCheckBoxes("{$base}RatingList", array(5), 6); // Then set Enable to true, and make sure it works. - $this->click("{$base}Enable"); + $this->byId("{$base}Enable")->click(); $this->pause(800); $this->assertText("{$base}Status", "Enabled=true"); $this->assertCheckBoxes("{$base}RatingList", array(5), 6); @@ -180,7 +180,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test $this->assertCheckBoxes("{$base}RatingList", array(3), 6); // Then set Enable to false, and make sure it doesn't work anymore. - $this->click("{$base}Disable"); + $this->byId("{$base}Disable")->click(); $this->pause(800); $this->assertText("{$base}Status", "Enabled=false"); $this->assertCheckBoxes("{$base}RatingList", array(3), 6); @@ -197,7 +197,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test $base='ctl0_Content_'; // Verify we're on the right page. $this->url("active-controls/index.php?page=ActiveRatingListHoverCaptionTest"); - $this->assertTextPresent("TActiveRatingList Hover Caption Test Case"); + $this->assertContains("TActiveRatingList Hover Caption Test Case", $this->source()); $this->assertText("{$base}Status", "CaptionID='Status'"); $this->assertElementPresent("//input[@id='{$base}RatingList_c0']/../../../td[contains(@class, 'rating_selected')]"); $this->assertElementPresent("//input[@id='{$base}RatingList_c1']/../../../td[contains(@class, 'rating_selected')]"); @@ -231,7 +231,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test $this->mouseOver("//input[@id='{$base}RatingList_c1']/../.."); $this->assertText("{$base}Status", "Fair"); - $this->click("//input[@id='{$base}RatingList_c1']/../.."); + $this->byXPath("//input[@id='{$base}RatingList_c1']/../..")->click(); $this->pause(800); $this->assertText("{$base}Status", "2 : Fair"); $this->assertElementPresent("//input[@id='{$base}RatingList_c0']/../../../td[contains(@class, 'rating_selected')]"); @@ -244,7 +244,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test } function clickTD($clientID){ - $this->click("//input[@id='{$clientID}']/../.."); + $this->byXPath("//input[@id='{$clientID}']/../..")->click(); } function assertCheckBoxes($clientID, $checks, $total = 5) @@ -252,9 +252,9 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test for($i = 0; $i < $total; $i++) { if(in_array($i, $checks)) - $this->assertChecked("{$clientID}_c{$i}"); + $this->assertTrue($this->byId("{$clientID}_c{$i}")->selected()); else - $this->assertNotChecked("{$clientID}_c{$i}"); + $this->assertFalse($this->byId("{$clientID}_c{$i}")->selected()); } } } \ No newline at end of file diff --git a/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php b/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php index 49a5db93..5292affb 100755 --- a/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php +++ b/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php @@ -32,13 +32,13 @@ class BasicI18NTestCase extends PradoGenericSelenium2Test function testI18N() { - $this->verifyTitle("Basic I18N Test", ""); - $this->assertTextPresent("Hello", ""); - $this->assertTextPresent("US$10,000.00", ""); - $this->assertTextPresent("2006年1月15日 上午12时00分00秒", ""); - $this->assertTextPresent("None", ""); - $this->assertTextPresent("One thing.", ""); - $this->assertTextPresent("Many things.", ""); + $this->assertEquals("Basic I18N Test", $this->title()); + $this->assertContains("Hello", $this->source()); + $this->assertContains("US$10,000.00", $this->source()); + $this->assertContains("2006年1月15日 上午12时00分00秒", $this->source()); + $this->assertContains("None", $this->source()); + $this->assertContains("One thing.", $this->source()); + $this->assertContains("Many things.", $this->source()); } } */ \ No newline at end of file diff --git a/tests/FunctionalTests/features/tests/MyTestCase.php b/tests/FunctionalTests/features/tests/MyTestCase.php index 682462fe..d748b6b0 100755 --- a/tests/FunctionalTests/features/tests/MyTestCase.php +++ b/tests/FunctionalTests/features/tests/MyTestCase.php @@ -5,6 +5,6 @@ class MyTestCase extends PradoGenericSelenium2Test function test1() { $this->url('http://127.0.0.1'); - $this->assertTextNotPresent('asd'); + $this->assertNotContains('asd', $this->source()); } } diff --git a/tests/FunctionalTests/quickstart/ActiveControls/ActiveButtonTestCase.php b/tests/FunctionalTests/quickstart/ActiveControls/ActiveButtonTestCase.php index dce8f144..9d816978 100755 --- a/tests/FunctionalTests/quickstart/ActiveControls/ActiveButtonTestCase.php +++ b/tests/FunctionalTests/quickstart/ActiveControls/ActiveButtonTestCase.php @@ -6,29 +6,29 @@ class QuickstartActiveButtonTestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=ActiveControls.Samples.TActiveButton.Home&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); - $this->assertTextPresent('TActiveButton Samples (AJAX)'); + $this->assertContains('TActiveButton Samples (AJAX)', $this->source()); // a click button $this->assertElementNotPresent("//input[@type='submit' and @value=\"I'm clicked\"]"); - $this->click("//input[@type='submit' and @value='click me']", ""); + $this->byXPath("//input[@type='submit' and @value='click me']")->click(); $this->pause(800); $this->assertElementPresent("//input[@type='submit' and @value=\"I'm clicked\"]"); // a command button $this->assertElementNotPresent("//input[@type='submit' and @value=\"Name: test, Param: value using callback\"]"); - $this->click("//input[@type='submit' and @value='click me']", ""); + $this->byXPath("//input[@type='submit' and @value='click me']")->click(); $this->pause(800); $this->assertElementPresent("//input[@type='submit' and @value=\"Name: test, Param: value using callback\"]"); // a button causing validation $this->assertNotVisible('ctl0_body_ctl2'); - $this->click("//input[@type='submit' and @value='submit']", ""); + $this->byXPath("//input[@type='submit' and @value='submit']")->click(); $this->pause(800); $this->assertVisible('ctl0_body_ctl2'); $this->type("ctl0\$body\$TextBox", "test"); - $this->click("//input[@type='submit' and @value='submit']", ""); + $this->byXPath("//input[@type='submit' and @value='submit']")->click(); $this->pause(800); $this->assertNotVisible('ctl0_body_ctl2'); $this->assertElementPresent("//input[@type='submit' and @value=\"I'm clicked using callback\"]", ""); diff --git a/tests/FunctionalTests/quickstart/ActiveControls/ActiveCheckBoxTestCase.php b/tests/FunctionalTests/quickstart/ActiveControls/ActiveCheckBoxTestCase.php index 64643d9d..9e537abd 100755 --- a/tests/FunctionalTests/quickstart/ActiveControls/ActiveCheckBoxTestCase.php +++ b/tests/FunctionalTests/quickstart/ActiveControls/ActiveCheckBoxTestCase.php @@ -7,51 +7,51 @@ class QuickstartActiveCheckBoxTestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=ActiveControls.Samples.TActiveCheckBox.Home&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); - $this->assertTextPresent('TActiveCheckBox Samples (AJAX)'); + $this->assertContains('TActiveCheckBox Samples (AJAX)', $this->source()); // an auto postback checkbox - $this->assertTextNotPresent("ctl0_body_ctl0 clicked using callback"); - $this->click("//input[@name='ctl0\$body\$ctl0']"); + $this->assertNotContains("ctl0_body_ctl0 clicked using callback", $this->source()); + $this->byXPath("//input[@name='ctl0\$body\$ctl0']")->click(); $this->pause(800); - $this->assertChecked("//input[@name='ctl0\$body\$ctl0']"); - $this->assertTextPresent("ctl0_body_ctl0 clicked using callback"); - $this->click("//input[@name='ctl0\$body\$ctl0']"); + $this->assertTrue($this->byXPath("//input[@name='ctl0\$body\$ctl0']")->selected()); + $this->assertContains("ctl0_body_ctl0 clicked using callback", $this->source()); + $this->byXPath("//input[@name='ctl0\$body\$ctl0']")->click(); $this->pause(800); - $this->assertTextPresent("ctl0_body_ctl0 clicked using callback"); - $this->assertNotChecked("//input[@name='ctl0\$body\$ctl0']"); + $this->assertContains("ctl0_body_ctl0 clicked using callback", $this->source()); + $this->assertFalse($this->byXPath("//input[@name='ctl0\$body\$ctl0']")->selected()); // a checkbox causing validation on a textbox $this->assertNotVisible('ctl0_body_ctl1'); - $this->click("//input[@name='ctl0\$body\$ctl2']"); + $this->byXPath("//input[@name='ctl0\$body\$ctl2']")->click(); $this->assertVisible('ctl0_body_ctl1'); - $this->click("//input[@name='ctl0\$body\$ctl2']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl2']")->click(); $this->assertVisible('ctl0_body_ctl3'); $this->type("ctl0\$body\$TextBox", "test"); - $this->click("//input[@name='ctl0\$body\$ctl2']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl2']")->click(); $this->pause(800); $this->assertNotVisible('ctl0_body_ctl1'); - $this->assertTextPresent("ctl0_body_ctl2 clicked using callback"); + $this->assertContains("ctl0_body_ctl2 clicked using callback", $this->source()); // a checkbox validated by a required field validator - $this->assertNotChecked("//input[@name='ctl0\$body\$CheckBox']"); + $this->assertFalse($this->byXPath("//input[@name='ctl0\$body\$CheckBox']")->selected()); $this->assertNotVisible('ctl0_body_ctl4'); - $this->click("//input[@type='submit' and @value='Submit']", ""); + $this->byXPath("//input[@type='submit' and @value='Submit']")->click(); $this->assertVisible('ctl0_body_ctl4'); - $this->click("//input[@name='ctl0\$body\$CheckBox']", ""); - $this->assertChecked("//input[@name='ctl0\$body\$CheckBox']"); - $this->click("//input[@type='submit' and @value='Submit']", ""); + $this->byXPath("//input[@name='ctl0\$body\$CheckBox']")->click(); + $this->assertTrue($this->byXPath("//input[@name='ctl0\$body\$CheckBox']")->selected()); + $this->byXPath("//input[@type='submit' and @value='Submit']")->click(); $this->pause(800); $this->assertNotVisible('ctl0_body_ctl4'); - $this->assertTextPresent("ctl0_body_CheckBox clicked"); + $this->assertContains("ctl0_body_CheckBox clicked", $this->source()); // a checkbox validated by a required field validator using AutoPostBack - $this->assertChecked("//input[@name='ctl0\$body\$CheckBox2']"); + $this->assertTrue($this->byXPath("//input[@name='ctl0\$body\$CheckBox2']")->selected()); $this->assertNotVisible('ctl0_body_ctl5'); - $this->click("//input[@name='ctl0\$body\$CheckBox2']", ""); + $this->byXPath("//input[@name='ctl0\$body\$CheckBox2']")->click(); $this->assertVisible('ctl0_body_ctl5'); - $this->assertChecked("//input[@name='ctl0\$body\$CheckBox2']"); + $this->assertTrue($this->byXPath("//input[@name='ctl0\$body\$CheckBox2']")->selected()); } } diff --git a/tests/FunctionalTests/quickstart/ActiveControls/ActiveCustomValidatorTestCase.php b/tests/FunctionalTests/quickstart/ActiveControls/ActiveCustomValidatorTestCase.php index dba29133..7cb29382 100755 --- a/tests/FunctionalTests/quickstart/ActiveControls/ActiveCustomValidatorTestCase.php +++ b/tests/FunctionalTests/quickstart/ActiveControls/ActiveCustomValidatorTestCase.php @@ -6,14 +6,14 @@ class QuickstartActiveCustomValidatorTestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=ActiveControls.Samples.TActiveCustomValidator.Home&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); - $this->assertTextPresent('TActiveCustomValidator Samples (AJAX)'); + $this->assertContains('TActiveCustomValidator Samples (AJAX)', $this->source()); $base = 'ctl0_body_'; $this->assertNotVisible($base.'validator1'); - $this->click($base.'button1'); + $this->byId($base.'button1')->click(); $this->pause(800); $this->assertVisible($base.'validator1'); @@ -25,7 +25,7 @@ class QuickstartActiveCustomValidatorTestCase extends PradoGenericSelenium2Test $this->pause(800); $this->assertVisible($base.'validator1'); - $this->click($base.'button1'); + $this->byId($base.'button1')->click(); $this->pause(800); $this->assertNotVisible($base.'validator1'); } diff --git a/tests/FunctionalTests/quickstart/Advanced/I18N.php b/tests/FunctionalTests/quickstart/Advanced/I18N.php index 51df9503..ccb8c961 100755 --- a/tests/FunctionalTests/quickstart/Advanced/I18N.php +++ b/tests/FunctionalTests/quickstart/Advanced/I18N.php @@ -6,47 +6,47 @@ class QuickstartI18NTestCase extends PradoGenericSelenium2Test function test () { $this->url("../../demos/quickstart/index.php?notheme=true&page=Advanced.Samples.I18N.Home&lang=en&notheme=true"); - $this->assertTextPresent("Internationlization in PRADO", ""); - $this->assertTextPresent("46.412,42 €", ""); - $this->assertTextPresent("$12.40", ""); - $this->assertTextPresent("€100.00", ""); - $this->assertTextPresent("December 6, 2004", ""); + $this->assertContains("Internationlization in PRADO", $this->source()); + $this->assertContains("46.412,42 €", $this->source()); + $this->assertContains("$12.40", $this->source()); + $this->assertContains("€100.00", $this->source()); + $this->assertContains("December 6, 2004", $this->source()); $this->url("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=zh&notheme=true"); - $this->assertTextPresent("PRADO 国际化", ""); - $this->assertTextPresent("2004 十二月", ""); - $this->assertTextPresent("US$ 12.40", ""); - $this->assertTextPresent("46.412,42 €", ""); - $this->assertTextPresent("€100.00 ", ""); + $this->assertContains("PRADO 国际化", $this->source()); + $this->assertContains("2004 十二月", $this->source()); + $this->assertContains("US$ 12.40", $this->source()); + $this->assertContains("46.412,42 €", $this->source()); + $this->assertContains("€100.00 ", $this->source()); $this->url("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=zh_TW&notheme=true"); - $this->assertTextPresent("PRADO 國際化", ""); - $this->assertTextPresent("2004年12月6日", ""); - $this->assertTextPresent("US$12.40", ""); - $this->assertTextPresent("46.412,42 €", ""); - $this->assertTextPresent("€100.00", ""); + $this->assertContains("PRADO 國際化", $this->source()); + $this->assertContains("2004年12月6日", $this->source()); + $this->assertContains("US$12.40", $this->source()); + $this->assertContains("46.412,42 €", $this->source()); + $this->assertContains("€100.00", $this->source()); $this->url("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=de&notheme=true"); - $this->assertTextPresent("Internationalisierung in PRADO", ""); - $this->assertTextPresent("6. Dezember 2004 ", ""); - $this->assertTextPresent("$ 12,40", ""); - $this->assertTextPresent("46.412,42 €", ""); - $this->assertTextPresent("€100.00", ""); + $this->assertContains("Internationalisierung in PRADO", $this->source()); + $this->assertContains("6. Dezember 2004 ", $this->source()); + $this->assertContains("$ 12,40", $this->source()); + $this->assertContains("46.412,42 €", $this->source()); + $this->assertContains("€100.00", $this->source()); $this->url("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=es&notheme=true"); - $this->assertTextPresent("Internationlization en PRADO", ""); - $this->assertTextPresent("6 de diciembre de 2004", ""); - $this->assertTextPresent("US$12.40", ""); - $this->assertTextPresent("46.412,42 €", ""); - $this->assertTextPresent("€100.00", ""); + $this->assertContains("Internationlization en PRADO", $this->source()); + $this->assertContains("6 de diciembre de 2004", $this->source()); + $this->assertContains("US$12.40", $this->source()); + $this->assertContains("46.412,42 €", $this->source()); + $this->assertContains("€100.00", $this->source()); $this->url("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=fr&notheme=true"); - $this->assertTextPresent("Internationalisation avec PRADO", ""); - $this->assertTextPresent("6 décembre 2004", ""); - $this->assertTextPresent("12,40 $", ""); - $this->assertTextPresent("46.412,42 €", ""); - $this->assertTextPresent("€100.00", ""); + $this->assertContains("Internationalisation avec PRADO", $this->source()); + $this->assertContains("6 décembre 2004", $this->source()); + $this->assertContains("12,40 $", $this->source()); + $this->assertContains("46.412,42 €", $this->source()); + $this->assertContains("€100.00", $this->source()); $this->url("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=pl&notheme=true"); - $this->assertTextPresent("Internacjonalizacja w PRADO", ""); - $this->assertTextPresent("6 grudnia 2004", ""); - $this->assertTextPresent("US$ 12,40", ""); - $this->assertTextPresent("46.412,42 €", ""); - $this->assertTextPresent("€100.00", ""); + $this->assertContains("Internacjonalizacja w PRADO", $this->source()); + $this->assertContains("6 grudnia 2004", $this->source()); + $this->assertContains("US$ 12,40", $this->source()); + $this->assertContains("46.412,42 €", $this->source()); + $this->assertContains("€100.00", $this->source()); } } diff --git a/tests/FunctionalTests/quickstart/Controls/BulletedListTestCase.php b/tests/FunctionalTests/quickstart/Controls/BulletedListTestCase.php index f5b58b48..a23f1d1d 100755 --- a/tests/FunctionalTests/quickstart/Controls/BulletedListTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/BulletedListTestCase.php @@ -7,13 +7,13 @@ class QuickstartBulletedListTestCase extends PradoGenericSelenium2Test $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TBulletedList.Home&notheme=true&lang=en"); // verify if all required texts are present - $this->assertTextPresent('item 1',''); - $this->assertTextPresent('item 2',''); - $this->assertTextPresent('item 3',''); - $this->assertTextPresent('item 4',''); - $this->assertTextPresent('google',''); - $this->assertTextPresent('yahoo',''); - $this->assertTextPresent('amazon',''); + $this->assertContains('item 1', $this->source()); + $this->assertContains('item 2', $this->source()); + $this->assertContains('item 3', $this->source()); + $this->assertContains('item 4', $this->source()); + $this->assertContains('google', $this->source()); + $this->assertContains('yahoo', $this->source()); + $this->assertContains('amazon', $this->source()); // verify order list starting from 5 $this->assertElementPresent("//ol[@start='5']"); @@ -26,11 +26,11 @@ class QuickstartBulletedListTestCase extends PradoGenericSelenium2Test $this->assertElementPresent("//a[@href='http://www.amazon.com/']"); // verify linkbutton list - $this->clickAndWait("id=ctl0_body_ctl40", ""); - $this->assertTextPresent("You clicked google : http://www.google.com/.", ""); - $this->clickAndWait("id=ctl0_body_ctl41", ""); - $this->assertTextPresent("You clicked yahoo : http://www.yahoo.com/.", ""); - $this->clickAndWait("id=ctl0_body_ctl42", ""); - $this->assertTextPresent("You clicked amazon : http://www.amazon.com/.", ""); + $this->byId("ctl0_body_ctl40")->click(); + $this->assertContains("You clicked google : http://www.google.com/.", $this->source()); + $this->byId("ctl0_body_ctl41")->click(); + $this->assertContains("You clicked yahoo : http://www.yahoo.com/.", $this->source()); + $this->byId("ctl0_body_ctl42")->click(); + $this->assertContains("You clicked amazon : http://www.amazon.com/.", $this->source()); } } diff --git a/tests/FunctionalTests/quickstart/Controls/ButtonTestCase.php b/tests/FunctionalTests/quickstart/Controls/ButtonTestCase.php index f228de83..f5a4a979 100755 --- a/tests/FunctionalTests/quickstart/Controls/ButtonTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/ButtonTestCase.php @@ -6,28 +6,28 @@ class QuickstartButtonTestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TButton.Home&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); // a regular button - $this->clickAndWait("//input[@type='submit' and @value='text']", ""); + $this->byXPath("//input[@type='submit' and @value='text']")->click(); // a click button $this->assertElementNotPresent("//input[@type='submit' and @value=\"I'm clicked\"]"); - $this->clickAndWait("//input[@type='submit' and @value='click me']", ""); + $this->byXPath("//input[@type='submit' and @value='click me']")->click(); $this->assertElementPresent("//input[@type='submit' and @value=\"I'm clicked\"]"); // a command button $this->assertElementNotPresent("//input[@type='submit' and @value=\"Name: test, Param: value\"]"); - $this->clickAndWait("//input[@type='submit' and @value='click me']", ""); + $this->byXPath("//input[@type='submit' and @value='click me']")->click(); $this->assertElementPresent("//input[@type='submit' and @value=\"Name: test, Param: value\"]"); // a button causing validation $this->assertNotVisible('ctl0_body_ctl3'); - $this->click("//input[@type='submit' and @value='submit']", ""); + $this->byXPath("//input[@type='submit' and @value='submit']")->click(); // $this->pause(1000); $this->assertVisible('ctl0_body_ctl3'); $this->type("ctl0\$body\$TextBox", "test"); - $this->clickAndWait("//input[@type='submit' and @value='submit']", ""); + $this->byXPath("//input[@type='submit' and @value='submit']")->click(); $this->assertNotVisible('ctl0_body_ctl3'); } } diff --git a/tests/FunctionalTests/quickstart/Controls/CheckBoxListTestCase.php b/tests/FunctionalTests/quickstart/Controls/CheckBoxListTestCase.php index 6ab6329b..781701cf 100755 --- a/tests/FunctionalTests/quickstart/Controls/CheckBoxListTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/CheckBoxListTestCase.php @@ -8,10 +8,10 @@ class QuickstartCheckBoxListTestCase extends PradoGenericSelenium2Test $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TCheckBoxList.Home&notheme=true&lang=en"); // Check box list with default settings: - $this->click("//input[@name='ctl0\$body\$ctl0\$c0' and @value='value 1']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl0\$c0' and @value='value 1']")->click(); // Check box list with customized cellpadding, cellspacing, color and text alignment: - $this->click("//input[@name='ctl0\$body\$ctl1\$c1' and @value='value 2']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl1\$c1' and @value='value 2']")->click(); // *** Currently unable to test the following cases: // Check box list with vertical (default) repeat direction @@ -20,33 +20,33 @@ class QuickstartCheckBoxListTestCase extends PradoGenericSelenium2Test // Check box list with flow layout and horizontal repeat direction: // Check box list's behavior upon postback - $this->click("//input[@name='ctl0\$body\$CheckBoxList\$c2' and @value='value 3']", ""); - $this->clickAndWait("//input[@type='submit' and @value='Submit']", ""); - $this->assertTextPresent("Your selection is: (Index: 1, Value: value 2, Text: item 2)(Index: 2, Value: value 3, Text: item 3)(Index: 4, Value: value 5, Text: item 5)", ""); + $this->byXPath("//input[@name='ctl0\$body\$CheckBoxList\$c2' and @value='value 3']")->click(); + $this->byXPath("//input[@type='submit' and @value='Submit']")->click(); + $this->assertContains("Your selection is: (Index: 1, Value: value 2, Text: item 2)(Index: 2, Value: value 3, Text: item 3)(Index: 4, Value: value 5, Text: item 5)", $this->source()); // Auto postback check box list - $this->clickAndWait("//input[@name='ctl0\$body\$ctl7\$c1' and @value='value 2']", ""); - $this->assertTextPresent("Your selection is: (Index: 4, Value: value 5, Text: item 5)", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl7\$c1' and @value='value 2']")->click(); + $this->assertContains("Your selection is: (Index: 4, Value: value 5, Text: item 5)", $this->source()); // Databind to an integer-indexed array - $this->clickAndWait("//input[@name='ctl0\$body\$DBCheckBoxList1\$c1' and @value='1']", ""); - $this->assertTextPresent("Your selection is: (Index: 1, Value: 1, Text: item 2)", ""); + $this->byXPath("//input[@name='ctl0\$body\$DBCheckBoxList1\$c1' and @value='1']")->click(); + $this->assertContains("Your selection is: (Index: 1, Value: 1, Text: item 2)", $this->source()); // Databind to an associative array: - $this->clickAndWait("//input[@name='ctl0\$body\$DBCheckBoxList2\$c1' and @value='key 2']", ""); - $this->assertTextPresent("Your selection is: (Index: 1, Value: key 2, Text: item 2)", ""); + $this->byXPath("//input[@name='ctl0\$body\$DBCheckBoxList2\$c1' and @value='key 2']")->click(); + $this->assertContains("Your selection is: (Index: 1, Value: key 2, Text: item 2)", $this->source()); // Databind with DataTextField and DataValueField specified - $this->clickAndWait("//input[@name='ctl0\$body\$DBCheckBoxList3\$c2' and @value='003']", ""); - $this->assertTextPresent("Your selection is: (Index: 2, Value: 003, Text: Cary)", ""); + $this->byXPath("//input[@name='ctl0\$body\$DBCheckBoxList3\$c2' and @value='003']")->click(); + $this->assertContains("Your selection is: (Index: 2, Value: 003, Text: Cary)", $this->source()); // CheckBox list causing validation $this->assertNotVisible('ctl0_body_ctl8'); - $this->click("//input[@name='ctl0\$body\$ctl9\$c0' and @value='Agree']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl9\$c0' and @value='Agree']")->click(); // $this->pause(1000); $this->assertVisible('ctl0_body_ctl8'); $this->type("ctl0\$body\$TextBox", "test"); - $this->clickAndWait("//input[@name='ctl0\$body\$ctl9\$c0' and @value='Agree']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl9\$c0' and @value='Agree']")->click(); $this->assertNotVisible('ctl0_body_ctl8'); } } diff --git a/tests/FunctionalTests/quickstart/Controls/CheckBoxTestCase.php b/tests/FunctionalTests/quickstart/Controls/CheckBoxTestCase.php index 1bacecb0..ca89b3a0 100755 --- a/tests/FunctionalTests/quickstart/Controls/CheckBoxTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/CheckBoxTestCase.php @@ -6,48 +6,48 @@ class QuickstartCheckBoxTestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TCheckBox.Home&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); // a regular checkbox - $this->click("//input[@name='ctl0\$body\$ctl0']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl0']")->click(); // a checkbox with customized value - $this->click("//input[@name='ctl0\$body\$ctl1' and @value='value']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl1' and @value='value']")->click(); // an auto postback checkbox - $this->assertTextNotPresent("I'm clicked"); - $this->clickAndWait("//input[@name='ctl0\$body\$ctl2']", ""); - $this->assertTextPresent("I'm clicked"); - $this->clickAndWait("//input[@name='ctl0\$body\$ctl2']", ""); - $this->assertTextPresent("I'm clicked"); + $this->assertNotContains("I'm clicked", $this->source()); + $this->byXPath("//input[@name='ctl0\$body\$ctl2']")->click(); + $this->assertContains("I'm clicked", $this->source()); + $this->byXPath("//input[@name='ctl0\$body\$ctl2']")->click(); + $this->assertContains("I'm clicked", $this->source()); // a checkbox causing validation on a textbox $this->assertNotVisible('ctl0_body_ctl3'); - $this->click("//input[@name='ctl0\$body\$ctl4']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl4']")->click(); // $this->pause(1000); $this->assertVisible('ctl0_body_ctl3'); - $this->click("//input[@name='ctl0\$body\$ctl4']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl4']")->click(); // $this->pause(1000); $this->assertVisible('ctl0_body_ctl3'); $this->type("ctl0\$body\$TextBox", "test"); - $this->clickAndWait("//input[@name='ctl0\$body\$ctl4']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl4']")->click(); $this->assertNotVisible('ctl0_body_ctl3'); // a checkbox validated by a required field validator $this->assertNotVisible('ctl0_body_ctl6'); - $this->click("//input[@type='submit' and @value='Submit']", ""); + $this->byXPath("//input[@type='submit' and @value='Submit']")->click(); // $this->pause(1000); $this->assertVisible('ctl0_body_ctl6'); - $this->click("//input[@name='ctl0\$body\$CheckBox']", ""); - $this->clickAndWait("//input[@type='submit' and @value='Submit']", ""); + $this->byXPath("//input[@name='ctl0\$body\$CheckBox']")->click(); + $this->byXPath("//input[@type='submit' and @value='Submit']")->click(); $this->assertNotVisible('ctl0_body_ctl6'); // a checkbox validated by a required field validator using AutoPostBack $this->assertNotVisible('ctl0_body_ctl7'); - $this->click("//input[@name='ctl0\$body\$CheckBox2']", ""); + $this->byXPath("//input[@name='ctl0\$body\$CheckBox2']")->click(); // $this->pause(1000); $this->assertVisible('ctl0_body_ctl7'); -// $this->clickAndWait("//input[@name='ctl0\$body\$CheckBox2' and @value='ctl0\$body\$CheckBox2']", ""); +// $this->byXPath("//input[@name='ctl0\$body\$CheckBox2' and @value='ctl0\$body\$CheckBox2']")->click(); // $this->assertNotVisible('ctl0_body_ctl7'); } } diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php index efe2829d..4f4ca60a 100755 --- a/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php @@ -7,23 +7,23 @@ class QuickstartDataGrid1TestCase extends PradoGenericSelenium2Test $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample1&notheme=true&lang=en"); // verify if all required texts are present - $this->assertTextPresent('id',''); - $this->assertTextPresent('name',''); - $this->assertTextPresent('quantity',''); - $this->assertTextPresent('price',''); - $this->assertTextPresent('imported',''); - $this->assertTextPresent('ITN001',''); - $this->assertTextPresent('Motherboard',''); - $this->assertTextPresent('100',''); - $this->assertTextPresent('true',''); - $this->assertTextPresent('ITN019',''); - $this->assertTextPresent('Speaker',''); - $this->assertTextPresent('35',''); - $this->assertTextPresent('65',''); - $this->assertTextPresent('false',''); + $this->assertContains('id', $this->source()); + $this->assertContains('name', $this->source()); + $this->assertContains('quantity', $this->source()); + $this->assertContains('price', $this->source()); + $this->assertContains('imported', $this->source()); + $this->assertContains('ITN001', $this->source()); + $this->assertContains('Motherboard', $this->source()); + $this->assertContains('100', $this->source()); + $this->assertContains('true', $this->source()); + $this->assertContains('ITN019', $this->source()); + $this->assertContains('Speaker', $this->source()); + $this->assertContains('35', $this->source()); + $this->assertContains('65', $this->source()); + $this->assertContains('false', $this->source()); // verify specific table tags $this->assertElementPresent("ctl0_body_DataGrid"); - $this->verifyAttribute("ctl0_body_DataGrid@cellpadding","2"); + $this->assertAttribute("ctl0_body_DataGrid@cellpadding","2"); } } diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid2TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid2TestCase.php index 15a4c510..548b04e3 100755 --- a/tests/FunctionalTests/quickstart/Controls/DataGrid2TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/DataGrid2TestCase.php @@ -7,43 +7,43 @@ class QuickstartDataGrid2TestCase extends PradoGenericSelenium2Test $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample2&notheme=true&lang=en"); // verify if all required texts are present - $this->assertTextPresent('Book Title',''); - $this->assertTextPresent('Publisher',''); - $this->assertTextPresent('Price',''); - $this->assertTextPresent('In-stock',''); - $this->assertTextPresent('Rating',''); + $this->assertContains('Book Title', $this->source()); + $this->assertContains('Publisher', $this->source()); + $this->assertContains('Price', $this->source()); + $this->assertContains('In-stock', $this->source()); + $this->assertContains('Rating', $this->source()); // verify book titles $this->assertElementPresent("//a[@href='http://www.amazon.com/gp/product/0596007124' and text()='Head First Design Patterns']",''); $this->assertElementPresent("//a[@href='http://www.amazon.com/gp/product/0321278658' and text()='Extreme Programming Explained : Embrace Change']",''); // verify publishers - $this->assertTextPresent("O'Reilly Media, Inc.",''); - $this->assertTextPresent("Addison-Wesley Professional",''); + $this->assertContains("O'Reilly Media, Inc.", $this->source()); + $this->assertContains("Addison-Wesley Professional", $this->source()); // verify prices - $this->assertTextPresent("\$37.49",''); - $this->assertTextPresent("\$38.49",''); + $this->assertContains("\$37.49", $this->source()); + $this->assertContains("\$38.49", $this->source()); // verify in-stock - $this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl5@checked','regexp:true|checked'); - $this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl5@disabled','regexp:true|disabled'); - $this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl5@checked','regexp:true|checked'); - $this->verifyAttribute('ctl0_body_DataGrid_ctl6_ctl5@checked',null); - $this->verifyAttribute('ctl0_body_DataGrid_ctl6_ctl5@disabled','regexp:true|disabled'); + $this->assertAttribute('ctl0_body_DataGrid_ctl1_ctl5@checked','regexp:true|checked'); + $this->assertAttribute('ctl0_body_DataGrid_ctl1_ctl5@disabled','regexp:true|disabled'); + $this->assertAttribute('ctl0_body_DataGrid_ctl2_ctl5@checked','regexp:true|checked'); + $this->assertAttribute('ctl0_body_DataGrid_ctl6_ctl5@checked',null); + $this->assertAttribute('ctl0_body_DataGrid_ctl6_ctl5@disabled','regexp:true|disabled'); // verify ratings //$this->assertElementPresent("//img[@src='images/star5.gif']",''); //$this->assertElementPresent("//img[@src='images/star2.gif']",''); // verify toggle column visibility - $this->clickAndWait("//input[@name='ctl0\$body\$ctl1\$c0' and @value='Book Title']", ""); - $this->assertTextNotPresent('Head First Design Patterns',''); - $this->clickAndWait("//input[@name='ctl0\$body\$ctl1\$c3' and @value='In-stock']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl1\$c0' and @value='Book Title']")->click(); + $this->assertNotContains('Head First Design Patterns', $this->source()); + $this->byXPath("//input[@name='ctl0\$body\$ctl1\$c3' and @value='In-stock']")->click(); $this->assertElementNotPresent('ctl0_body_DataGrid_ctl1_ctl5',''); - $this->clickAndWait("//input[@name='ctl0\$body\$ctl1\$c3' and @value='In-stock']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl1\$c3' and @value='In-stock']")->click(); $this->assertElementPresent('ctl0_body_DataGrid_ctl1_ctl5',''); - $this->clickAndWait("//input[@name='ctl0\$body\$ctl1\$c0' and @value='Book Title']", ""); - $this->assertTextPresent('Head First Design Patterns',''); + $this->byXPath("//input[@name='ctl0\$body\$ctl1\$c0' and @value='Book Title']")->click(); + $this->assertContains('Head First Design Patterns', $this->source()); } } diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php index 0b24e2f5..f0e88996 100755 --- a/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php @@ -7,43 +7,49 @@ class QuickstartDataGrid3TestCase extends PradoGenericSelenium2Test $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample3&notheme=true&lang=en"); // verify the 2nd row of data - $this->assertTextPresent("Design Patterns: Elements of Reusable Object-Oriented Software", ""); - $this->assertTextPresent("Addison-Wesley Professional", ""); - $this->assertTextPresent("$47.04", ""); - $this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl4@checked','regexp:true|checked'); - $this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl4@disabled','regexp:true|disabled'); + $this->assertContains("Design Patterns: Elements of Reusable Object-Oriented Software", $this->source()); + $this->assertContains("Addison-Wesley Professional", $this->source()); + $this->assertContains("$47.04", $this->source()); + $this->assertAttribute('ctl0_body_DataGrid_ctl2_ctl4@checked','regexp:true|checked'); + $this->assertAttribute('ctl0_body_DataGrid_ctl2_ctl4@disabled','regexp:true|disabled'); //$this->assertElementPresent("//img[@src='images/star5.gif']",''); // edit the 2nd row - $this->clickAndWait("id=ctl0_body_DataGrid_ctl2_ctl7", ""); + $this->byId("ctl0_body_DataGrid_ctl2_ctl7")->click(); $this->type("ctl0\$body\$DataGrid\$ctl2\$ctl1", "Design Pattern: Elements of Reusable Object-Oriented Software"); $this->type("ctl0\$body\$DataGrid\$ctl2\$ctl3", "Addison Wesley Professional"); $this->type("ctl0\$body\$DataGrid\$ctl2\$ctl5", "\$57.04"); - $this->click("//input[@name='ctl0\$body\$DataGrid\$ctl2\$ctl7']", ""); - $this->select("ctl0\$body\$DataGrid\$ctl2\$ctl9", "label=1"); - $this->clickAndWait("link=Save", ""); + $this->byXPath("//input[@name='ctl0\$body\$DataGrid\$ctl2\$ctl7']")->click(); + $this->select("ctl0\$body\$DataGrid\$ctl2\$ctl9", "1"); + $this->byLinkText("Save")->click(); // verify the 2nd row is saved - $this->assertTextPresent("Design Pattern: Elements of Reusable Object-Oriented Software", ""); - $this->assertTextPresent("Addison Wesley Professional", ""); - $this->assertTextPresent("$57.04", ""); - $this->verifyAttribute("ctl0_body_DataGrid_ctl2_ctl4@checked", null); - $this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl4@disabled','regexp:true|disabled'); + $this->assertContains("Design Pattern: Elements of Reusable Object-Oriented Software", $this->source()); + $this->assertContains("Addison Wesley Professional", $this->source()); + $this->assertContains("$57.04", $this->source()); + $this->assertAttribute("ctl0_body_DataGrid_ctl2_ctl4@checked", null); + $this->assertAttribute('ctl0_body_DataGrid_ctl2_ctl4@disabled','regexp:true|disabled'); //$this->assertElementPresent("//img[@src='images/star1.gif']",''); // verify cancel editting the 3rd row - $this->clickAndWait("id=ctl0_body_DataGrid_ctl3_ctl7", ""); - $this->clickAndWait("link=Cancel", ""); - $this->assertTextPresent("Design Patterns Explained : A New Perspective on Object-Oriented Design", ""); + $this->byId("ctl0_body_DataGrid_ctl3_ctl7")->click(); + $this->byLinkText("Cancel")->click(); + $this->assertContains("Design Patterns Explained : A New Perspective on Object-Oriented Design", $this->source()); // verify deleting - $this->clickAndWait("id=ctl0_body_DataGrid_ctl3_ctl9", ""); - $this->verifyConfirmation("Are you sure?"); - $this->assertTextNotPresent("Design Patterns Explained : A New Perspective on Object-Oriented Design", ""); - - $this->assertTextPresent("Extreme Programming Explained : Embrace Change",''); - $this->click("id=ctl0_body_DataGrid_ctl6_ctl9", ""); - $this->verifyConfirmationDismiss("Are you sure?"); - $this->assertTextPresent("Extreme Programming Explained : Embrace Change",''); + $this->byId("ctl0_body_DataGrid_ctl3_ctl9")->click(); + + $this->assertEquals("Are you sure?", $this->alertText()); + $this->acceptAlert(); + + $this->assertNotContains("Design Patterns Explained : A New Perspective on Object-Oriented Design", $this->source()); + + $this->assertContains("Extreme Programming Explained : Embrace Change", $this->source()); + $this->byId("ctl0_body_DataGrid_ctl6_ctl9")->click(); + + $this->assertEquals("Are you sure?", $this->alertText()); + $this->dismissAlert(); + + $this->assertContains("Extreme Programming Explained : Embrace Change", $this->source()); } } diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php index f78e52c4..f67f5634 100755 --- a/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php @@ -7,22 +7,22 @@ class QuickstartDataGrid4TestCase extends PradoGenericSelenium2Test $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample4&notheme=true&lang=en"); // verify the 2nd row of data - $this->assertTextPresent("Design Patterns: Elements of Reusable Object-Oriented Software", ""); - $this->assertTextPresent("Addison-Wesley Professional", ""); - $this->assertTextPresent("$47.04", ""); - $this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl5@checked','regexp:true|checked'); - $this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl5@disabled','regexp:true|disabled'); + $this->assertContains("Design Patterns: Elements of Reusable Object-Oriented Software", $this->source()); + $this->assertContains("Addison-Wesley Professional", $this->source()); + $this->assertContains("$47.04", $this->source()); + $this->assertAttribute('ctl0_body_DataGrid_ctl2_ctl5@checked','regexp:true|checked'); + $this->assertAttribute('ctl0_body_DataGrid_ctl2_ctl5@disabled','regexp:true|disabled'); // verify sorting - $this->clickAndWait("link=Book Title", ""); - $this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl5@checked', null); - $this->clickAndWait("link=Publisher", ""); - $this->verifyAttribute('ctl0_body_DataGrid_ctl6_ctl5@checked', null); - $this->clickAndWait("link=Price", ""); - $this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl5@checked', null); - $this->clickAndWait("link=In-stock", ""); - $this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl5@checked', null); - $this->clickAndWait("link=Rating", ""); - $this->verifyAttribute('ctl0_body_DataGrid_ctl4_ctl5@checked', null); + $this->byLinkText("Book Title")->click(); + $this->assertAttribute('ctl0_body_DataGrid_ctl1_ctl5@checked', null); + $this->byLinkText("Publisher")->click(); + $this->assertAttribute('ctl0_body_DataGrid_ctl6_ctl5@checked', null); + $this->byLinkText("Price")->click(); + $this->assertAttribute('ctl0_body_DataGrid_ctl2_ctl5@checked', null); + $this->byLinkText("In-stock")->click(); + $this->assertAttribute('ctl0_body_DataGrid_ctl1_ctl5@checked', null); + $this->byLinkText("Rating")->click(); + $this->assertAttribute('ctl0_body_DataGrid_ctl4_ctl5@checked', null); } } diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid5TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid5TestCase.php index 4ff65a64..3df22ff8 100755 --- a/tests/FunctionalTests/quickstart/Controls/DataGrid5TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/DataGrid5TestCase.php @@ -8,106 +8,106 @@ class QuickstartDataGrid5TestCase extends PradoGenericSelenium2Test // verify if all required texts are present // verify column headers - $this->assertTextPresent('id',''); - $this->assertTextPresent('name',''); - $this->assertTextPresent('quantity',''); - $this->assertTextPresent('price',''); - $this->assertTextPresent('imported',''); + $this->assertContains('id', $this->source()); + $this->assertContains('name', $this->source()); + $this->assertContains('quantity', $this->source()); + $this->assertContains('price', $this->source()); + $this->assertContains('imported', $this->source()); - $this->assertTextPresent('ITN001',''); - $this->assertTextPresent('ITN002',''); - $this->assertTextPresent('ITN003',''); - $this->assertTextPresent('ITN004',''); - $this->assertTextPresent('ITN005',''); - $this->assertTextNotPresent('ITN006',''); + $this->assertContains('ITN001', $this->source()); + $this->assertContains('ITN002', $this->source()); + $this->assertContains('ITN003', $this->source()); + $this->assertContains('ITN004', $this->source()); + $this->assertContains('ITN005', $this->source()); + $this->assertNotContains('ITN006', $this->source()); // verify paging - $this->clickAndWait("link=2", ""); - $this->assertTextPresent('ITN006',''); - $this->assertTextPresent('ITN007',''); - $this->assertTextPresent('ITN008',''); - $this->assertTextPresent('ITN009',''); - $this->assertTextPresent('ITN010',''); - $this->assertTextNotPresent('ITN011',''); - $this->assertTextNotPresent('ITN005',''); + $this->byLinkText("2")->click(); + $this->assertContains('ITN006', $this->source()); + $this->assertContains('ITN007', $this->source()); + $this->assertContains('ITN008', $this->source()); + $this->assertContains('ITN009', $this->source()); + $this->assertContains('ITN010', $this->source()); + $this->assertNotContains('ITN011', $this->source()); + $this->assertNotContains('ITN005', $this->source()); - $this->clickAndWait("link=4", ""); - $this->assertTextPresent('ITN016',''); - $this->assertTextPresent('ITN017',''); - $this->assertTextPresent('ITN018',''); - $this->assertTextPresent('ITN019',''); - $this->assertTextNotPresent('ITN015',''); + $this->byLinkText("4")->click(); + $this->assertContains('ITN016', $this->source()); + $this->assertContains('ITN017', $this->source()); + $this->assertContains('ITN018', $this->source()); + $this->assertContains('ITN019', $this->source()); + $this->assertNotContains('ITN015', $this->source()); - $this->clickAndWait("link=1", ""); - $this->assertTextPresent('ITN001',''); - $this->assertTextPresent('ITN002',''); - $this->assertTextPresent('ITN003',''); - $this->assertTextPresent('ITN004',''); - $this->assertTextPresent('ITN005',''); - $this->assertTextNotPresent('ITN006',''); + $this->byLinkText("1")->click(); + $this->assertContains('ITN001', $this->source()); + $this->assertContains('ITN002', $this->source()); + $this->assertContains('ITN003', $this->source()); + $this->assertContains('ITN004', $this->source()); + $this->assertContains('ITN005', $this->source()); + $this->assertNotContains('ITN006', $this->source()); // show top pager - $this->clickAndWait("//input[@name='ctl0\$body\$ctl1\$c0' and @value='Top']", ""); - $this->clickAndWait("id=ctl0_body_DataGrid_ctl8_ctl3", ""); - $this->clickAndWait("link=1", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl1\$c0' and @value='Top']")->click(); + $this->byId("ctl0_body_DataGrid_ctl8_ctl3")->click(); + $this->byLinkText("1")->click(); // hide top pager - $this->clickAndWait("//input[@name='ctl0\$body\$ctl1\$c0' and @value='Top']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl1\$c0' and @value='Top']")->click(); // change next prev caption $this->type("ctl0\$body\$NextPageText", "Next Page"); $this->type("ctl0\$body\$PrevPageText", "Prev Page"); - $this->clickAndWait("//input[@type='submit' and @value='Submit']", ""); + $this->byXPath("//input[@type='submit' and @value='Submit']")->click(); // verify next prev paging - $this->assertTextPresent('ITN001',''); - $this->assertTextNotPresent('ITN006',''); - $this->clickAndWait("link=Next Page", ""); - $this->assertTextNotPresent('ITN005',''); - $this->assertTextPresent('ITN006',''); - $this->assertTextNotPresent('ITN011',''); - $this->clickAndWait("link=Next Page", ""); - $this->assertTextNotPresent('ITN010',''); - $this->assertTextPresent('ITN011',''); - $this->assertTextNotPresent('ITN016',''); - $this->clickAndWait("link=Next Page", ""); - $this->assertTextNotPresent('ITN015',''); - $this->assertTextPresent('ITN016',''); - $this->clickAndWait("link=Prev Page", ""); - $this->assertTextNotPresent('ITN010',''); - $this->assertTextPresent('ITN011',''); - $this->assertTextNotPresent('ITN016',''); - $this->clickAndWait("link=Prev Page", ""); - $this->assertTextNotPresent('ITN005',''); - $this->assertTextPresent('ITN006',''); - $this->assertTextNotPresent('ITN011',''); - $this->clickAndWait("link=Prev Page", ""); - $this->assertTextPresent('ITN001',''); - $this->assertTextNotPresent('ITN006',''); + $this->assertContains('ITN001', $this->source()); + $this->assertNotContains('ITN006', $this->source()); + $this->byLinkText("Next Page")->click(); + $this->assertNotContains('ITN005', $this->source()); + $this->assertContains('ITN006', $this->source()); + $this->assertNotContains('ITN011', $this->source()); + $this->byLinkText("Next Page")->click(); + $this->assertNotContains('ITN010', $this->source()); + $this->assertContains('ITN011', $this->source()); + $this->assertNotContains('ITN016', $this->source()); + $this->byLinkText("Next Page")->click(); + $this->assertNotContains('ITN015', $this->source()); + $this->assertContains('ITN016', $this->source()); + $this->byLinkText("Prev Page")->click(); + $this->assertNotContains('ITN010', $this->source()); + $this->assertContains('ITN011', $this->source()); + $this->assertNotContains('ITN016', $this->source()); + $this->byLinkText("Prev Page")->click(); + $this->assertNotContains('ITN005', $this->source()); + $this->assertContains('ITN006', $this->source()); + $this->assertNotContains('ITN011', $this->source()); + $this->byLinkText("Prev Page")->click(); + $this->assertContains('ITN001', $this->source()); + $this->assertNotContains('ITN006', $this->source()); // change button count $this->type("ctl0\$body\$PageButtonCount", "2"); - $this->clickAndWait("name=ctl0\$body\$ctl6", ""); - $this->clickAndWait("link=Next Page", ""); - $this->assertTextNotPresent('ITN010',''); - $this->assertTextPresent('ITN011',''); - $this->assertTextNotPresent('ITN016',''); - $this->clickAndWait("link=4", ""); - $this->assertTextNotPresent('ITN015',''); - $this->assertTextPresent('ITN016',''); - $this->clickAndWait("link=Prev Page", ""); - $this->assertTextNotPresent('ITN005',''); - $this->assertTextPresent('ITN006',''); - $this->assertTextNotPresent('ITN011',''); + $this->byName("ctl0\$body\$ctl6")->click(); + $this->byLinkText("Next Page")->click(); + $this->assertNotContains('ITN010', $this->source()); + $this->assertContains('ITN011', $this->source()); + $this->assertNotContains('ITN016', $this->source()); + $this->byLinkText("4")->click(); + $this->assertNotContains('ITN015', $this->source()); + $this->assertContains('ITN016', $this->source()); + $this->byLinkText("Prev Page")->click(); + $this->assertNotContains('ITN005', $this->source()); + $this->assertContains('ITN006', $this->source()); + $this->assertNotContains('ITN011', $this->source()); $this->type("ctl0\$body\$PageButtonCount", "10"); - $this->clickAndWait("name=ctl0\$body\$ctl6", ""); + $this->byName("ctl0\$body\$ctl6")->click(); $this->type("ctl0\$body\$PageSize", "2"); - $this->clickAndWait("name=ctl0\$body\$ctl8", ""); - $this->assertTextPresent('ITN001',''); - $this->assertTextPresent('ITN002',''); - $this->assertTextNotPresent('ITN003',''); - $this->clickAndWait("link=10", ""); - $this->assertTextPresent('ITN019',''); - $this->assertTextNotPresent('ITN018',''); + $this->byName("ctl0\$body\$ctl8")->click(); + $this->assertContains('ITN001', $this->source()); + $this->assertContains('ITN002', $this->source()); + $this->assertNotContains('ITN003', $this->source()); + $this->byLinkText("10")->click(); + $this->assertContains('ITN019', $this->source()); + $this->assertNotContains('ITN018', $this->source()); } } diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid6TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid6TestCase.php index 8d48fd85..54af86a8 100755 --- a/tests/FunctionalTests/quickstart/Controls/DataGrid6TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/DataGrid6TestCase.php @@ -7,42 +7,42 @@ class QuickstartDataGrid6TestCase extends PradoGenericSelenium2Test $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample6&notheme=true&lang=en"); // verify column headers - $this->assertTextPresent('id',''); - $this->assertTextPresent('name',''); - $this->assertTextPresent('quantity',''); - $this->assertTextPresent('price',''); - $this->assertTextPresent('imported',''); + $this->assertContains('id', $this->source()); + $this->assertContains('name', $this->source()); + $this->assertContains('quantity', $this->source()); + $this->assertContains('price', $this->source()); + $this->assertContains('imported', $this->source()); - $this->assertTextPresent('ITN001',''); - $this->assertTextPresent('ITN002',''); - $this->assertTextPresent('ITN003',''); - $this->assertTextPresent('ITN004',''); - $this->assertTextPresent('ITN005',''); - $this->assertTextNotPresent('ITN006',''); + $this->assertContains('ITN001', $this->source()); + $this->assertContains('ITN002', $this->source()); + $this->assertContains('ITN003', $this->source()); + $this->assertContains('ITN004', $this->source()); + $this->assertContains('ITN005', $this->source()); + $this->assertNotContains('ITN006', $this->source()); // verify paging - $this->clickAndWait("link=2", ""); - $this->assertTextPresent('ITN006',''); - $this->assertTextPresent('ITN007',''); - $this->assertTextPresent('ITN008',''); - $this->assertTextPresent('ITN009',''); - $this->assertTextPresent('ITN010',''); - $this->assertTextNotPresent('ITN011',''); - $this->assertTextNotPresent('ITN005',''); + $this->byLinkText("2")->click(); + $this->assertContains('ITN006', $this->source()); + $this->assertContains('ITN007', $this->source()); + $this->assertContains('ITN008', $this->source()); + $this->assertContains('ITN009', $this->source()); + $this->assertContains('ITN010', $this->source()); + $this->assertNotContains('ITN011', $this->source()); + $this->assertNotContains('ITN005', $this->source()); - $this->clickAndWait("link=4", ""); - $this->assertTextPresent('ITN016',''); - $this->assertTextPresent('ITN017',''); - $this->assertTextPresent('ITN018',''); - $this->assertTextPresent('ITN019',''); - $this->assertTextNotPresent('ITN015',''); + $this->byLinkText("4")->click(); + $this->assertContains('ITN016', $this->source()); + $this->assertContains('ITN017', $this->source()); + $this->assertContains('ITN018', $this->source()); + $this->assertContains('ITN019', $this->source()); + $this->assertNotContains('ITN015', $this->source()); - $this->clickAndWait("link=1", ""); - $this->assertTextPresent('ITN001',''); - $this->assertTextPresent('ITN002',''); - $this->assertTextPresent('ITN003',''); - $this->assertTextPresent('ITN004',''); - $this->assertTextPresent('ITN005',''); - $this->assertTextNotPresent('ITN006',''); + $this->byLinkText("1")->click(); + $this->assertContains('ITN001', $this->source()); + $this->assertContains('ITN002', $this->source()); + $this->assertContains('ITN003', $this->source()); + $this->assertContains('ITN004', $this->source()); + $this->assertContains('ITN005', $this->source()); + $this->assertNotContains('ITN006', $this->source()); } } diff --git a/tests/FunctionalTests/quickstart/Controls/DataList1TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataList1TestCase.php index 01a3b62a..436af2ad 100755 --- a/tests/FunctionalTests/quickstart/Controls/DataList1TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/DataList1TestCase.php @@ -7,15 +7,15 @@ class QuickstartDataList1TestCase extends PradoGenericSelenium2Test $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataList.Sample1&notheme=true&lang=en"); // verify if all required texts are present - $this->assertTextPresent('ITN001',''); - $this->assertTextPresent('$100',''); - $this->assertTextPresent('Motherboard',''); - $this->assertTextPresent('ITN018',''); - $this->assertTextPresent('Surge protector',''); - $this->assertTextPresent('45',''); - $this->assertTextPresent('$15',''); - $this->assertTextPresent('Total 19 products.',''); - $this->assertTextPresent('Computer Parts',''); + $this->assertContains('ITN001', $this->source()); + $this->assertContains('$100', $this->source()); + $this->assertContains('Motherboard', $this->source()); + $this->assertContains('ITN018', $this->source()); + $this->assertContains('Surge protector', $this->source()); + $this->assertContains('45', $this->source()); + $this->assertContains('$15', $this->source()); + $this->assertContains('Total 19 products.', $this->source()); + $this->assertContains('Computer Parts', $this->source()); // verify specific table tags $this->assertElementPresent("ctl0_body_DataList"); diff --git a/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php index 2957c96f..911fdc93 100755 --- a/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php @@ -7,52 +7,58 @@ class QuickstartDataList2TestCase extends PradoGenericSelenium2Test $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataList.Sample2&notheme=true&lang=en"); // verify initial presentation - $this->assertTextPresent("Motherboard", ""); - $this->assertTextPresent("Monitor", ""); + $this->assertContains("Motherboard", $this->source()); + $this->assertContains("Monitor", $this->source()); // verify selecting an item - $this->clickAndWait("link=ITN003", ""); - $this->assertTextPresent("Quantity", ""); - $this->assertTextPresent("Price", ""); - $this->assertTextPresent("\$80", ""); - $this->clickAndWait("link=ITN005", ""); - $this->assertTextPresent("\$150", ""); + $this->byLinkText("ITN003")->click(); + $this->assertContains("Quantity", $this->source()); + $this->assertContains("Price", $this->source()); + $this->assertContains("\$80", $this->source()); + $this->byLinkText("ITN005")->click(); + $this->assertContains("\$150", $this->source()); // verify editting an item - $this->clickAndWait("id=ctl0_body_DataList_ctl5_ctl0", ""); + $this->byId("ctl0_body_DataList_ctl5_ctl0")->click(); $this->type("ctl0\$body\$DataList\$ctl5\$ProductQuantity", "11"); $this->type("ctl0\$body\$DataList\$ctl5\$ProductPrice", "140.99"); - $this->click("//input[@name='ctl0\$body\$DataList\$ctl5\$ProductImported']", ""); - $this->clickAndWait("link=Save", ""); + $this->byXPath("//input[@name='ctl0\$body\$DataList\$ctl5\$ProductImported']")->click(); + $this->byLinkText("Save")->click(); // verify item is saved - $this->clickAndWait("link=ITN005", ""); - $this->assertTextPresent("\$140.99", ""); - $this->assertTextPresent("11", ""); + $this->byLinkText("ITN005")->click(); + $this->assertContains("\$140.99", $this->source()); + $this->assertContains("11", $this->source()); // verify editting another item - $this->clickAndWait("id=ctl0_body_DataList_ctl3_ctl1", ""); + $this->byId("ctl0_body_DataList_ctl3_ctl1")->click(); $this->type("ctl0\$body\$DataList\$ctl3\$ProductName", "Hard Drive"); $this->type("ctl0\$body\$DataList\$ctl3\$ProductQuantity", "23"); - $this->click("//input[@name='ctl0\$body\$DataList\$ctl3\$ProductImported']", ""); - $this->clickAndWait("link=Cancel", ""); + $this->byXPath("//input[@name='ctl0\$body\$DataList\$ctl3\$ProductImported']")->click(); + $this->byLinkText("Cancel")->click(); // verify item is canceled - $this->clickAndWait("link=ITN003", ""); - $this->assertTextPresent("2", ""); - $this->assertTextPresent("Harddrive", ""); + $this->byLinkText("ITN003")->click(); + $this->assertContains("2", $this->source()); + $this->assertContains("Harddrive", $this->source()); // verify item deletion - $this->clickAndWait("id=ctl0_body_DataList_ctl3_ctl1", ""); - $this->verifyConfirmation("Are you sure?"); - $this->click("id=ctl0_body_DataList_ctl5_ctl2", ""); - $this->verifyConfirmationDismiss("Are you sure?"); - $this->assertTextPresent("Motherboard", ""); - $this->assertTextPresent("CPU", ""); - $this->assertTextNotPresent("Harddrive",""); - $this->assertTextPresent("Sound card", ""); - $this->assertTextPresent("Video card", ""); - $this->assertTextPresent("Keyboard",""); - $this->assertTextPresent("Monitor", ""); + $this->byId("ctl0_body_DataList_ctl3_ctl1")->click(); + + $this->assertEquals("Are you sure?", $this->alertText()); + $this->acceptAlert(); + + $this->byId("ctl0_body_DataList_ctl5_ctl2")->click(); + + $this->assertEquals("Are you sure?", $this->alertText()); + $this->dismissAlert(); + + $this->assertContains("Motherboard", $this->source()); + $this->assertContains("CPU", $this->source()); + $this->assertNotContains("Harddrive", $this->source()); + $this->assertContains("Sound card", $this->source()); + $this->assertContains("Video card", $this->source()); + $this->assertContains("Keyboard", $this->source()); + $this->assertContains("Monitor", $this->source()); } } diff --git a/tests/FunctionalTests/quickstart/Controls/DropDownListTestCase.php b/tests/FunctionalTests/quickstart/Controls/DropDownListTestCase.php index 1b7aca5e..cb01e948 100755 --- a/tests/FunctionalTests/quickstart/Controls/DropDownListTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/DropDownListTestCase.php @@ -6,7 +6,7 @@ class QuickstartDropDownListTestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDropDownList.Home&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); // dropdown list with default settings $this->assertElementPresent("ctl0\$body\$ctl0"); @@ -20,46 +20,46 @@ class QuickstartDropDownListTestCase extends PradoGenericSelenium2Test $this->assertSelected("ctl0\$body\$ctl2","item 2"); // a disabled dropdown list - $this->verifyAttribute("ctl0\$body\$ctl3@disabled","regexp:true|disabled"); + $this->assertAttribute("ctl0\$body\$ctl3@disabled","regexp:true|disabled"); // an auto postback dropdown list - $this->assertTextNotPresent("Your selection is: (Index: 2, Value: value 3, Text: item 3)", ""); - $this->selectAndWait("ctl0\$body\$ctl4", "label=item 3"); - $this->assertTextPresent("Your selection is: (Index: 2, Value: value 3, Text: item 3)", ""); + $this->assertNotContains("Your selection is: (Index: 2, Value: value 3, Text: item 3)", $this->source()); + $this->selectAndWait("ctl0\$body\$ctl4", "item 3"); + $this->assertContains("Your selection is: (Index: 2, Value: value 3, Text: item 3)", $this->source()); // a single selection list box upon postback - $this->select("ctl0\$body\$DropDownList1", "label=item 4"); - $this->assertTextNotPresent("Your selection is: (Index: 3, Value: value 4, Text: item 4)", ""); - $this->clickAndWait("//input[@type='submit' and @value='Submit']", ""); - $this->assertTextPresent("Your selection is: (Index: 3, Value: value 4, Text: item 4)", ""); + $this->select("ctl0\$body\$DropDownList1", "item 4"); + $this->assertNotContains("Your selection is: (Index: 3, Value: value 4, Text: item 4)", $this->source()); + $this->byXPath("//input[@type='submit' and @value='Submit']")->click(); + $this->assertContains("Your selection is: (Index: 3, Value: value 4, Text: item 4)", $this->source()); // Databind to an integer-indexed array - $this->selectAndWait("ctl0\$body\$DBDropDownList1", "label=item 3"); - $this->assertTextPresent("Your selection is: (Index: 2, Value: 2, Text: item 3)", ""); + $this->selectAndWait("ctl0\$body\$DBDropDownList1", "item 3"); + $this->assertContains("Your selection is: (Index: 2, Value: 2, Text: item 3)", $this->source()); // Databind to an associative array - $this->selectAndWait("ctl0\$body\$DBDropDownList2", "label=item 2"); - $this->assertTextPresent("Your selection is: (Index: 1, Value: key 2, Text: item 2)", ""); + $this->selectAndWait("ctl0\$body\$DBDropDownList2", "item 2"); + $this->assertContains("Your selection is: (Index: 1, Value: key 2, Text: item 2)", $this->source()); // Databind with DataTextField and DataValueField specified - $this->selectAndWait("ctl0\$body\$DBDropDownList3", "label=Cary"); - $this->assertTextPresent("Your selection is: (Index: 2, Value: 003, Text: Cary)", ""); + $this->selectAndWait("ctl0\$body\$DBDropDownList3", "Cary"); + $this->assertContains("Your selection is: (Index: 2, Value: 003, Text: Cary)", $this->source()); // dropdown list is being validated $this->assertNotVisible('ctl0_body_ctl6'); - $this->click("id=ctl0_body_ctl7", ""); + $this->byId("ctl0_body_ctl7")->click(); $this->assertVisible('ctl0_body_ctl6'); - $this->select("ctl0\$body\$VDropDownList1", "label=item 2"); - $this->clickAndWait("id=ctl0_body_ctl7", ""); + $this->select("ctl0\$body\$VDropDownList1", "item 2"); + $this->byId("ctl0_body_ctl7")->click(); $this->assertNotVisible('ctl0_body_ctl6'); // dropdown list causing validation $this->assertNotVisible('ctl0_body_ctl8'); - $this->select("ctl0\$body\$VDropDownList2", "label=Disagree"); + $this->select("ctl0\$body\$VDropDownList2", "Disagree"); $this->pause(1000); $this->assertVisible('ctl0_body_ctl8'); $this->type("ctl0\$body\$TextBox", "test"); - $this->selectAndWait("ctl0\$body\$VDropDownList2", "label=Agree"); + $this->selectAndWait("ctl0\$body\$VDropDownList2", "Agree"); $this->assertNotVisible('ctl0_body_ctl8'); } } diff --git a/tests/FunctionalTests/quickstart/Controls/ExpressionTestCase.php b/tests/FunctionalTests/quickstart/Controls/ExpressionTestCase.php index 7421bdf6..8c5add48 100755 --- a/tests/FunctionalTests/quickstart/Controls/ExpressionTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/ExpressionTestCase.php @@ -6,8 +6,8 @@ class QuickstartExpressionTestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TExpression.Home&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); - $this->assertTextPresent('PRADO QuickStart Sample'); + $this->assertContains('PRADO QuickStart Sample', $this->source()); } } diff --git a/tests/FunctionalTests/quickstart/Controls/HtmlAreaTestCase.php b/tests/FunctionalTests/quickstart/Controls/HtmlAreaTestCase.php index 3d7de705..53ee6697 100755 --- a/tests/FunctionalTests/quickstart/Controls/HtmlAreaTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/HtmlAreaTestCase.php @@ -6,7 +6,7 @@ class QuickstartHtmlAreaTestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.THtmlArea.Home&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); // can't perform any test } diff --git a/tests/FunctionalTests/quickstart/Controls/HyperLinkTestCase.php b/tests/FunctionalTests/quickstart/Controls/HyperLinkTestCase.php index 3c80254f..bc7ef8b8 100755 --- a/tests/FunctionalTests/quickstart/Controls/HyperLinkTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/HyperLinkTestCase.php @@ -5,10 +5,10 @@ class QuickstartHyperLinkTestCase extends PradoGenericSelenium2Test function test () { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.THyperLink.Home&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); $this->assertElementPresent("//a[@href=\"http://www.pradosoft.com/\" and @target=\"_blank\"]"); - $this->assertTextPresent("Welcome to", ""); - $this->assertTextPresent("Body contents", ""); + $this->assertContains("Welcome to", $this->source()); + $this->assertContains("Body contents", $this->source()); $this->assertElementPresent("//a[img/@alt='Hello World']"); $this->assertElementPresent("//a[contains(text(),'Body contents')]"); } diff --git a/tests/FunctionalTests/quickstart/Controls/ImageButtonTestCase.php b/tests/FunctionalTests/quickstart/Controls/ImageButtonTestCase.php index 4133bcbd..0f86216e 100755 --- a/tests/FunctionalTests/quickstart/Controls/ImageButtonTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/ImageButtonTestCase.php @@ -6,23 +6,23 @@ class QuickstartImageButtonTestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TImageButton.Home&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); // a click button - $this->clickAndWait("//input[@type='image' and @alt='hello world']", ""); - $this->assertTextPresent("You clicked at ",""); + $this->byXPath("//input[@type='image' and @alt='hello world']")->click(); + $this->assertContains("You clicked at ", $this->source()); // a command button - $this->clickAndWait("ctl0\$body\$ctl1", ""); - $this->assertTextPresent("Command name: test, Command parameter: value",""); + $this->byName("ctl0\$body\$ctl1")->click(); + $this->assertContains("Command name: test, Command parameter: value", $this->source()); // a button causing validation $this->assertNotVisible('ctl0_body_ctl2'); - $this->click("id=ctl0_body_ctl3", ""); + $this->byId("ctl0_body_ctl3")->click(); // $this->pause(1000); $this->assertVisible('ctl0_body_ctl2'); $this->type("ctl0\$body\$TextBox", "test"); - $this->clickAndWait("id=ctl0_body_ctl3", ""); + $this->byId("ctl0_body_ctl3")->click(); $this->assertNotVisible('ctl0_body_ctl2'); } } diff --git a/tests/FunctionalTests/quickstart/Controls/ImageTestCase.php b/tests/FunctionalTests/quickstart/Controls/ImageTestCase.php index 8dcf7d9a..f3bd4775 100755 --- a/tests/FunctionalTests/quickstart/Controls/ImageTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/ImageTestCase.php @@ -7,11 +7,11 @@ class QuickstartImageTestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TImage.Home&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); //$this->assertElementPresent("//img[contains(@src,'/hello_world.gif') and @alt='']"); $this->assertElementPresent("//img[contains(@src,'/hello_world.gif') and @alt='Hello World!']"); - $this->assertTextPresent("Hello World! Hello World! Hello World!", ""); + $this->assertContains("Hello World! Hello World! Hello World!", $this->source()); //$this->assertElementPresent("//img[contains(@src,'/hello_world.gif') and @align='baseline']"); //$this->assertElementPresent("//img[contains(@src,'/hello_world.gif') and contains(@longdesc,'HelloWorld.html')]"); } diff --git a/tests/FunctionalTests/quickstart/Controls/LabelTestCase.php b/tests/FunctionalTests/quickstart/Controls/LabelTestCase.php index 96873c00..a9aa0bbe 100755 --- a/tests/FunctionalTests/quickstart/Controls/LabelTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/LabelTestCase.php @@ -6,15 +6,15 @@ class QuickstartLabelTestCase extends PradoGenericSelenium2Test function test () { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TLabel.Home&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); - $this->assertTextPresent("This is a label with customized color and font.", ""); - $this->assertTextPresent("This is a form label associated with the TTextBox control below", ""); - $this->assertTextPresent("This is a label with empty Text property and nonempty body", ""); - $this->assertTextPresent("This is a disabled label", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); + $this->assertContains("This is a label with customized color and font.", $this->source()); + $this->assertContains("This is a form label associated with the TTextBox control below", $this->source()); + $this->assertContains("This is a label with empty Text property and nonempty body", $this->source()); + $this->assertContains("This is a disabled label", $this->source()); - $this->verifyAttribute("ctl0_body_Label2@disabled","regexp:true|disabled"); + $this->assertAttribute("ctl0_body_Label2@disabled","regexp:true|disabled"); - //$this->verifyAttribute("ctl0_body_Label1@for","ctl0_body_test"); + //$this->assertAttribute("ctl0_body_Label1@for","ctl0_body_test"); $this->type("ctl0\$body\$test", "test"); } diff --git a/tests/FunctionalTests/quickstart/Controls/LinkButtonTestCase.php b/tests/FunctionalTests/quickstart/Controls/LinkButtonTestCase.php index 65fd23fb..97b4863d 100755 --- a/tests/FunctionalTests/quickstart/Controls/LinkButtonTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/LinkButtonTestCase.php @@ -6,27 +6,27 @@ class QuickstartLinkButtonTestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TLinkButton.Home&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); // regular buttons - $this->clickAndWait("link=link button", ""); - $this->clickAndWait("//a[contains(text(),'body content')]", ""); + $this->byLinkText("link button")->click(); + $this->byXPath("//a[contains(text(),'body content')]")->click(); // a click button - $this->clickAndWait("link=click me", ""); - $this->clickAndWait("link=I'm clicked", ""); + $this->byLinkText("click me")->click(); + $this->byLinkText("I'm clicked")->click(); // a command button - $this->clickAndWait("link=click me", ""); - $this->clickAndWait("//a[contains(text(),'Name: test, Param: value')]", ""); + $this->byLinkText("click me")->click(); + $this->byXPath("//a[contains(text(),'Name: test, Param: value')]")->click(); // a button causing validation $this->assertNotVisible('ctl0_body_ctl4'); - $this->click("link=submit", ""); + $this->byLinkText("submit")->click(); // $this->pause(1000); $this->assertVisible('ctl0_body_ctl4'); $this->type("ctl0\$body\$TextBox", "test"); - $this->clickAndWait("link=submit", ""); + $this->byLinkText("submit")->click(); $this->assertNotVisible('ctl0_body_ctl4'); } } diff --git a/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php b/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php index 99bb0509..11910ba5 100755 --- a/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php @@ -8,74 +8,74 @@ class QuickstartListBoxTestCase extends PradoGenericSelenium2Test $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TListBox.Home&notheme=true&lang=en"); // a default single selection listbox - $this->verifyAttribute("ctl0\$body\$ctl0@size","4"); + $this->assertAttribute("ctl0\$body\$ctl0@size","4"); // single selection list box with initial options $this->assertEquals($this->getSelectOptions("ctl0\$body\$ctl1"), array('item 1', 'item 2', 'item 3', 'item 4')); $this->assertSelected("ctl0\$body\$ctl1","item 2"); // a single selection list box with customized style - $this->verifyAttribute("ctl0\$body\$ctl2@size","3"); + $this->assertAttribute("ctl0\$body\$ctl2@size","3"); $this->assertEquals($this->getSelectOptions("ctl0\$body\$ctl2"), array('item 1', 'item 2', 'item 3', 'item 4')); $this->assertSelected("ctl0\$body\$ctl2","item 2"); // a disabled list box - $this->verifyAttribute("ctl0\$body\$ctl3@disabled","regexp:true|disabled"); + $this->assertAttribute("ctl0\$body\$ctl3@disabled","regexp:true|disabled"); // an auto postback single selection list box - $this->assertTextNotPresent("Your selection is: (Index: 2, Value: value 3, Text: item 3)", ""); - $this->selectAndWait("ctl0\$body\$ctl4", "label=item 3"); - $this->assertTextPresent("Your selection is: (Index: 2, Value: value 3, Text: item 3)", ""); + $this->assertNotContains("Your selection is: (Index: 2, Value: value 3, Text: item 3)", $this->source()); + $this->selectAndWait("ctl0\$body\$ctl4", "item 3"); + $this->assertContains("Your selection is: (Index: 2, Value: value 3, Text: item 3)", $this->source()); // a single selection list box upon postback - $this->select("ctl0\$body\$ListBox1", "label=item 4"); - $this->assertTextNotPresent("Your selection is: (Index: 3, Value: value 4, Text: item 4)", ""); - $this->clickAndWait("//input[@type='submit' and @value='Submit']", ""); - $this->assertTextPresent("Your selection is: (Index: 3, Value: value 4, Text: item 4)", ""); + $this->select("ctl0\$body\$ListBox1", "item 4"); + $this->assertNotContains("Your selection is: (Index: 3, Value: value 4, Text: item 4)", $this->source()); + $this->byXPath("//input[@type='submit' and @value='Submit']")->click(); + $this->assertContains("Your selection is: (Index: 3, Value: value 4, Text: item 4)", $this->source()); // a multiple selection list box - $this->verifyAttribute("ctl0\$body\$ctl6[]@size","4"); - $this->verifyAttribute("ctl0\$body\$ctl6[]@multiple","regexp:true|multiple"); + $this->assertAttribute("ctl0\$body\$ctl6[]@size","4"); + $this->assertAttribute("ctl0\$body\$ctl6[]@multiple","regexp:true|multiple"); // a multiple selection list box with initial options - $this->verifyAttribute("ctl0\$body\$ctl7[]@multiple","regexp:true|multiple"); + $this->assertAttribute("ctl0\$body\$ctl7[]@multiple","regexp:true|multiple"); $this->assertEquals($this->getSelectOptions("ctl0\$body\$ctl7[]"), array('item 1', 'item 2', 'item 3', 'item 4')); // multiselection list box's behavior upon postback - $this->addSelection("ctl0\$body\$ListBox2[]", "label=item 3"); - $this->clickAndWait("name=ctl0\$body\$ctl8", ""); + $this->addSelection("ctl0\$body\$ListBox2[]", "item 3"); + $this->byName("ctl0\$body\$ctl8")->click(); $this->assertText("ctl0_body_MultiSelectionResult2","Your selection is: (Index: 1, Value: value 2, Text: item 2)(Index: 2, Value: value 3, Text: item 3)(Index: 3, Value: value 4, Text: item 4)"); // Auto postback multiselection list box - $this->addSelection("ctl0\$body\$ctl9[]", "label=item 1"); + $this->addSelection("ctl0\$body\$ctl9[]", "item 1"); $this->assertText("ctl0_body_MultiSelectionResult","Your selection is: (Index: 0, Value: value 1, Text: item 1)(Index: 1, Value: value 2, Text: item 2)(Index: 3, Value: value 4, Text: item 4)"); // Databind to an integer-indexed array - $this->selectAndWait("ctl0\$body\$DBListBox1[]", "label=item 3"); - $this->assertTextPresent("Your selection is: (Index: 2, Value: 2, Text: item 3)", ""); + $this->selectAndWait("ctl0\$body\$DBListBox1[]", "item 3"); + $this->assertContains("Your selection is: (Index: 2, Value: 2, Text: item 3)", $this->source()); // Databind to an associative array - $this->selectAndWait("ctl0\$body\$DBListBox2[]", "label=item 2"); - $this->assertTextPresent("Your selection is: (Index: 1, Value: key 2, Text: item 2)", ""); + $this->selectAndWait("ctl0\$body\$DBListBox2[]", "item 2"); + $this->assertContains("Your selection is: (Index: 1, Value: key 2, Text: item 2)", $this->source()); // Databind with DataTextField and DataValueField specified - $this->selectAndWait("ctl0\$body\$DBListBox3[]", "label=Cary"); - $this->assertTextPresent("Your selection is: (Index: 2, Value: 003, Text: Cary)", ""); + $this->selectAndWait("ctl0\$body\$DBListBox3[]", "Cary"); + $this->assertContains("Your selection is: (Index: 2, Value: 003, Text: Cary)", $this->source()); // List box is being validated $this->assertNotVisible('ctl0_body_ctl10'); - $this->click("id=ctl0_body_ctl11", ""); + $this->byId("ctl0_body_ctl11")->click(); $this->assertVisible('ctl0_body_ctl10'); - $this->select("ctl0\$body\$VListBox1", "label=item 2"); - $this->clickAndWait("id=ctl0_body_ctl11", ""); + $this->select("ctl0\$body\$VListBox1", "item 2"); + $this->byId("ctl0_body_ctl11")->click(); $this->assertNotVisible('ctl0_body_ctl10'); // List box causing validation $this->assertNotVisible('ctl0_body_ctl12'); - $this->select("ctl0\$body\$VListBox2", "label=Agree"); + $this->select("ctl0\$body\$VListBox2", "Agree"); $this->assertVisible('ctl0_body_ctl12'); $this->type("ctl0\$body\$TextBox", "test"); - $this->selectAndWait("ctl0\$body\$VListBox2", "label=Disagree"); + $this->selectAndWait("ctl0\$body\$VListBox2", "Disagree"); $this->assertNotVisible('ctl0_body_ctl12'); } } diff --git a/tests/FunctionalTests/quickstart/Controls/MultiViewTestCase.php b/tests/FunctionalTests/quickstart/Controls/MultiViewTestCase.php index 43e0ed8d..d7a5ebec 100755 --- a/tests/FunctionalTests/quickstart/Controls/MultiViewTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/MultiViewTestCase.php @@ -6,30 +6,30 @@ class QuickstartMultiViewTestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TMultiView.Home&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); // view 1 : type in a string $this->assertElementNotPresent('ctl0_body_Result1'); $this->assertElementNotPresent('ctl0_body_Result2'); $this->type('ctl0_body_Memo','test'); - $this->clickAndWait('ctl0$body$ctl0'); // view 2 to select the dropdown - $this->clickAndWait('ctl0$body$ctl4'); + $this->byName('ctl0$body$ctl0')->click(); // view 2 to select the dropdown + $this->byName('ctl0$body$ctl4')->click(); // view 3 : check if the output is updated - $this->assertTextPresent('Your text input is: test'); - $this->assertTextPresent('Your color choice is: Red'); - $this->clickAndWait('ctl0$body$ctl7'); + $this->assertContains('Your text input is: test', $this->source()); + $this->assertContains('Your color choice is: Red', $this->source()); + $this->byName('ctl0$body$ctl7')->click(); // view 2 : update dropdownlist $this->assertElementNotPresent('ctl0_body_Result1'); $this->assertElementNotPresent('ctl0_body_Result2'); - $this->select('ctl0$body$DropDownList', "label=Blue"); - $this->clickAndWait('ctl0$body$ctl4'); + $this->select('ctl0$body$DropDownList', "Blue"); + $this->byName('ctl0$body$ctl4')->click(); // view 3 : check if the output is updated - $this->assertTextPresent('Your text input is: test'); - $this->assertTextPresent('Your color choice is: Blue'); - $this->clickAndWait('ctl0$body$ctl7'); + $this->assertContains('Your text input is: test', $this->source()); + $this->assertContains('Your color choice is: Blue', $this->source()); + $this->byName('ctl0$body$ctl7')->click(); // view 2 : check if dropdownlist maintains state $this->assertSelected('ctl0$body$DropDownList', "Blue"); diff --git a/tests/FunctionalTests/quickstart/Controls/PagerTestCase.php b/tests/FunctionalTests/quickstart/Controls/PagerTestCase.php index ecbfe82d..7e4a6627 100755 --- a/tests/FunctionalTests/quickstart/Controls/PagerTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/PagerTestCase.php @@ -7,50 +7,50 @@ class QuickstartPagerTestCase extends PradoGenericSelenium2Test $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TPager.Sample1&notheme=true&lang=en"); // verify datalist content - $this->assertTextPresent('ITN001',''); - $this->assertTextPresent('ITN002',''); - $this->assertTextNotPresent('ITN003',''); + $this->assertContains('ITN001', $this->source()); + $this->assertContains('ITN002', $this->source()); + $this->assertNotContains('ITN003', $this->source()); // verify numeric paging - $this->clickAndWait("ctl0_body_Pager_ctl1", ""); // 2nd page - $this->assertTextPresent('ITN003',''); - $this->assertTextPresent('ITN004',''); - $this->assertTextNotPresent('ITN002',''); - $this->assertTextNotPresent('ITN005',''); - $this->clickAndWait("ctl0_body_Pager_ctl3", ""); // 4rd page - $this->assertTextPresent('ITN007',''); - $this->assertTextPresent('ITN008',''); - $this->assertTextNotPresent('ITN006',''); - $this->assertTextNotPresent('ITN009',''); - $this->clickAndWait("ctl0_body_Pager_ctl6", ""); // last page - $this->assertTextPresent('ITN019',''); - $this->assertTextNotPresent('ITN018',''); - $this->assertTextNotPresent('ITN001',''); + $this->byId("ctl0_body_Pager_ctl1")->click(); // 2nd page + $this->assertContains('ITN003', $this->source()); + $this->assertContains('ITN004', $this->source()); + $this->assertNotContains('ITN002', $this->source()); + $this->assertNotContains('ITN005', $this->source()); + $this->byId("ctl0_body_Pager_ctl3")->click(); // 4rd page + $this->assertContains('ITN007', $this->source()); + $this->assertContains('ITN008', $this->source()); + $this->assertNotContains('ITN006', $this->source()); + $this->assertNotContains('ITN009', $this->source()); + $this->byId("ctl0_body_Pager_ctl6")->click(); // last page + $this->assertContains('ITN019', $this->source()); + $this->assertNotContains('ITN018', $this->source()); + $this->assertNotContains('ITN001', $this->source()); // verify next-prev paging - $this->clickAndWait("ctl0_body_Pager2_ctl1", ""); // prev page - $this->assertTextPresent('ITN017',''); - $this->assertTextPresent('ITN018',''); - $this->assertTextNotPresent('ITN019',''); - $this->assertTextNotPresent('ITN016',''); - $this->clickAndWait("ctl0_body_Pager2_ctl0", ""); // first page - $this->assertTextPresent('ITN001',''); - $this->assertTextPresent('ITN002',''); - $this->assertTextNotPresent('ITN003',''); - $this->clickAndWait("ctl0_body_Pager2_ctl2", ""); // next page - $this->assertTextPresent('ITN003',''); - $this->assertTextPresent('ITN004',''); - $this->assertTextNotPresent('ITN002',''); - $this->assertTextNotPresent('ITN005',''); + $this->byId("ctl0_body_Pager2_ctl1")->click(); // prev page + $this->assertContains('ITN017', $this->source()); + $this->assertContains('ITN018', $this->source()); + $this->assertNotContains('ITN019', $this->source()); + $this->assertNotContains('ITN016', $this->source()); + $this->byId("ctl0_body_Pager2_ctl0")->click(); // first page + $this->assertContains('ITN001', $this->source()); + $this->assertContains('ITN002', $this->source()); + $this->assertNotContains('ITN003', $this->source()); + $this->byId("ctl0_body_Pager2_ctl2")->click(); // next page + $this->assertContains('ITN003', $this->source()); + $this->assertContains('ITN004', $this->source()); + $this->assertNotContains('ITN002', $this->source()); + $this->assertNotContains('ITN005', $this->source()); $this->assertSelected("ctl0_body_Pager3_ctl0","2"); - $this->selectAndWait("ctl0_body_Pager3_ctl0", "label=5"); - $this->assertTextPresent('ITN009',''); - $this->assertTextPresent('ITN010',''); - $this->assertTextNotPresent('ITN008',''); - $this->assertTextNotPresent('ITN011',''); - $this->selectAndWait("ctl0_body_Pager3_ctl0", "label=10"); - $this->assertTextPresent('ITN019',''); - $this->assertTextNotPresent('ITN018',''); + $this->selectAndWait("ctl0_body_Pager3_ctl0", "5"); + $this->assertContains('ITN009', $this->source()); + $this->assertContains('ITN010', $this->source()); + $this->assertNotContains('ITN008', $this->source()); + $this->assertNotContains('ITN011', $this->source()); + $this->selectAndWait("ctl0_body_Pager3_ctl0", "10"); + $this->assertContains('ITN019', $this->source()); + $this->assertNotContains('ITN018', $this->source()); } } diff --git a/tests/FunctionalTests/quickstart/Controls/PanelTestCase.php b/tests/FunctionalTests/quickstart/Controls/PanelTestCase.php index 1360ec2f..0d3e2797 100755 --- a/tests/FunctionalTests/quickstart/Controls/PanelTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/PanelTestCase.php @@ -5,12 +5,12 @@ class QuickstartPanelTestCase extends PradoGenericSelenium2Test function test () { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TPanel.Home&notheme=true&lang=en"); - $this->assertTextPresent("This is panel content with", ""); + $this->assertContains("This is panel content with", $this->source()); $this->assertElementPresent("//span[text()='label']"); - $this->assertTextPresent("grouping text", ""); - $this->click("//input[@name='ctl0\$body\$ctl17']", ""); - $this->assertTextNotPresent("You have clicked on 'button2'."); - $this->clickAndWait("//input[@type='submit' and @value='button2']", ""); - $this->assertTextPresent("You have clicked on 'button2'."); + $this->assertContains("grouping text", $this->source()); + $this->byXPath("//input[@name='ctl0\$body\$ctl17']")->click(); + $this->assertNotContains("You have clicked on 'button2'.", $this->source()); + $this->byXPath("//input[@type='submit' and @value='button2']")->click(); + $this->assertContains("You have clicked on 'button2'.", $this->source()); } } diff --git a/tests/FunctionalTests/quickstart/Controls/RadioButtonListTestCase.php b/tests/FunctionalTests/quickstart/Controls/RadioButtonListTestCase.php index a9092225..6242cebe 100755 --- a/tests/FunctionalTests/quickstart/Controls/RadioButtonListTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/RadioButtonListTestCase.php @@ -8,10 +8,10 @@ class QuickstartRadioButtonListTestCase extends PradoGenericSelenium2Test $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TRadioButtonList.Home&notheme=true&lang=en"); // RadioButton list with default settings: - $this->click("//input[@name='ctl0\$body\$ctl0' and @value='value 3']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl0' and @value='value 3']")->click(); // RadioButton list with customized cellpadding, cellspacing, color and text alignment: - $this->click("//input[@name='ctl0\$body\$ctl1' and @value='value 1']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl1' and @value='value 1']")->click(); // *** Currently unable to test the following cases: // RadioButton list with vertical (default) repeat direction @@ -20,33 +20,33 @@ class QuickstartRadioButtonListTestCase extends PradoGenericSelenium2Test // RadioButton list with flow layout and horizontal repeat direction: // RadioButton list's behavior upon postback - $this->click("//input[@name='ctl0\$body\$RadioButtonList' and @value='value 3']", ""); - $this->clickAndWait("//input[@type='submit' and @value='Submit']", ""); - $this->assertTextPresent("Your selection is: (Index: 2, Value: value 3, Text: item 3)", ""); + $this->byXPath("//input[@name='ctl0\$body\$RadioButtonList' and @value='value 3']")->click(); + $this->byXPath("//input[@type='submit' and @value='Submit']")->click(); + $this->assertContains("Your selection is: (Index: 2, Value: value 3, Text: item 3)", $this->source()); // Auto postback check box list - $this->clickAndWait("//input[@name='ctl0\$body\$ctl7' and @value='value 5']", ""); - $this->assertTextPresent("Your selection is: (Index: 4, Value: value 5, Text: item 5)", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl7' and @value='value 5']")->click(); + $this->assertContains("Your selection is: (Index: 4, Value: value 5, Text: item 5)", $this->source()); // Databind to an integer-indexed array - $this->clickAndWait("//input[@name='ctl0\$body\$DBRadioButtonList1' and @value='0']", ""); - $this->assertTextPresent("Your selection is: (Index: 0, Value: 0, Text: item 1)", ""); + $this->byXPath("//input[@name='ctl0\$body\$DBRadioButtonList1' and @value='0']")->click(); + $this->assertContains("Your selection is: (Index: 0, Value: 0, Text: item 1)", $this->source()); // Databind to an associative array: - $this->clickAndWait("//input[@name='ctl0\$body\$DBRadioButtonList2' and @value='key 2']", ""); - $this->assertTextPresent("Your selection is: (Index: 1, Value: key 2, Text: item 2)", ""); + $this->byXPath("//input[@name='ctl0\$body\$DBRadioButtonList2' and @value='key 2']")->click(); + $this->assertContains("Your selection is: (Index: 1, Value: key 2, Text: item 2)", $this->source()); // Databind with DataTextField and DataValueField specified - $this->clickAndWait("//input[@name='ctl0\$body\$DBRadioButtonList3' and @value='003']", ""); - $this->assertTextPresent("Your selection is: (Index: 2, Value: 003, Text: Cary)", ""); + $this->byXPath("//input[@name='ctl0\$body\$DBRadioButtonList3' and @value='003']")->click(); + $this->assertContains("Your selection is: (Index: 2, Value: 003, Text: Cary)", $this->source()); // RadioButton list causing validation $this->assertNotVisible('ctl0_body_ctl8'); - $this->click("//input[@name='ctl0\$body\$ctl9' and @value='Agree']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl9' and @value='Agree']")->click(); // $this->pause(1000); $this->assertVisible('ctl0_body_ctl8'); $this->type("ctl0\$body\$TextBox", "test"); - $this->clickAndWait("//input[@name='ctl0\$body\$ctl9' and @value='Disagree']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl9' and @value='Disagree']")->click(); $this->assertNotVisible('ctl0_body_ctl8'); } } diff --git a/tests/FunctionalTests/quickstart/Controls/RadioButtonTestCase.php b/tests/FunctionalTests/quickstart/Controls/RadioButtonTestCase.php index da58ce3a..214b1596 100755 --- a/tests/FunctionalTests/quickstart/Controls/RadioButtonTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/RadioButtonTestCase.php @@ -6,51 +6,51 @@ class QuickstartRadioButtonTestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TRadioButton.Home&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); // a regular radiobutton - $this->click("//input[@name='ctl0\$body\$ctl0' and @value='ctl0\$body\$ctl0']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl0' and @value='ctl0\$body\$ctl0']")->click(); // a radiobutton with customized value - $this->click("//input[@name='ctl0\$body\$ctl1' and @value='value']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl1' and @value='value']")->click(); // an auto postback radiobutton - $this->assertTextNotPresent("I'm clicked"); - $this->clickAndWait("//input[@name='ctl0\$body\$ctl2' and @value='ctl0\$body\$ctl2']", ""); - $this->assertTextPresent("I'm clicked"); - $this->click("//input[@name='ctl0\$body\$ctl2' and @value='ctl0\$body\$ctl2']", ""); - $this->assertTextPresent("I'm clicked"); + $this->assertNotContains("I'm clicked", $this->source()); + $this->byXPath("//input[@name='ctl0\$body\$ctl2' and @value='ctl0\$body\$ctl2']")->click(); + $this->assertContains("I'm clicked", $this->source()); + $this->byXPath("//input[@name='ctl0\$body\$ctl2' and @value='ctl0\$body\$ctl2']")->click(); + $this->assertContains("I'm clicked", $this->source()); // a radiobutton causing validation on a textbox $this->assertNotVisible('ctl0_body_ctl3'); - $this->click("//input[@name='ctl0\$body\$ctl4' and @value='ctl0\$body\$ctl4']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl4' and @value='ctl0\$body\$ctl4']")->click(); $this->pause(1000); $this->assertVisible('ctl0_body_ctl3'); - $this->click("//input[@name='ctl0\$body\$ctl4' and @value='ctl0\$body\$ctl4']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl4' and @value='ctl0\$body\$ctl4']")->click(); $this->pause(1000); $this->assertVisible('ctl0_body_ctl3'); $this->type("ctl0\$body\$TextBox", "test"); - $this->clickAndWait("//input[@name='ctl0\$body\$ctl4' and @value='ctl0\$body\$ctl4']", ""); + $this->byXPath("//input[@name='ctl0\$body\$ctl4' and @value='ctl0\$body\$ctl4']")->click(); $this->assertNotVisible('ctl0_body_ctl3'); // a radiobutton validated by a required field validator $this->assertNotVisible('ctl0_body_ctl6'); - $this->click("//input[@type='submit' and @value='Submit']", ""); + $this->byXPath("//input[@type='submit' and @value='Submit']")->click(); $this->pause(1000); $this->assertVisible('ctl0_body_ctl6'); - $this->click("//input[@name='ctl0\$body\$RadioButton' and @value='ctl0\$body\$RadioButton']", ""); - $this->clickAndWait("//input[@type='submit' and @value='Submit']", ""); + $this->byXPath("//input[@name='ctl0\$body\$RadioButton' and @value='ctl0\$body\$RadioButton']")->click(); + $this->byXPath("//input[@type='submit' and @value='Submit']")->click(); $this->assertNotVisible('ctl0_body_ctl6'); // a radiobutton group - $this->clickAndWait("name=ctl0\$body\$ctl7", ""); - $this->assertTextPresent("Your selection is empty"); - $this->click("//input[@name='ctl0\$body\$RadioGroup' and @value='ctl0\$body\$Radio2']", ""); - $this->clickAndWait("name=ctl0\$body\$ctl7", ""); - $this->assertTextPresent("Your selection is 2"); - $this->click("//input[@name='ctl0\$body\$RadioGroup' and @value='ctl0\$body\$Radio3']", ""); - $this->click("//input[@name='ctl0\$body\$Radio4' and @value='ctl0\$body\$Radio4']", ""); - $this->clickAndWait("name=ctl0\$body\$ctl7", ""); - $this->assertTextPresent("Your selection is 34"); + $this->byName("ctl0\$body\$ctl7")->click(); + $this->assertContains("Your selection is empty", $this->source()); + $this->byXPath("//input[@name='ctl0\$body\$RadioGroup' and @value='ctl0\$body\$Radio2']")->click(); + $this->byName("ctl0\$body\$ctl7")->click(); + $this->assertContains("Your selection is 2", $this->source()); + $this->byXPath("//input[@name='ctl0\$body\$RadioGroup' and @value='ctl0\$body\$Radio3']")->click(); + $this->byXPath("//input[@name='ctl0\$body\$Radio4' and @value='ctl0\$body\$Radio4']")->click(); + $this->byName("ctl0\$body\$ctl7")->click(); + $this->assertContains("Your selection is 34", $this->source()); } } diff --git a/tests/FunctionalTests/quickstart/Controls/Repeater1TestCase.php b/tests/FunctionalTests/quickstart/Controls/Repeater1TestCase.php index 983e3b65..4d7db9b3 100755 --- a/tests/FunctionalTests/quickstart/Controls/Repeater1TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/Repeater1TestCase.php @@ -7,18 +7,18 @@ class QuickstartRepeater1TestCase extends PradoGenericSelenium2Test $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TRepeater.Sample1&notheme=true&lang=en"); // verify if all required texts are present - $this->assertTextPresent('ID',''); - $this->assertTextPresent('Name',''); - $this->assertTextPresent('Quantity',''); - $this->assertTextPresent('Price',''); - $this->assertTextPresent('Imported',''); - $this->assertTextPresent('ITN001',''); - $this->assertTextPresent('Motherboard',''); - $this->assertTextPresent('Yes',''); - $this->assertTextPresent('ITN019',''); - $this->assertTextPresent('Speaker',''); - $this->assertTextPresent('No',''); - $this->assertTextPresent('Computer Parts Inventory',''); + $this->assertContains('ID', $this->source()); + $this->assertContains('Name', $this->source()); + $this->assertContains('Quantity', $this->source()); + $this->assertContains('Price', $this->source()); + $this->assertContains('Imported', $this->source()); + $this->assertContains('ITN001', $this->source()); + $this->assertContains('Motherboard', $this->source()); + $this->assertContains('Yes', $this->source()); + $this->assertContains('ITN019', $this->source()); + $this->assertContains('Speaker', $this->source()); + $this->assertContains('No', $this->source()); + $this->assertContains('Computer Parts Inventory', $this->source()); // verify specific table tags $this->assertElementPresent("//td[@colspan='5']"); diff --git a/tests/FunctionalTests/quickstart/Controls/Repeater2TestCase.php b/tests/FunctionalTests/quickstart/Controls/Repeater2TestCase.php index a36af297..8eb8c863 100755 --- a/tests/FunctionalTests/quickstart/Controls/Repeater2TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/Repeater2TestCase.php @@ -7,12 +7,12 @@ class QuickstartRepeater2TestCase extends PradoGenericSelenium2Test $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TRepeater.Sample2&notheme=true&lang=en"); // verify if all required texts are present - $this->assertTextPresent('North',''); - $this->assertTextPresent('John',''); - $this->assertTextPresent('Developer',''); - $this->assertTextPresent('South',''); - $this->assertTextPresent('Carter',''); - $this->assertTextPresent('Program Manager',''); + $this->assertContains('North', $this->source()); + $this->assertContains('John', $this->source()); + $this->assertContains('Developer', $this->source()); + $this->assertContains('South', $this->source()); + $this->assertContains('Carter', $this->source()); + $this->assertContains('Program Manager', $this->source()); // verify specific table tags $this->assertElementPresent("//table[@cellspacing='1']"); diff --git a/tests/FunctionalTests/quickstart/Controls/Repeater3TestCase.php b/tests/FunctionalTests/quickstart/Controls/Repeater3TestCase.php index 22a5ab71..3572a36f 100755 --- a/tests/FunctionalTests/quickstart/Controls/Repeater3TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/Repeater3TestCase.php @@ -9,21 +9,21 @@ class QuickstartRepeater3TestCase extends PradoGenericSelenium2Test // verify product name is required $this->assertNotVisible('ctl0_body_Repeater_ctl0_ctl0'); $this->type("ctl0_body_Repeater_ctl0_ProductName", ""); - $this->click("//input[@type='submit' and @value='Save']", ""); + $this->byXPath("//input[@type='submit' and @value='Save']")->click(); $this->assertVisible('ctl0_body_Repeater_ctl0_ctl0'); // verify product price is of proper format $this->assertNotVisible('ctl0_body_Repeater_ctl0_ctl1'); $this->type("ctl0_body_Repeater_ctl0_ProductPrice", "abc"); - $this->click("//input[@type='submit' and @value='Save']", ""); + $this->byXPath("//input[@type='submit' and @value='Save']")->click(); $this->assertVisible('ctl0_body_Repeater_ctl0_ctl1'); // perform postback - $this->click("ctl0_body_Repeater_ctl0_ProductImported",''); + $this->byId("ctl0_body_Repeater_ctl0_ProductImported",'')->click(); $this->type("ctl0_body_Repeater_ctl0_ProductName", "Mother Board"); $this->type("ctl0_body_Repeater_ctl0_ProductPrice", "99.01"); - $this->select("ctl0_body_Repeater_ctl3_ProductCategory", "label=Accessories"); - $this->clickAndWait("//input[@type='submit' and @value='Save']", ""); + $this->select("ctl0_body_Repeater_ctl3_ProductCategory", "Accessories"); + $this->byXPath("//input[@type='submit' and @value='Save']")->click(); $this->assertNotVisible('ctl0_body_Repeater_ctl0_ctl0'); $this->assertNotVisible('ctl0_body_Repeater_ctl0_ctl1'); diff --git a/tests/FunctionalTests/quickstart/Controls/StatementsTestCase.php b/tests/FunctionalTests/quickstart/Controls/StatementsTestCase.php index 4085b005..df0e6f89 100755 --- a/tests/FunctionalTests/quickstart/Controls/StatementsTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/StatementsTestCase.php @@ -6,8 +6,8 @@ class QuickstartStatementsTestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TStatements.Home&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); - $this->assertTextPresent('UniqueID is \'ctl0$body$ctl0\''); + $this->assertContains('UniqueID is \'ctl0$body$ctl0\'', $this->source()); } } diff --git a/tests/FunctionalTests/quickstart/Controls/TabPanelTestCase.php b/tests/FunctionalTests/quickstart/Controls/TabPanelTestCase.php index 3dc54ae2..13392ca5 100755 --- a/tests/FunctionalTests/quickstart/Controls/TabPanelTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/TabPanelTestCase.php @@ -6,7 +6,7 @@ class QuickstartTabPanelTestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TTabPanel.Home&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); // verify initial visibility $this->assertNotVisible('ctl0_body_View1'); // view 1 @@ -14,7 +14,7 @@ class QuickstartTabPanelTestCase extends PradoGenericSelenium2Test $this->assertNotVisible('ctl0_body_ctl2'); // view 3 // switching to the first view - $this->click('ctl0_body_View1_0'); + $this->byId('ctl0_body_View1_0')->click(); $this->pause(500); $this->assertVisible('ctl0_body_View1'); // view 1 $this->assertNotVisible('ctl0_body_View2'); // view 2 @@ -23,7 +23,7 @@ class QuickstartTabPanelTestCase extends PradoGenericSelenium2Test $this->assertVisible('ctl0_body_View21'); // view 21 // switching to View11 - $this->click('ctl0_body_View11_0'); + $this->byId('ctl0_body_View11_0')->click(); $this->pause(500); $this->assertVisible('ctl0_body_View1'); // view 1 $this->assertNotVisible('ctl0_body_View2'); // view 2 @@ -32,14 +32,14 @@ class QuickstartTabPanelTestCase extends PradoGenericSelenium2Test $this->assertNotVisible('ctl0_body_View21'); // view 21 // switching to the third view - $this->click('ctl0_body_ctl2_0'); + $this->byId('ctl0_body_ctl2_0')->click(); $this->pause(500); $this->assertNotVisible('ctl0_body_View1'); // view 1 $this->assertNotVisible('ctl0_body_View2'); // view 2 $this->assertVisible('ctl0_body_ctl2'); // view 3 // submit: check if the visibility is kept - $this->clickAndWait("//input[@type='submit' and @value='Submit']", ""); + $this->byXPath("//input[@type='submit' and @value='Submit']")->click(); $this->assertNotVisible('ctl0_body_View1'); // view 1 $this->assertNotVisible('ctl0_body_View2'); // view 2 $this->assertVisible('ctl0_body_ctl2'); // view 3 diff --git a/tests/FunctionalTests/quickstart/Controls/TextBoxTestCase.php b/tests/FunctionalTests/quickstart/Controls/TextBoxTestCase.php index 0f512d2c..52095321 100755 --- a/tests/FunctionalTests/quickstart/Controls/TextBoxTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/TextBoxTestCase.php @@ -6,27 +6,27 @@ class QuickstartTextBoxTestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TTextBox.Home&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); // a normal textbox $this->type("ctl0\$body\$ctl0", "test"); // textbox with maxlength set - $this->verifyAttribute("ctl0\$body\$ctl1@size","4"); - $this->verifyAttribute("ctl0\$body\$ctl1@maxlength","6"); + $this->assertAttribute("ctl0\$body\$ctl1@size","4"); + $this->assertAttribute("ctl0\$body\$ctl1@maxlength","6"); $this->type("ctl0\$body\$ctl1", "textte"); // vCard textboxes - $this->verifyAttribute("ctl0\$body\$ctl2@vcard_name","vCard.FirstName"); + $this->assertAttribute("ctl0\$body\$ctl2@vcard_name","vCard.FirstName"); $this->type("ctl0\$body\$ctl2", "first"); - $this->verifyAttribute("ctl0\$body\$ctl3@vcard_name","vCard.LastName"); + $this->assertAttribute("ctl0\$body\$ctl3@vcard_name","vCard.LastName"); $this->type("ctl0\$body\$ctl3", "last"); // a disabled textbox - $this->verifyAttribute("ctl0\$body\$ctl4@disabled","regexp:true|disabled"); + $this->assertAttribute("ctl0\$body\$ctl4@disabled","regexp:true|disabled"); // a read-only textbox - $this->verifyAttribute("ctl0\$body\$ctl5@readonly","regexp:true|readonly"); + $this->assertAttribute("ctl0\$body\$ctl5@readonly","regexp:true|readonly"); // auto postback textbox, CausesValidation=false $this->assertValue("ctl0\$body\$ctl6", "change me"); @@ -43,7 +43,7 @@ class QuickstartTextBoxTestCase extends PradoGenericSelenium2Test // submitting textbox with a button $this->type("ctl0\$body\$TextBox1", "texttext"); - $this->clickAndWait("//input[@type='submit' and @value='Submit']", ""); + $this->byXPath("//input[@type='submit' and @value='Submit']")->click(); $this->assertValue("ctl0\$body\$TextBox1", "You just entered 'texttext'."); // SafeText @@ -52,7 +52,7 @@ class QuickstartTextBoxTestCase extends PradoGenericSelenium2Test $this->assertText("ctl0_body_Output","malicious code"); // password - $this->verifyAttribute("ctl0\$body\$ctl9@type","password"); + $this->assertAttribute("ctl0\$body\$ctl9@type","password"); // ------------------multiline textbox---------------------- @@ -64,11 +64,11 @@ End of message "); // a disabled multiline textbox - $this->verifyAttribute("ctl0\$body\$ctl12@disabled","regexp:true|disabled"); + $this->assertAttribute("ctl0\$body\$ctl12@disabled","regexp:true|disabled"); // a read-only multiline textbox - $this->verifyAttribute("ctl0\$body\$ctl13@readonly","regexp:true|readonly"); - $this->verifyAttribute("ctl0\$body\$ctl13@wrap","off"); + $this->assertAttribute("ctl0\$body\$ctl13@readonly","regexp:true|readonly"); + $this->assertAttribute("ctl0\$body\$ctl13@wrap","off"); // auto postback textbox $this->assertValue("ctl0\$body\$ctl14", "change me"); diff --git a/tests/FunctionalTests/quickstart/Controls/Wizard1TestCase.php b/tests/FunctionalTests/quickstart/Controls/Wizard1TestCase.php index 49a92fb7..7ac55349 100755 --- a/tests/FunctionalTests/quickstart/Controls/Wizard1TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/Wizard1TestCase.php @@ -6,19 +6,19 @@ class QuickstartWizard1TestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample1&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); // step 1 - $this->assertTextPresent('Wizard Step 1'); - $this->assertTextNotPresent('Wizard Step 2'); + $this->assertContains('Wizard Step 1', $this->source()); + $this->assertNotContains('Wizard Step 2', $this->source()); $this->assertVisible('ctl0_body_Wizard1_SideBarList_ctl0_SideBarButton'); - $this->verifyAttribute('ctl0_body_Wizard1_SideBarList_ctl1_SideBarButton@disabled','regexp:true|disabled'); - $this->select('ctl0$body$Wizard1$DropDownList1', "label=Purple"); - $this->clickAndWait('ctl0$body$Wizard1$ctl6$ctl1'); + $this->assertAttribute('ctl0_body_Wizard1_SideBarList_ctl1_SideBarButton@disabled','regexp:true|disabled'); + $this->select('ctl0$body$Wizard1$DropDownList1', "Purple"); + $this->byName('ctl0$body$Wizard1$ctl6$ctl1')->click(); // step 2 - $this->assertTextPresent('Your favorite color is: Purple'); - $this->assertTextNotPresent('Wizard Step 1'); - $this->assertTextPresent('Wizard Step 2'); + $this->assertContains('Your favorite color is: Purple', $this->source()); + $this->assertNotContains('Wizard Step 1', $this->source()); + $this->assertContains('Wizard Step 2', $this->source()); } } diff --git a/tests/FunctionalTests/quickstart/Controls/Wizard2TestCase.php b/tests/FunctionalTests/quickstart/Controls/Wizard2TestCase.php index 23881968..85ef8655 100755 --- a/tests/FunctionalTests/quickstart/Controls/Wizard2TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/Wizard2TestCase.php @@ -6,19 +6,19 @@ class QuickstartWizard2TestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample2&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); // step 1 - $this->assertTextPresent('Please let us know your preference'); - $this->assertTextNotPresent('Thank you for your answer'); + $this->assertContains('Please let us know your preference', $this->source()); + $this->assertNotContains('Thank you for your answer', $this->source()); $this->assertVisible('ctl0_body_Wizard1_SideBarList_ctl0_SideBarButton'); - $this->verifyAttribute('ctl0_body_Wizard1_SideBarList_ctl1_SideBarButton@disabled','regexp:true|disabled'); - $this->select('ctl0$body$Wizard1$DropDownList1', "label=Blue"); - $this->clickAndWait('ctl0$body$Wizard1$ctl6$ctl1'); + $this->assertAttribute('ctl0_body_Wizard1_SideBarList_ctl1_SideBarButton@disabled','regexp:true|disabled'); + $this->select('ctl0$body$Wizard1$DropDownList1', "Blue"); + $this->byName('ctl0$body$Wizard1$ctl6$ctl1')->click(); // step 2 - $this->assertTextPresent('Your favorite color is: Blue'); - $this->assertTextNotPresent('Please let us know your preference'); - $this->assertTextPresent('Thank you for your answer'); + $this->assertContains('Your favorite color is: Blue', $this->source()); + $this->assertNotContains('Please let us know your preference', $this->source()); + $this->assertContains('Thank you for your answer', $this->source()); } } diff --git a/tests/FunctionalTests/quickstart/Controls/Wizard3TestCase.php b/tests/FunctionalTests/quickstart/Controls/Wizard3TestCase.php index d58ca4fe..2568f233 100755 --- a/tests/FunctionalTests/quickstart/Controls/Wizard3TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/Wizard3TestCase.php @@ -6,39 +6,39 @@ class QuickstartWizard3TestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample3&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); // step 1 - $this->assertTextPresent('A Mini Survey'); - $this->assertTextPresent('PRADO QuickStart Sample'); - $this->click('ctl0_body_Wizard3_StudentCheckBox'); - $this->clickAndWait('ctl0$body$Wizard3$ctl4$ctl0'); + $this->assertContains('A Mini Survey', $this->source()); + $this->assertContains('PRADO QuickStart Sample', $this->source()); + $this->byId('ctl0_body_Wizard3_StudentCheckBox')->click(); + $this->byName('ctl0$body$Wizard3$ctl4$ctl0')->click(); // step 2 - $this->select('ctl0$body$Wizard3$DropDownList11', "label=Chemistry"); - $this->clickAndWait('ctl0$body$Wizard3$ctl5$ctl1'); + $this->select('ctl0$body$Wizard3$DropDownList11', "Chemistry"); + $this->byName('ctl0$body$Wizard3$ctl5$ctl1')->click(); // step 3 - $this->select('ctl0$body$Wizard3$DropDownList22', "label=Tennis"); - $this->clickAndWait('ctl0$body$Wizard3$ctl6$ctl1'); + $this->select('ctl0$body$Wizard3$DropDownList22', "Tennis"); + $this->byName('ctl0$body$Wizard3$ctl6$ctl1')->click(); // step 4 - $this->assertTextPresent('You are a college student'); - $this->assertTextPresent('You are in major: Chemistry'); - $this->assertTextPresent('Your favorite sport is: Tennis'); + $this->assertContains('You are a college student', $this->source()); + $this->assertContains('You are in major: Chemistry', $this->source()); + $this->assertContains('Your favorite sport is: Tennis', $this->source()); // run the example again. this time we skip the page asking about major $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample3&notheme=true"); // step 1 - $this->clickAndWait('ctl0$body$Wizard3$ctl4$ctl0'); + $this->byName('ctl0$body$Wizard3$ctl4$ctl0')->click(); // step 3 - $this->select('ctl0$body$Wizard3$DropDownList22', "label=Baseball"); - $this->clickAndWait('ctl0$body$Wizard3$ctl6$ctl1'); + $this->select('ctl0$body$Wizard3$DropDownList22', "Baseball"); + $this->byName('ctl0$body$Wizard3$ctl6$ctl1')->click(); // step 4 - $this->assertTextNotPresent('You are a college student'); - $this->assertTextPresent('Your favorite sport is: Baseball'); + $this->assertNotContains('You are a college student', $this->source()); + $this->assertContains('Your favorite sport is: Baseball', $this->source()); } } diff --git a/tests/FunctionalTests/quickstart/Controls/Wizard4TestCase.php b/tests/FunctionalTests/quickstart/Controls/Wizard4TestCase.php index fa565abb..41d3463e 100755 --- a/tests/FunctionalTests/quickstart/Controls/Wizard4TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/Wizard4TestCase.php @@ -6,37 +6,37 @@ class QuickstartWizard4TestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample4&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); // step 1 - $this->assertTextPresent('Step 1 of 3'); - $this->select('ctl0_body_Wizard1_DropDownList1', "label=Cyan"); - $this->clickAndWait('ctl0_body_Wizard1_SideBarList_ctl2_SideBarButton'); + $this->assertContains('Step 1 of 3', $this->source()); + $this->select('ctl0_body_Wizard1_DropDownList1', "Cyan"); + $this->byId('ctl0_body_Wizard1_SideBarList_ctl2_SideBarButton')->click(); // step 3 - $this->assertTextPresent('Step 3 of 3'); - $this->assertTextPresent('Thank you for completing this survey.'); - $this->clickAndWait('ctl0_body_Wizard1_SideBarList_ctl0_SideBarButton'); + $this->assertContains('Step 3 of 3', $this->source()); + $this->assertContains('Thank you for completing this survey.', $this->source()); + $this->byId('ctl0_body_Wizard1_SideBarList_ctl0_SideBarButton')->click(); // step 1 $this->assertSelected('ctl0_body_Wizard1_DropDownList1', "Cyan"); - $this->select('ctl0_body_Wizard1_DropDownList1', "label=Black"); - $this->clickAndWait('ctl0_body_Wizard1_ctl4_ctl0'); + $this->select('ctl0_body_Wizard1_DropDownList1', "Black"); + $this->byId('ctl0_body_Wizard1_ctl4_ctl0')->click(); // step 2 - $this->assertTextPresent('Step 2 of 3'); - $this->assertTextPresent('Your favorite color is: Black'); - $this->clickAndWait('ctl0_body_Wizard1_ctl5_ctl0'); + $this->assertContains('Step 2 of 3', $this->source()); + $this->assertContains('Your favorite color is: Black', $this->source()); + $this->byId('ctl0_body_Wizard1_ctl5_ctl0')->click(); // step 1 - $this->assertTextPresent('Step 1 of 3'); + $this->assertContains('Step 1 of 3', $this->source()); $this->assertSelected('ctl0_body_Wizard1_DropDownList1', "Black"); - $this->clickAndWait('ctl0_body_Wizard1_ctl4_ctl0'); + $this->byId('ctl0_body_Wizard1_ctl4_ctl0')->click(); // step 2 - $this->clickAndWait('ctl0_body_Wizard1_ctl5_ctl1'); + $this->byId('ctl0_body_Wizard1_ctl5_ctl1')->click(); // step 3 - $this->assertTextPresent('Step 3 of 3'); + $this->assertContains('Step 3 of 3', $this->source()); } } diff --git a/tests/FunctionalTests/quickstart/Controls/Wizard5TestCase.php b/tests/FunctionalTests/quickstart/Controls/Wizard5TestCase.php index 8fbd59c5..4c41a074 100755 --- a/tests/FunctionalTests/quickstart/Controls/Wizard5TestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/Wizard5TestCase.php @@ -6,30 +6,30 @@ class QuickstartWizard5TestCase extends PradoGenericSelenium2Test { $this->url("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample5&notheme=true&lang=en"); - $this->verifyTitle("PRADO QuickStart Sample", ""); + $this->assertEquals("PRADO QuickStart Sample", $this->title()); // step 1 - $this->assertTextPresent('Please let us know your preference'); + $this->assertContains('Please let us know your preference', $this->source()); $this->assertVisible('ctl0_body_Wizard1_SideBarList_ctl0_SideBarButton'); $this->assertVisible('ctl0_body_Wizard1_SideBarList_ctl1_SideBarButton'); - $this->verifyAttribute('ctl0_body_Wizard1_SideBarList_ctl2_SideBarButton@disabled','regexp:true|disabled'); - $this->select('ctl0_body_Wizard1_DropDownList1', "label=Cyan"); - $this->clickAndWait('ctl0$body$Wizard1$ctl4$ctl0'); + $this->assertAttribute('ctl0_body_Wizard1_SideBarList_ctl2_SideBarButton@disabled','regexp:true|disabled'); + $this->select('ctl0_body_Wizard1_DropDownList1', "Cyan"); + $this->byName('ctl0$body$Wizard1$ctl4$ctl0')->click(); // step 2 - $this->select('ctl0_body_Wizard1_Step2_DropDownList2','label=Football'); - $this->clickAndWait('ctl0$body$Wizard1$ctl6$ctl0'); + $this->select('ctl0_body_Wizard1_Step2_DropDownList2','Football'); + $this->byName('ctl0$body$Wizard1$ctl6$ctl0')->click(); // step 1 $this->assertSelected('ctl0_body_Wizard1_DropDownList1','Cyan'); - $this->clickAndWait('ctl0_body_Wizard1_SideBarList_ctl1_SideBarButton'); + $this->byId('ctl0_body_Wizard1_SideBarList_ctl1_SideBarButton')->click(); // step 2 $this->assertSelected('ctl0_body_Wizard1_Step2_DropDownList2','Football'); - $this->clickAndWait('ctl0$body$Wizard1$ctl6$ctl1'); + $this->byName('ctl0$body$Wizard1$ctl6$ctl1')->click(); // step 3 - $this->assertTextPresent('Your favorite color is: Cyan'); - $this->assertTextPresent('Your favorite sport is: Football'); + $this->assertContains('Your favorite color is: Cyan', $this->source()); + $this->assertContains('Your favorite sport is: Football', $this->source()); } } diff --git a/tests/FunctionalTests/quickstart/Fundamentals/HangmanTestCase.php b/tests/FunctionalTests/quickstart/Fundamentals/HangmanTestCase.php index 7cf34d30..8f5557ca 100755 --- a/tests/FunctionalTests/quickstart/Fundamentals/HangmanTestCase.php +++ b/tests/FunctionalTests/quickstart/Fundamentals/HangmanTestCase.php @@ -5,28 +5,28 @@ class QuickstartHangmanTestCase extends PradoGenericSelenium2Test function test () { $this->url("../../demos/quickstart/index.php?page=Fundamentals.Samples.Hangman.Home&notheme=true&lang=en"); - $this->verifyTitle("Hangman Game", ""); - $this->assertTextPresent("Medium game; you are allowed 5 misses.", ""); - $this->clickAndWait("//input[@type='submit' and @value='Play!']", ""); - $this->assertTextPresent("You must choose a difficulty level", ""); - $this->clickAndWait("//input[@type='submit' and @value='Play!']", ""); - $this->click("//input[@name='ctl0\$body\$LevelSelection' and @value='3']", ""); - $this->clickAndWait("//input[@type='submit' and @value='Play!']", ""); - $this->assertTextPresent("Please make a guess", ""); - $this->assertTextPresent("maximum of 3", ""); - $this->clickAndWait("link=B", ""); - $this->clickAndWait("link=F", ""); - $this->clickAndWait("link=Give up?", ""); - $this->assertTextPresent("You Lose", ""); - $this->clickAndWait("link=Start Again", ""); - $this->clickAndWait("//input[@type='submit' and @value='Play!']", ""); - $this->assertTextPresent("Please make a guess", ""); - $this->assertTextPresent("maximum of 3", ""); - $this->clickAndWait("link=Give up?", ""); - $this->assertTextPresent("You Lose", ""); - $this->clickAndWait("link=Start Again", ""); - $this->click("//input[@name='ctl0\$body\$LevelSelection' and @value='5']", ""); - $this->clickAndWait("//input[@type='submit' and @value='Play!']", ""); - $this->assertTextPresent("maximum of 5", ""); + $this->assertEquals("Hangman Game", $this->title()); + $this->assertContains("Medium game; you are allowed 5 misses.", $this->source()); + $this->byXPath("//input[@type='submit' and @value='Play!']")->click(); + $this->assertContains("You must choose a difficulty level", $this->source()); + $this->byXPath("//input[@type='submit' and @value='Play!']")->click(); + $this->byXPath("//input[@name='ctl0\$body\$LevelSelection' and @value='3']")->click(); + $this->byXPath("//input[@type='submit' and @value='Play!']")->click(); + $this->assertContains("Please make a guess", $this->source()); + $this->assertContains("maximum of 3", $this->source()); + $this->byLinkText("B")->click(); + $this->byLinkText("F")->click(); + $this->byLinkText("Give up?")->click(); + $this->assertContains("You Lose", $this->source()); + $this->byLinkText("Start Again")->click(); + $this->byXPath("//input[@type='submit' and @value='Play!']")->click(); + $this->assertContains("Please make a guess", $this->source()); + $this->assertContains("maximum of 3", $this->source()); + $this->byLinkText("Give up?")->click(); + $this->assertContains("You Lose", $this->source()); + $this->byLinkText("Start Again")->click(); + $this->byXPath("//input[@name='ctl0\$body\$LevelSelection' and @value='5']")->click(); + $this->byXPath("//input[@type='submit' and @value='Play!']")->click(); + $this->assertContains("maximum of 5", $this->source()); } } diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket703/Ticket703.php b/tests/FunctionalTests/tickets/protected/pages/Ticket703/Ticket703.php index adf71837..f254cf6d 100755 --- a/tests/FunctionalTests/tickets/protected/pages/Ticket703/Ticket703.php +++ b/tests/FunctionalTests/tickets/protected/pages/Ticket703/Ticket703.php @@ -6,24 +6,24 @@ class Ticket703 extends TPage { parent::onLoad($param); if (!$this->isPostBack && !$this->isCallback) { - $this->refreshLog(); + $this->clearLog(null, null); } } - + public function refreshLog () { $this->logBox->Text=file_get_contents(prado::getPathOfNameSpace('Ticket703.Logs.LogFile', '.txt')); } - + public function clearLog ($sender, $param) { $file=prado::getPathOfNameSpace('Ticket703.Logs.LogFile', '.txt'); file_put_contents($file, ''); $this->refreshLog(); } - + public function addLog($sender,$param) { - prado::log($this->logMessage->getText(), TLogger::DEBUG, "Tickets"); + prado::log($this->logMessage->getText(), TLogger::DEBUG, "Tickets"); } } \ No newline at end of file diff --git a/tests/FunctionalTests/tickets/tests/Issue120TestCase.php b/tests/FunctionalTests/tickets/tests/Issue120TestCase.php index 8587415e..0c6945ba 100755 --- a/tests/FunctionalTests/tickets/tests/Issue120TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Issue120TestCase.php @@ -5,12 +5,12 @@ class Issue120TestCase extends PradoGenericSelenium2Test function test() { $this->url('tickets/index.php?page=Issue120'); - $this->assertTextPresent('TActiveDropDownList PromptValue Test'); + $this->assertContains('TActiveDropDownList PromptValue Test', $this->source()); $this->assertSelectedIndex("ctl0_Content_ddl1", 0); $this->assertSelectedValue("ctl0_Content_ddl1", 'PromptValue'); - $this->click("ctl0_Content_btn1"); + $this->byId("ctl0_Content_btn1")->click(); $this->pause(800); $this->assertSelectedIndex("ctl0_Content_ddl1", 0); diff --git a/tests/FunctionalTests/tickets/tests/Issue216TestCase.php b/tests/FunctionalTests/tickets/tests/Issue216TestCase.php index bb1daa6b..d71db0e1 100755 --- a/tests/FunctionalTests/tickets/tests/Issue216TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Issue216TestCase.php @@ -5,21 +5,21 @@ class Issue216TestCase extends PradoGenericSelenium2Test function test() { $this->url('tickets/index.php?page=Issue216'); - $this->assertTextPresent('TTabPanel doesn\'t preserve active tab on callback request'); + $this->assertContains('TTabPanel doesn\'t preserve active tab on callback request', $this->source()); $this->assertVisible('ctl0_Content_tab1'); - $this->click("ctl0_Content_btn1"); + $this->byId("ctl0_Content_btn1")->click(); $this->pause(800); $this->assertText("ctl0_Content_result", "Tab ActiveIndex is : 0"); - $this->click("ctl0_Content_tab2_0"); + $this->byId("ctl0_Content_tab2_0")->click(); $this->pause(800); $this->assertVisible('ctl0_Content_tab2'); - $this->click("ctl0_Content_btn1"); + $this->byId("ctl0_Content_btn1")->click(); $this->pause(800); $this->assertText("ctl0_Content_result", "Tab ActiveIndex is : 1"); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket121TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket121TestCase.php index 3fea580a..547ffb38 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket121TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket121TestCase.php @@ -7,11 +7,11 @@ class Ticket121TestCase extends PradoGenericSelenium2Test $this->url('tickets/index.php?page=Ticket121'); $this->type("ctl0\$Content\$FooTextBox", ""); $this->assertNotVisible('ctl0_Content_ctl1'); - $this->click("//input[@type='image' and @id='ctl0_Content_ctl0']", ""); + $this->byXPath("//input[@type='image' and @id='ctl0_Content_ctl0']")->click(); $this->assertVisible('ctl0_Content_ctl1'); $this->type("ctl0\$Content\$FooTextBox", "content"); - $this->clickAndWait("//input[@type='image' and @id='ctl0_Content_ctl0']", ""); + $this->byXPath("//input[@type='image' and @id='ctl0_Content_ctl0']")->click(); $this->assertNotVisible('ctl0_Content_ctl1'); - $this->assertTextPresent("clicked at", ""); + $this->assertContains("clicked at", $this->source()); } } diff --git a/tests/FunctionalTests/tickets/tests/Ticket163TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket163TestCase.php index ffd95d86..20d9c645 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket163TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket163TestCase.php @@ -5,8 +5,8 @@ class Ticket163TestCase extends PradoGenericSelenium2Test function test() { $this->url('tickets/index.php?page=Ticket163'); - $this->assertTextPresent('kr 100,00'); - $this->assertTextPresent('kr 0,00'); - $this->assertTextPresent('-kr 100,00'); + $this->assertContains('kr 100,00', $this->source()); + $this->assertContains('kr 0,00', $this->source()); + $this->assertContains('-kr 100,00', $this->source()); } } diff --git a/tests/FunctionalTests/tickets/tests/Ticket169TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket169TestCase.php index a9c006f9..47bb380b 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket169TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket169TestCase.php @@ -6,7 +6,7 @@ class Ticket169TestCase extends PradoGenericSelenium2Test { $this->url('tickets/index.php?page=Ticket169'); $this->assertNotVisible('ctl0_Content_validator1'); - $this->click('ctl0_Content_ctl0'); + $this->byId('ctl0_Content_ctl0')->click(); $this->assertVisible('ctl0_Content_validator1'); } } diff --git a/tests/FunctionalTests/tickets/tests/Ticket191TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket191TestCase.php index 2b2b1a41..c0bccaa9 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket191TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket191TestCase.php @@ -6,9 +6,9 @@ class Ticket191TestCase extends PradoGenericSelenium2Test { $this->url('tickets/index.php?page=Ticket191'); $this->type("ctl0\$Content\$TextBox2", "test"); - $this->clickAndWait("name=ctl0\$Content\$ctl0"); + $this->byName("ctl0\$Content\$ctl0")->click(); $this->type("ctl0\$Content\$TextBox", "test"); - $this->clickAndWait("name=ctl0\$Content\$ctl1"); + $this->byName("ctl0\$Content\$ctl1")->click(); $this->assertNotVisible('ctl0_Content_ctl2'); } } diff --git a/tests/FunctionalTests/tickets/tests/Ticket205TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket205TestCase.php index 53761d14..57b0c95b 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket205TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket205TestCase.php @@ -10,12 +10,15 @@ class Ticket205TestCase extends PradoGenericSelenium2Test $this->assertNotVisible("{$base}validator1"); $this->type("{$base}textbox1", "test"); - $this->click("{$base}button1"); - $this->assertAlert("error"); + $this->byId("{$base}button1")->click(); + + $this->assertEquals("error", $this->alertText()); + $this->acceptAlert(); + $this->assertVisible("{$base}validator1"); $this->type("{$base}textbox1", "Prado"); - $this->clickAndWait("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->assertNotVisible("{$base}validator1"); } } diff --git a/tests/FunctionalTests/tickets/tests/Ticket207TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket207TestCase.php index f7cbe814..cc993192 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket207TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket207TestCase.php @@ -10,8 +10,11 @@ class Ticket207TestCase extends PradoGenericSelenium2Test $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); - $this->click("{$base}button1"); - $this->assertAlert('error on text1 fired'); + $this->byId("{$base}button1")->click(); + + $this->assertEquals('error on text1 fired', $this->alertText()); + $this->acceptAlert(); + $this->assertVisible("{$base}validator1"); $this->assertVisible("{$base}validator2"); @@ -19,7 +22,7 @@ class Ticket207TestCase extends PradoGenericSelenium2Test $this->assertVisible("{$base}validator1"); $this->assertVisible("{$base}validator2"); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->assertNotVisible("{$base}validator1"); $this->assertVisible("{$base}validator2"); @@ -27,8 +30,11 @@ class Ticket207TestCase extends PradoGenericSelenium2Test $this->assertNotVisible("{$base}validator1"); $this->assertVisible("{$base}validator2"); - $this->click("{$base}button1"); - $this->assertAlert('error on text1 fired'); + $this->byId("{$base}button1")->click(); + + $this->assertEquals('error on text1 fired', $this->alertText()); + $this->acceptAlert(); + $this->assertVisible("{$base}validator1"); $this->assertVisible("{$base}validator2"); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket21TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket21TestCase.php index 7a245111..b9a0f0c9 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket21TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket21TestCase.php @@ -6,9 +6,9 @@ class Ticket21TestCase extends PradoGenericSelenium2Test { $this->url('tickets/index.php?page=Ticket21'); $this->assertEquals($this->title(), "Verifying Ticket 21"); - $this->clickAndWait("ctl0_Content_button1"); - $this->assertTextPresent("Radio button clicks: 1", ""); - $this->click("ctl0_Content_button1"); - $this->assertTextPresent("Radio button clicks: 1", ""); + $this->byId("ctl0_Content_button1")->click(); + $this->assertContains("Radio button clicks: 1", $this->source()); + $this->byId("ctl0_Content_button1")->click(); + $this->assertContains("Radio button clicks: 1", $this->source()); } } diff --git a/tests/FunctionalTests/tickets/tests/Ticket220TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket220TestCase.php index a508e7e4..0ef67933 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket220TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket220TestCase.php @@ -6,10 +6,10 @@ class Ticket220TestCase extends PradoGenericSelenium2Test { $base="ctl0_Content_"; $this->url('tickets/index.php?page=Ticket220'); - $this->assertTextPresent('ClientScript Test'); + $this->assertContains('ClientScript Test', $this->source()); $this->assertText("{$base}label1", "Label 1"); - $this->click("button1"); + $this->byId("button1")->click(); $this->assertText("{$base}label1", 'Label 1: ok; ok 3?; ok 2!'); $this->assertAlertNotPresent(); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket225TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket225TestCase.php index d17a9555..74ad6505 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket225TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket225TestCase.php @@ -6,15 +6,15 @@ class Ticket225TestCase extends PradoGenericSelenium2Test { $base="ctl0_Content_"; $this->url('tickets/index.php?page=Ticket225'); - $this->assertTextPresent('RadioButton Group Tests'); + $this->assertContains('RadioButton Group Tests', $this->source()); $this->assertText("{$base}label1", "Label 1"); $this->assertNotVisible("{$base}validator1"); - $this->click("{$base}button4"); + $this->byId("{$base}button4")->click(); $this->assertVisible("{$base}validator1"); - $this->click("{$base}button2"); - $this->clickAndWait("{$base}button4"); + $this->byId("{$base}button2")->click(); + $this->byId("{$base}button4")->click(); $this->assertText("{$base}label1", 'ctl0$Content$button1 ctl0$Content$button2 ctl0$Content$button3'); $this->assertNotVisible("{$base}validator1"); diff --git a/tests/FunctionalTests/tickets/tests/Ticket239TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket239TestCase.php index 6f5f0ed9..e5595a13 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket239TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket239TestCase.php @@ -7,47 +7,47 @@ class Ticket239TestCase extends PradoGenericSelenium2Test $this->url('tickets/index.php?page=Ticket239'); // view1 - $this->assertTextPresent('view1 is activated',''); - $this->assertTextNotPresent('view1 is deactivated',''); - $this->assertTextNotPresent('view2 is activated',''); - $this->assertTextNotPresent('view2 is deactivated',''); - $this->assertTextNotPresent('view3 is activated',''); - $this->assertTextNotPresent('view3 is deactivated',''); + $this->assertContains('view1 is activated', $this->source()); + $this->assertNotContains('view1 is deactivated', $this->source()); + $this->assertNotContains('view2 is activated', $this->source()); + $this->assertNotContains('view2 is deactivated', $this->source()); + $this->assertNotContains('view3 is activated', $this->source()); + $this->assertNotContains('view3 is deactivated', $this->source()); // goto view2 - $this->clickAndWait('name=ctl0$Content$ctl1'); - $this->assertTextNotPresent('view1 is activated',''); - $this->assertTextPresent('view1 is deactivated',''); - $this->assertTextPresent('view2 is activated',''); - $this->assertTextNotPresent('view2 is deactivated',''); - $this->assertTextNotPresent('view3 is activated',''); - $this->assertTextNotPresent('view3 is deactivated',''); + $this->byName('ctl0$Content$ctl1')->click(); + $this->assertNotContains('view1 is activated', $this->source()); + $this->assertContains('view1 is deactivated', $this->source()); + $this->assertContains('view2 is activated', $this->source()); + $this->assertNotContains('view2 is deactivated', $this->source()); + $this->assertNotContains('view3 is activated', $this->source()); + $this->assertNotContains('view3 is deactivated', $this->source()); // goto view3 - $this->clickAndWait('name=ctl0$Content$ctl3'); - $this->assertTextNotPresent('view1 is activated',''); - $this->assertTextNotPresent('view1 is deactivated',''); - $this->assertTextNotPresent('view2 is activated',''); - $this->assertTextPresent('view2 is deactivated',''); - $this->assertTextPresent('view3 is activated',''); - $this->assertTextNotPresent('view3 is deactivated',''); + $this->byName('ctl0$Content$ctl3')->click(); + $this->assertNotContains('view1 is activated', $this->source()); + $this->assertNotContains('view1 is deactivated', $this->source()); + $this->assertNotContains('view2 is activated', $this->source()); + $this->assertContains('view2 is deactivated', $this->source()); + $this->assertContains('view3 is activated', $this->source()); + $this->assertNotContains('view3 is deactivated', $this->source()); // goto view2 - $this->clickAndWait('name=ctl0$Content$ctl4'); - $this->assertTextNotPresent('view1 is activated',''); - $this->assertTextNotPresent('view1 is deactivated',''); - $this->assertTextPresent('view2 is activated',''); - $this->assertTextNotPresent('view2 is deactivated',''); - $this->assertTextNotPresent('view3 is activated',''); - $this->assertTextPresent('view3 is deactivated',''); + $this->byName('ctl0$Content$ctl4')->click(); + $this->assertNotContains('view1 is activated', $this->source()); + $this->assertNotContains('view1 is deactivated', $this->source()); + $this->assertContains('view2 is activated', $this->source()); + $this->assertNotContains('view2 is deactivated', $this->source()); + $this->assertNotContains('view3 is activated', $this->source()); + $this->assertContains('view3 is deactivated', $this->source()); // goto view1 - $this->clickAndWait('name=ctl0$Content$ctl2'); - $this->assertTextPresent('view1 is activated',''); - $this->assertTextNotPresent('view1 is deactivated',''); - $this->assertTextNotPresent('view2 is activated',''); - $this->assertTextPresent('view2 is deactivated',''); - $this->assertTextNotPresent('view3 is activated',''); - $this->assertTextNotPresent('view3 is deactivated',''); + $this->byName('ctl0$Content$ctl2')->click(); + $this->assertContains('view1 is activated', $this->source()); + $this->assertNotContains('view1 is deactivated', $this->source()); + $this->assertNotContains('view2 is activated', $this->source()); + $this->assertContains('view2 is deactivated', $this->source()); + $this->assertNotContains('view3 is activated', $this->source()); + $this->assertNotContains('view3 is deactivated', $this->source()); } } diff --git a/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php index 6da15a47..ebb60ca9 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php @@ -10,12 +10,12 @@ class Ticket274TestCase extends PradoGenericSelenium2Test $this->assertNotVisible($base.'validator1'); $this->assertNotVisible($base.'validator2'); - $this->clickAndWait($base.'button1'); + $this->byId($base.'button1')->click(); $this->assertVisible($base.'validator1'); $this->assertNotVisible($base.'validator2'); $this->type($base.'MyDate', 'asd'); - $this->clickAndWait($base.'button1'); + $this->byId($base.'button1')->click(); $this->assertNotVisible($base.'validator1'); $this->assertVisible($base.'validator2'); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket278TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket278TestCase.php index 2b1d4c09..ca11f626 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket278TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket278TestCase.php @@ -11,18 +11,18 @@ class Ticket278TestCase extends PradoGenericSelenium2Test $this->assertNotVisible($base.'validator2'); $this->assertNotVisible($base.'panel1'); - $this->click($base.'button1'); + $this->byId($base.'button1')->click(); $this->assertVisible($base.'validator1'); $this->assertNotVisible($base.'validator2'); $this->type($base.'text1', 'asd'); - $this->clickAndWait($base.'button1'); + $this->byId($base.'button1')->click(); $this->assertNotVisible($base.'validator1'); $this->assertNotVisible($base.'validator2'); $this->assertNotVisible($base.'panel1'); - $this->click($base.'check1'); - $this->click($base.'button1'); + $this->byId($base.'check1')->click(); + $this->byId($base.'button1')->click(); $this->assertNotVisible($base.'validator1'); $this->assertVisible($base.'validator2'); $this->assertVisible($base.'panel1'); @@ -30,21 +30,21 @@ class Ticket278TestCase extends PradoGenericSelenium2Test $this->type($base.'text1', ''); $this->type($base.'text2', 'asd'); - $this->click($base.'button1'); + $this->byId($base.'button1')->click(); $this->assertVisible($base.'validator1'); $this->assertNotVisible($base.'validator2'); $this->assertVisible($base.'panel1'); $this->type($base.'text1', 'asd'); - $this->clickAndWait($base.'button1'); + $this->byId($base.'button1')->click(); $this->assertNotVisible($base.'validator1'); $this->assertNotVisible($base.'validator2'); $this->assertVisible($base.'panel1'); $this->type($base.'text1', ''); $this->type($base.'text2', ''); - $this->click($base.'button1'); + $this->byId($base.'button1')->click(); $this->assertVisible($base.'validator1'); $this->assertVisible($base.'validator2'); $this->assertVisible($base.'panel1'); diff --git a/tests/FunctionalTests/tickets/tests/Ticket27TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket27TestCase.php index a57d83a6..bc478895 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket27TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket27TestCase.php @@ -5,12 +5,12 @@ class Ticket27TestCase extends PradoGenericSelenium2Test function test() { $this->url('tickets/index.php?page=Ticket27'); - $this->verifyTitle("Verifying Ticket 27", ""); - $this->click("//input[@value='Agree']", ""); - $this->assertVisible("ctl0_Content_validator1", ""); + $this->assertEquals("Verifying Ticket 27", $this->title()); + $this->byXPath("//input[@value='Agree']")->click(); + $this->assertVisible("ctl0_Content_validator1"); $this->type("ctl0_Content_TextBox", "122"); - $this->assertNotVisible("ctl0_Content_validator1", ""); - $this->clickAndWait("//input[@value='Disagree']", ""); - $this->assertNotVisible("ctl0_Content_validator1", ""); + $this->assertNotVisible("ctl0_Content_validator1"); + $this->byXPath("//input[@value='Disagree']")->click(); + $this->assertNotVisible("ctl0_Content_validator1"); } } diff --git a/tests/FunctionalTests/tickets/tests/Ticket284TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket284TestCase.php index 08c0338c..b4a32c19 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket284TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket284TestCase.php @@ -5,8 +5,8 @@ class Ticket284TestCase extends PradoGenericSelenium2Test function test() { $this->url('tickets/index.php?page=Ticket284'); - $this->assertTextPresent('Verifying Ticket 284'); - $this->click('ctl0_Content_ctl1'); + $this->assertContains('Verifying Ticket 284', $this->source()); + $this->byId('ctl0_Content_ctl1')->click(); } } diff --git a/tests/FunctionalTests/tickets/tests/Ticket285TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket285TestCase.php index 76f1c271..04a451df 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket285TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket285TestCase.php @@ -5,7 +5,7 @@ class Ticket285TestCase extends PradoGenericSelenium2Test function test() { $this->url('tickets/index.php?page=Ticket285'); - $this->assertTextPresent('350.00'); - $this->assertTextPresent('349.99'); + $this->assertContains('350.00', $this->source()); + $this->assertContains('349.99', $this->source()); } } \ No newline at end of file diff --git a/tests/FunctionalTests/tickets/tests/Ticket28TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket28TestCase.php index c0364ce6..92bf1eb9 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket28TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket28TestCase.php @@ -6,8 +6,8 @@ class Ticket28TestCase extends PradoGenericSelenium2Test function test() { $this->url('tickets/index.php?page=Ticket28'); - $this->assertTextPresent('Label 1'); - $this->clickAndWait('link=Click Me'); - $this->assertTextPresent('Link Button 1 Clicked!'); + $this->assertContains('Label 1', $this->source()); + $this->byLinkText("Click Me")->click(); + $this->assertContains('Link Button 1 Clicked!', $this->source()); } } diff --git a/tests/FunctionalTests/tickets/tests/Ticket290TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket290TestCase.php index 0dc95e87..8116e753 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket290TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket290TestCase.php @@ -16,7 +16,7 @@ class Ticket290TestCase extends PradoGenericSelenium2Test $this->type("{$base}textbox1", "test"); - $this->click("{$base}textbox1"); + $this->byId("{$base}textbox1")->click(); $this->keys(PHPUnit_Extensions_Selenium2TestCase_Keys::ENTER); $this->pause(800); diff --git a/tests/FunctionalTests/tickets/tests/Ticket433TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket433TestCase.php index b1f7ed00..aae4ee21 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket433TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket433TestCase.php @@ -9,7 +9,7 @@ class Ticket433TestCase extends PradoGenericSelenium2Test $this->assertEquals($this->title(), "Verifying Ticket 433"); $this->assertText("{$base}VoteClick", "BEFORE click"); - $this->click("{$base}VoteClick"); + $this->byId("{$base}VoteClick")->click(); $this->pause(800); $this->assertText("{$base}VoteClick", "AFTER click CALLBACK DONE"); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket439TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket439TestCase.php index e7991cd6..f586a6c9 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket439TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket439TestCase.php @@ -7,7 +7,7 @@ class Ticket439TestCase extends PradoGenericSelenium2Test $base = 'ctl0_Content_'; $this->url('tickets/index.php?page=Ticket439'); $this->assertEquals($this->title(), "Verifying Ticket 439"); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertEquals($this->title(), "Verifying Home"); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket463TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket463TestCase.php index 1901ae50..14f00970 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket463TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket463TestCase.php @@ -5,7 +5,7 @@ class Ticket463TestCase extends PradoGenericSelenium2Test function test() { $this->url('tickets/index.php?page=Ticket463'); - $this->verifyTitle("Verifying Ticket 463", ""); - $this->assertTextPresent('May 1, 2005 12:00:00 AM'); + $this->assertEquals("Verifying Ticket 463", $this->title()); + $this->assertContains('May 1, 2005 12:00:00 AM', $this->source()); } } diff --git a/tests/FunctionalTests/tickets/tests/Ticket470TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket470TestCase.php index 6c40927a..a3e25e85 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket470TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket470TestCase.php @@ -6,26 +6,26 @@ class Ticket470TestCase extends PradoGenericSelenium2Test { $base = 'ctl0_Content_'; $this->url('tickets/index.php?page=Ticket470'); - $this->verifyTitle("Verifying Ticket 470"); + $this->assertEquals("Verifying Ticket 470", $this->title()); $this->assertText("{$base}counter", "0"); $this->assertText("{$base}Results", ""); $this->assertNotVisible("{$base}validator1"); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertText("{$base}counter", "0"); $this->assertText("{$base}Results", ""); $this->assertVisible("{$base}validator1"); $this->type("{$base}TextBox", "hello"); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertText("{$base}counter", "0"); $this->assertText("{$base}Results", "OK!!!"); $this->assertNotVisible("{$base}validator1"); //reload - $this->click("{$base}reloadButton"); + $this->byId("{$base}reloadButton")->click(); $this->pause(800); $this->assertValue("{$base}TextBox", "hello"); $this->assertText("{$base}counter", "1"); @@ -33,14 +33,14 @@ class Ticket470TestCase extends PradoGenericSelenium2Test $this->assertNotVisible("{$base}validator1"); $this->type("{$base}TextBox", ""); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertText("{$base}counter", "1"); $this->assertText("{$base}Results", ""); $this->assertVisible("{$base}validator1"); $this->type("{$base}TextBox", "test"); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertText("{$base}counter", "1"); $this->assertText("{$base}Results", "OK!!!"); diff --git a/tests/FunctionalTests/tickets/tests/Ticket477TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket477TestCase.php index 13f2740a..7f9bc58c 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket477TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket477TestCase.php @@ -10,12 +10,12 @@ class Ticket477TestCase extends PradoGenericSelenium2Test $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); - $this->clickAndWait("{$base}list1_c1"); + $this->byId("{$base}list1_c1")->click(); $this->assertVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); - $this->clickAndWait("{$base}list2_c1"); + $this->byId("{$base}list2_c1")->click(); $this->assertNotVisible("{$base}validator1"); $this->assertVisible("{$base}validator2"); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket488TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket488TestCase.php index 7940338f..e4b72aaf 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket488TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket488TestCase.php @@ -6,14 +6,14 @@ class Ticket488TestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url('active-controls/index.php?page=CustomValidatorByPass'); - $this->assertTextPresent('Custom Login'); + $this->assertContains('Custom Login', $this->source()); $this->assertNotVisible('loginBox'); - $this->click("showLogin"); + $this->byId("showLogin")->click(); $this->assertVisible("loginBox"); $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); - $this->click("{$base}checkLogin"); + $this->byId("{$base}checkLogin")->click(); $this->pause(800); $this->assertVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); @@ -21,13 +21,13 @@ class Ticket488TestCase extends PradoGenericSelenium2Test $this->type("{$base}Username", 'tea'); $this->type("{$base}Password", 'mmama'); - $this->click("{$base}checkLogin"); + $this->byId("{$base}checkLogin")->click(); $this->pause(800); $this->assertNotVisible("{$base}validator1"); $this->assertVisible("{$base}validator2"); $this->type("{$base}Password", 'test'); - $this->click("{$base}checkLogin"); + $this->byId("{$base}checkLogin")->click(); $this->pause(800); $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); diff --git a/tests/FunctionalTests/tickets/tests/Ticket504TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket504TestCase.php index 7ffa7428..f3bdd0a9 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket504TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket504TestCase.php @@ -6,7 +6,7 @@ class Ticket504TestCase extends PradoGenericSelenium2Test { $base = 'ctl0_Content_'; $this->url('tickets/index.php?page=Ticket504'); - $this->verifyTitle("Verifying Ticket 504", ""); + $this->assertEquals("Verifying Ticket 504", $this->title()); $this->assertText("status", ""); @@ -15,7 +15,7 @@ class Ticket504TestCase extends PradoGenericSelenium2Test $this->assertVisible("{$base}panelC"); $this->assertVisible("{$base}panelD"); - $this->click("{$base}linka"); + $this->byId("{$base}linka")->click(); $this->pause(800); $this->assertVisible("{$base}panelA"); $this->assertNotVisible("{$base}panelB"); @@ -23,7 +23,7 @@ class Ticket504TestCase extends PradoGenericSelenium2Test $this->assertNotVisible("{$base}panelD"); $this->assertText("status", "panelA updated"); - $this->click("{$base}linkb"); + $this->byId("{$base}linkb")->click(); $this->pause(800); $this->assertNotVisible("{$base}panelA"); $this->assertVisible("{$base}panelB"); @@ -31,7 +31,7 @@ class Ticket504TestCase extends PradoGenericSelenium2Test $this->assertNotVisible("{$base}panelD"); $this->assertText("status", "panelB updated"); - $this->click("{$base}linkc"); + $this->byId("{$base}linkc")->click(); $this->pause(800); $this->assertNotVisible("{$base}panelA"); $this->assertNotVisible("{$base}panelB"); @@ -39,7 +39,7 @@ class Ticket504TestCase extends PradoGenericSelenium2Test $this->assertNotVisible("{$base}panelD"); $this->assertText("status", "panelC updated"); - $this->click("{$base}linkd"); + $this->byId("{$base}linkd")->click(); $this->pause(800); $this->assertNotVisible("{$base}panelA"); $this->assertNotVisible("{$base}panelB"); diff --git a/tests/FunctionalTests/tickets/tests/Ticket507TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket507TestCase.php index 0b90749b..68c94b03 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket507TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket507TestCase.php @@ -6,11 +6,11 @@ class Ticket507TestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url('tickets/index.php?page=Ticket507'); - $this->verifyTitle("Verifying Ticket 507", ""); + $this->assertEquals("Verifying Ticket 507", $this->title()); $this->assertText("{$base}label1", "Label 1"); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->select("{$base}list1", "item 1"); diff --git a/tests/FunctionalTests/tickets/tests/Ticket521TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket521TestCase.php index dfc81a3d..71457b58 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket521TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket521TestCase.php @@ -9,7 +9,7 @@ class Ticket521TestCase extends PradoGenericSelenium2Test $this->assertEquals($this->title(), "Verifying Ticket 521"); $this->assertText("{$base}label1", "Label 1"); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(1200); $this->assertText("{$base}label1", "Button 1 was clicked on callback"); diff --git a/tests/FunctionalTests/tickets/tests/Ticket526TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket526TestCase.php index 6a7ee693..c8659002 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket526TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket526TestCase.php @@ -6,11 +6,11 @@ class Ticket526TestCase extends PradoGenericSelenium2Test { $base="ctl0_Content_"; $this->url('tickets/index.php?page=Ticket526'); - $this->verifyTitle("Verifying Ticket 526", ""); + $this->assertEquals("Verifying Ticket 526", $this->title()); $this->assertElementNotPresent("{$base}dpbutton"); - $this->click("{$base}btn"); + $this->byId("{$base}btn")->click(); $this->pause(800); $this->assertElementPresent("{$base}dpbutton"); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket535TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket535TestCase.php index 6634ed93..eebd2336 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket535TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket535TestCase.php @@ -10,23 +10,23 @@ class Ticket535TestCase extends PradoGenericSelenium2Test $this->assertText("{$base}label1", "Label 1"); - $this->click("{$base}radio1"); - $this->click("{$base}button1"); + $this->byId("{$base}radio1")->click(); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertText("{$base}label1", 'radio1 checked:{1} radio2 checked:{}'); - $this->click("{$base}radio2"); - $this->click("{$base}button1"); + $this->byId("{$base}radio2")->click(); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertText("{$base}label1", 'radio1 checked:{1} radio2 checked:{1}'); - $this->click("{$base}bad_radio1"); - $this->click("{$base}button2"); + $this->byId("{$base}bad_radio1")->click(); + $this->byId("{$base}button2")->click(); $this->pause(800); $this->assertText("{$base}label1", 'bad_radio1 checked:{1} bad_radio2 checked:{}'); - $this->click("{$base}bad_radio2"); - $this->click("{$base}button2"); + $this->byId("{$base}bad_radio2")->click(); + $this->byId("{$base}button2")->click(); $this->pause(800); $this->assertText("{$base}label1", 'bad_radio1 checked:{} bad_radio2 checked:{1}'); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket538TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket538TestCase.php index edec5750..2970837f 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket538TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket538TestCase.php @@ -6,12 +6,12 @@ class Ticket538TestCase extends PradoGenericSelenium2Test { $base="ctl0_Content_"; $this->url('tickets/index.php?page=Ticket538'); - $this->verifyTitle("Verifying Ticket 538", ""); + $this->assertEquals("Verifying Ticket 538", $this->title()); $this->assertText("{$base}ALLog", 'waiting for response...'); $this->select("{$base}DataViewer", "empty :("); - $this->click("{$base}selectBtn"); + $this->byId("{$base}selectBtn")->click(); $this->pause(800); $this->assertText("{$base}ALLog", '0,'); @@ -21,7 +21,7 @@ class Ticket538TestCase extends PradoGenericSelenium2Test $this->select("{$base}DataViewer", "G1: Steven=>10"); $this->addSelection("{$base}DataViewer", "G2: Kevin=>65"); - $this->click("{$base}selectBtn"); + $this->byId("{$base}selectBtn")->click(); $this->pause(800); $this->assertText("{$base}ALLog", '4- "test1", 10- "test2",'); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket54TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket54TestCase.php index 86923010..cf1433b6 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket54TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket54TestCase.php @@ -5,6 +5,6 @@ class Ticket54TestCase extends PradoGenericSelenium2Test function test() { $this->url('tickets/index.php?page=Ticket54'); - $this->assertTextPresent("|A|a|B|b|C|", ""); + $this->assertContains("|A|a|B|b|C|", $this->source()); } } diff --git a/tests/FunctionalTests/tickets/tests/Ticket573TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket573TestCase.php index 1f9461be..cccdbaf3 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket573TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket573TestCase.php @@ -5,7 +5,7 @@ class Ticket573TestCase extends PradoGenericSelenium2Test function test() { $this->url('tickets/index.php?page=Ticket573'); - $this->verifyTitle("Verifying Ticket 573", ""); + $this->assertEquals("Verifying Ticket 573", $this->title()); $this->assertText('test1', '10.00'); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket578TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket578TestCase.php index ae0c991b..3adb107c 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket578TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket578TestCase.php @@ -6,16 +6,16 @@ class Ticket578TestCase extends PradoGenericSelenium2Test { $base = 'ctl0_Content_'; $this->url('tickets/index.php?page=Ticket578'); - $this->verifyTitle("Verifying Ticket 578", ""); + $this->assertEquals("Verifying Ticket 578", $this->title()); $this->assertText("{$base}label1", "Label 1"); - $this->click("{$base}button1", ""); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertText("{$base}label1", "Button 1 was clicked :"); $text="helloworld"; $this->runScript("tinyMCE.get('{$base}text1').setContent('{$text}')"); - $this->click("{$base}button1", ""); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertText("{$base}label1", "Button 1 was clicked :

    {$text}

    "); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket585TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket585TestCase.php index 5a9dd8d4..58b42c33 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket585TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket585TestCase.php @@ -6,18 +6,18 @@ class Ticket585TestCase extends PradoGenericSelenium2Test { $base = 'ctl0_Content_'; $this->url('tickets/index.php?page=Ticket585'); - $this->verifyTitle("Verifying Ticket 585", ""); + $this->assertEquals("Verifying Ticket 585", $this->title()); $this->assertText("error", ""); $this->assertNotVisible("{$base}validator1"); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertText("error", "Success"); $this->assertNotVisible("{$base}validator1"); $this->type("{$base}test", "15-03-2007"); - $this->click("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertText("error", "Error"); $this->assertVisible("{$base}validator1"); diff --git a/tests/FunctionalTests/tickets/tests/Ticket586TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket586TestCase.php index 50efd50a..5fd47f86 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket586TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket586TestCase.php @@ -6,10 +6,10 @@ class Ticket586TestCase extends PradoGenericSelenium2Test { $base = 'ctl0_Content_'; $this->url('tickets/index.php?page=Ticket586'); - $this->verifyTitle("Verifying Ticket 586", ""); + $this->assertEquals("Verifying Ticket 586", $this->title()); $this->assertText("{$base}label1", "Status"); - $this->clickAndWait("{$base}button1"); + $this->byId("{$base}button1")->click(); $this->assertText("{$base}label1", "Button 1 Clicked!"); $this->type("{$base}text1", "testing"); diff --git a/tests/FunctionalTests/tickets/tests/Ticket587TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket587TestCase.php index 2956ecae..aa81a55e 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket587TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket587TestCase.php @@ -36,7 +36,7 @@ class Ticket587TestCase extends PradoGenericSelenium2Test $this->pause(800); $this->assertText($base."label1", "Selection 2: value 3 - item 4"); - $this->click($base.'button6'); + $this->byId($base.'button6')->click(); $this->pause(800); $this->select($base."list2", "asd 3 - item 2"); $this->pause(800); diff --git a/tests/FunctionalTests/tickets/tests/Ticket592TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket592TestCase.php index 14467952..692e2451 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket592TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket592TestCase.php @@ -10,33 +10,33 @@ class Ticket592TestCase extends PradoGenericSelenium2Test $this->assertText("{$base}label1", "Label 1"); - $this->click("{$base}radio1"); - $this->click("{$base}button1"); + $this->byId("{$base}radio1")->click(); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertText("{$base}label1", 'radio1 checked:{1} radio2 checked:{}'); - $this->click("{$base}radio2"); - $this->click("{$base}button1"); + $this->byId("{$base}radio2")->click(); + $this->byId("{$base}button1")->click(); $this->pause(800); $this->assertText("{$base}label1", 'radio1 checked:{1} radio2 checked:{1}'); - $this->click("{$base}bad_radio1"); - $this->click("{$base}button2"); + $this->byId("{$base}bad_radio1")->click(); + $this->byId("{$base}button2")->click(); $this->pause(800); $this->assertText("{$base}label1", 'bad_radio1 checked:{1} bad_radio2 checked:{}'); - $this->click("{$base}bad_radio2"); - $this->click("{$base}button2"); + $this->byId("{$base}bad_radio2")->click(); + $this->byId("{$base}button2")->click(); $this->pause(800); $this->assertText("{$base}label1", 'bad_radio1 checked:{} bad_radio2 checked:{1}'); - $this->click("{$base}bad_radio3"); - $this->click("{$base}button3"); + $this->byId("{$base}bad_radio3")->click(); + $this->byId("{$base}button3")->click(); $this->pause(800); $this->assertText("{$base}label1", 'bad_radio3 checked:{1} bad_radio4 checked:{}'); - $this->click("{$base}bad_radio4"); - $this->click("{$base}button3"); + $this->byId("{$base}bad_radio4")->click(); + $this->byId("{$base}button3")->click(); $this->pause(800); $this->assertText("{$base}label1", 'bad_radio3 checked:{} bad_radio4 checked:{1}'); diff --git a/tests/FunctionalTests/tickets/tests/Ticket595TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket595TestCase.php index 0781b506..27d57a91 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket595TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket595TestCase.php @@ -8,30 +8,30 @@ class Ticket595TestCase extends PradoGenericSelenium2Test $this->url('tickets/index.php?page=Ticket595'); $this->assertEquals($this->title(), "Verifying Ticket 595"); - $this->click($base.'ctl2'); - $this->verifyAttribute($base.'A@class','errorclassA'); + $this->byId($base.'ctl2')->click(); + $this->assertAttribute($base.'A@class','errorclassA'); $this->type($base.'A', 'Prado'); - $this->click($base.'ctl2'); - $this->verifyAttribute($base.'A@class','errorclassA'); + $this->byId($base.'ctl2')->click(); + $this->assertAttribute($base.'A@class','errorclassA'); $this->type($base.'A', 'test@pradosoft.com'); - $this->click($base.'ctl2'); + $this->byId($base.'ctl2')->click(); $this->pause(800); - $this->verifyAttribute($base.'A@class',''); + $this->assertAttribute($base.'A@class',''); - $this->click($base.'ctl5'); + $this->byId($base.'ctl5')->click(); $this->pause(800); - $this->verifyAttribute($base.'B@class',' errorclassB'); + $this->assertAttribute($base.'B@class',' errorclassB'); $this->type($base.'B', 'Prado'); - $this->click($base.'ctl5'); + $this->byId($base.'ctl5')->click(); $this->pause(800); - $this->verifyAttribute($base.'B@class',' errorclassB'); + $this->assertAttribute($base.'B@class',' errorclassB'); $this->type($base.'B', 'test@pradosoft.com'); - $this->click($base.'ctl5'); + $this->byId($base.'ctl5')->click(); $this->pause(800); - $this->verifyAttribute($base.'B@class',''); + $this->assertAttribute($base.'B@class',''); } } diff --git a/tests/FunctionalTests/tickets/tests/Ticket622TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket622TestCase.php index e26da1f1..672a1d18 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket622TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket622TestCase.php @@ -8,10 +8,10 @@ class Ticket622TestCase extends PradoGenericSelenium2Test $this->url('tickets/index.php?page=Ticket622'); $this->assertEquals($this->title(), "Verifying Ticket 622"); - $this->click($base.'ctl0'); + $this->byId($base.'ctl0')->click(); $this->pause(800); - $this->verifyAttribute($base.'ALB@style',''); - $this->verifyAttribute('css=span#acb span@style', ''); - $this->verifyAttribute('css=span#arb span@style', ''); + $this->assertAttribute($base.'ALB@style',''); + $this->assertAttribute('css=span#acb span@style', ''); + $this->assertAttribute('css=span#arb span@style', ''); } } diff --git a/tests/FunctionalTests/tickets/tests/Ticket653TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket653TestCase.php index fbf569bb..09987387 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket653TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket653TestCase.php @@ -6,7 +6,7 @@ class Ticket653TestCase extends PradoGenericSelenium2Test { // Open with 'Friendly URL' $this->url('tickets/index.php/ticket653'); - $this->verifyTitle("Verifying Ticket 653", ""); + $this->assertEquals("Verifying Ticket 653", $this->title()); $this->assertText('textspan', 'This is the page for Ticket653'); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket656TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket656TestCase.php index af0c8f02..174b096b 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket656TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket656TestCase.php @@ -8,7 +8,7 @@ class Ticket656TestCase extends PradoGenericSelenium2Test $this->assertEquals($this->title(), "Verifying Ticket 656"); // First test, current date - $this->click($base."btnUpdate"); + $this->byId($base."btnUpdate")->click(); $this->pause(800); $this->assertText($base."lblStatus",date("d-m-Y")); @@ -17,7 +17,7 @@ class Ticket656TestCase extends PradoGenericSelenium2Test $this->select($base."datePicker_day",20); $this->select($base."datePicker_month", 10); $this->select($base."datePicker_year", $year); - $this->click($base."btnUpdate"); + $this->byId($base."btnUpdate")->click(); $this->pause(800); $this->assertText($base."lblStatus",date("d-m-Y", mktime(0,0,0,10,20,$year))); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket659TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket659TestCase.php index bb1a021d..d5d73bc8 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket659TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket659TestCase.php @@ -8,13 +8,13 @@ class Ticket659TestCase extends PradoGenericSelenium2Test // Normal component (working) $this->url('tickets/index.php?page=ToggleTest'); $this->assertText("${base}lbl", "Down"); - $this->click("${base}btn", ""); + $this->byId("${base}btn")->click(); $this->pause(800); $this->assertText("${base}lbl", "Up"); // Extended component (not working) $this->url('tickets/index.php?page=Ticket659'); $this->assertText("${base}lbl", "Down"); - $this->click("${base}btn", ""); + $this->byId("${base}btn")->click(); $this->pause(800); $this->assertText("${base}lbl", "Up"); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket660TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket660TestCase.php index f77e5fac..86f03442 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket660TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket660TestCase.php @@ -7,18 +7,18 @@ class Ticket660TestCase extends PradoGenericSelenium2Test $this->url('tickets/index.php?page=Ticket660'); $this->assertEquals($this->title(), "Verifying Ticket 660"); - $this->click($base.'PB'); + $this->byId($base.'PB')->click(); $this->pause(800); $this->assertText($base.'A','ÄÖÜ äöü'); $this->type($base.'T', 'äää'); - $this->click($base.'PB'); + $this->byId($base.'PB')->click(); $this->pause(800); $this->assertText($base.'A','äääÄÖÜ äöü'); /* // CALLBACK CURRENTLY CAN'T WORK ON NON-UTF8 strings $this->type($base.'T', 'ööö'); - $this->click($base.'CB'); + $this->byId($base.'CB')->click(); $this->pause(800); $this->assertText($base.'A','öööÄÖÜ äöü'); */ diff --git a/tests/FunctionalTests/tickets/tests/Ticket669TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket669TestCase.php index 6afb1072..8b5a0166 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket669TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket669TestCase.php @@ -7,36 +7,36 @@ class Ticket669TestCase extends PradoGenericSelenium2Test $this->url('tickets/index.php?page=Ticket669'); $this->assertEquals($this->title(), "Verifying Ticket 669"); - $this->assertTextPresent('1 - Test without callback'); + $this->assertContains('1 - Test without callback', $this->source()); $this->assertValue($base.'tb1', 'ActiveTextBox'); $this->assertValue($base.'tb2', 'TextBox in ActivePanel'); - $this->click($base.'ctl4'); + $this->byId($base.'ctl4')->click(); $this->pause(800); $this->assertValue($base.'tb1', 'ActiveTextBox +1'); $this->assertValue($base.'tb2', 'TextBox in ActivePanel +1'); - $this->click($base.'ctl1'); + $this->byId($base.'ctl1')->click(); $this->pause(800); - $this->assertTextPresent('2 - Test callback with 2nd ActivePanel'); + $this->assertContains('2 - Test callback with 2nd ActivePanel', $this->source()); $this->assertValue($base.'tb3', 'ActiveTextBox'); $this->assertValue($base.'tb4', 'TextBox in ActivePanel'); $this->assertValue($base.'tb5', 'TextBox in ActivePanel'); - $this->click($base.'ctl6'); + $this->byId($base.'ctl6')->click(); $this->pause(800); $this->assertValue($base.'tb3', 'ActiveTextBox +1'); $this->assertValue($base.'tb4', 'TextBox in ActivePanel +1'); $this->assertValue($base.'tb5', 'TextBox in ActivePanel +1'); - $this->click($base.'ctl2'); + $this->byId($base.'ctl2')->click(); $this->pause(800); - $this->assertTextPresent('3 - Test callback without 2nd ActivePanel'); + $this->assertContains('3 - Test callback without 2nd ActivePanel', $this->source()); $this->assertValue($base.'tb6', 'ActiveTextBox'); $this->assertValue($base.'tb7', 'TextBox in Panel'); - $this->click($base.'ctl8'); + $this->byId($base.'ctl8')->click(); $this->pause(800); $this->assertValue($base.'tb6', 'ActiveTextBox +1'); diff --git a/tests/FunctionalTests/tickets/tests/Ticket670TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket670TestCase.php index f0387746..a88b689c 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket670TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket670TestCase.php @@ -10,9 +10,9 @@ class Ticket670TestCase extends PradoGenericSelenium2Test $this->type($base."datePicker", '07-07-2003'); $this->pause(800); //$this->assertText($base."datePicker",'07-07-2003'); - $this->click($base."datePickerbutton"); + $this->byId($base."datePickerbutton")->click(); $this->pause(800); - $this->click($base."ok"); + $this->byId($base."ok")->click(); $this->pause(800); $this->assertText($base."lbl",'07-07-2007'); diff --git a/tests/FunctionalTests/tickets/tests/Ticket671TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket671TestCase.php index 53330ca4..4e6409af 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket671TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket671TestCase.php @@ -9,7 +9,7 @@ class Ticket671TestCase extends PradoGenericSelenium2Test $this->assertNotVisible($base.'ctl0'); // Click submit - $this->click($base.'ctl1'); + $this->byId($base.'ctl1')->click(); $this->pause(800); $this->assertText($base.'ctl0', 'Please Select Test 3'); $this->assertVisible($base.'ctl0'); @@ -21,18 +21,18 @@ class Ticket671TestCase extends PradoGenericSelenium2Test $this->pause(800); $this->assertNotVisible($base.'ctl0'); $this->assertText($base."lblResult", "You have selected 'Test 3'."); - $this->click($base.'ctl1'); + $this->byId($base.'ctl1')->click(); $this->pause(800); $this->assertText($base."lblResult", "You have successfully validated the form"); $this->type($base.'testTextBox', 'test'); $this->pause(800); - $this->click($base.'ctl3'); + $this->byId($base.'ctl3')->click(); $this->pause(800); $this->assertVisible($base.'ctl2'); $this->type($base.'testTextBox',"Prado"); $this->pause(800); - $this->click($base.'ctl3'); + $this->byId($base.'ctl3')->click(); $this->pause(800); $this->assertNotVisible($base.'ctl2'); $this->assertText($base.'lblResult2', 'Thanks !'); diff --git a/tests/FunctionalTests/tickets/tests/Ticket671_reopenedTestCase.php b/tests/FunctionalTests/tickets/tests/Ticket671_reopenedTestCase.php index 02201075..a3394bca 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket671_reopenedTestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket671_reopenedTestCase.php @@ -9,27 +9,27 @@ class Ticket671_reopenedTestCase extends PradoGenericSelenium2Test $this->assertEquals($this->title(), "Verifying Ticket 671_reopened"); // Type wrong value $this->type($base.'testField', 'abcd'); - $this->click($base.'ctl4'); + $this->byId($base.'ctl4')->click(); $this->pause(800); $this->assertVisible($base.'ctl2'); $this->assertText($base.'Result', 'Check callback called (1) --- Save callback called DATA NOK'); // Reclick, should not have any callback - $this->click($base.'ctl4'); + $this->byId($base.'ctl4')->click(); $this->pause(800); $this->assertVisible($base.'ctl2'); $this->assertText($base.'Result', 'Check callback called (2) --- Save callback called DATA NOK'); // Type right value $this->type($base.'testField', 'Test'); - $this->click($base.'ctl4'); + $this->byId($base.'ctl4')->click(); $this->pause(800); $this->assertNotVisible($base.'ctl2'); $this->assertText($base.'Result', 'Check callback called (3) --- Save callback called DATA OK'); // Type empty value $this->type($base.'testField', ''); - $this->click($base.'ctl4'); + $this->byId($base.'ctl4')->click(); $this->pause(800); $this->assertVisible($base.'ctl1'); $this->assertNotVisible($base.'ctl2'); @@ -37,7 +37,7 @@ class Ticket671_reopenedTestCase extends PradoGenericSelenium2Test // Type right value $this->type($base.'testField', 'Test'); - $this->click($base.'ctl4'); + $this->byId($base.'ctl4')->click(); $this->pause(800); $this->assertNotVisible($base.'ctl1'); $this->assertNotVisible($base.'ctl2'); diff --git a/tests/FunctionalTests/tickets/tests/Ticket679TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket679TestCase.php index af957fa3..2891a386 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket679TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket679TestCase.php @@ -8,7 +8,7 @@ class Ticket679TestCase extends PradoGenericSelenium2Test $this->assertEquals($this->title(), "Verifying Ticket 679"); // First part of ticket : Repeater bug - $this->click($base."ctl0"); + $this->byId($base."ctl0")->click(); $this->pause(800); $this->assertText($base."myLabel",'outside'); $this->assertVisible($base."myLabel"); @@ -17,19 +17,19 @@ class Ticket679TestCase extends PradoGenericSelenium2Test $this->refresh(); $this->pause(800); - $this->click($base."Repeater_ctl0_ctl0"); + $this->byId($base."Repeater_ctl0_ctl0")->click(); $this->pause(800); $this->assertText($base."myLabel",'inside'); $this->assertVisible($base."myLabel"); // Second part of ticket : ARB bug - $this->assertNotChecked($base."myRadioButton"); - $this->click($base."ctl1"); + $this->assertFalse($this->byId("{$base}myRadioButton")->selected()); + $this->byId($base."ctl1")->click(); $this->pause(800); - $this->assertChecked($base."myRadioButton"); - $this->click($base."ctl2"); + $this->assertTrue($this->byId("{$base}myRadioButton")->selected()); + $this->byId($base."ctl2")->click(); $this->pause(800); - $this->assertNotChecked($base."myRadioButton"); + $this->assertFalse($this->byId("{$base}myRadioButton")->selected()); $this->pause(800); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket691TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket691TestCase.php index ae6cd7d3..d014f2f4 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket691TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket691TestCase.php @@ -7,7 +7,7 @@ class Ticket691TestCase extends PradoGenericSelenium2Test $this->url('tickets/index.php?page=Ticket691'); $this->assertEquals($this->title(), "Verifying Ticket 691"); - $this->click("//input[@id='{$base}List_c2']/../.."); + $this->byXPath("//input[@id='{$base}List_c2']/../..")->click(); $this->pause(800); $this->assertText("{$base}Title", "Thanks"); $this->assertText("{$base}Result", "You vote 3"); diff --git a/tests/FunctionalTests/tickets/tests/Ticket698TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket698TestCase.php index 5c8c46aa..8aa9cb4e 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket698TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket698TestCase.php @@ -7,11 +7,11 @@ class Ticket698TestCase extends PradoGenericSelenium2Test $this->url('tickets/index.php?page=Ticket698'); $this->assertEquals($this->title(), "Verifying Ticket 698"); - $this->click($base."switchContentTypeButton"); + $this->byId($base."switchContentTypeButton")->click(); $this->pause(800); $this->assertVisible($base."EditHtmlTextBox"); $this->pause(800); - $this->click($base."switchContentTypeButton"); + $this->byId($base."switchContentTypeButton")->click(); $this->pause(1000); $this->assertNotVisible($base."EditHtmlTextBox"); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket700TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket700TestCase.php index d14823bf..d10529ce 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket700TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket700TestCase.php @@ -5,67 +5,67 @@ class Ticket700TestCase extends PradoGenericSelenium2Test { // page: Home $this->url('tickets/index700.php'); - $this->clickAndWait('ctl0_Logout'); - $this->clickAndWait('pageHome'); + $this->byId('ctl0_Logout')->click(); + $this->byId('pageHome')->click(); $this->assertEquals($this->title(), "Home"); - $this->assertTextPresent('|Param1: Set at app config|'); - $this->assertTextPresent('|Param2: Set at root|'); - $this->assertTextPresent('|Param3: default 3|'); - $this->assertTextPresent('|Param4: default 4|'); - $this->assertTextPresent('|Param5: Set at root|'); + $this->assertContains('|Param1: Set at app config|', $this->source()); + $this->assertContains('|Param2: Set at root|', $this->source()); + $this->assertContains('|Param3: default 3|', $this->source()); + $this->assertContains('|Param4: default 4|', $this->source()); + $this->assertContains('|Param5: Set at root|', $this->source()); // page: admin.Home - $this->clickAndWait('pageAdminHome'); + $this->byId('pageAdminHome')->click(); $this->assertEquals($this->title(), 'UserLogin'); $this->type('ctl0_Main_Username','AdminUser'); $this->type('ctl0_Main_Password','demo'); - $this->clickAndWait('ctl0_Main_LoginButton'); - $this->clickAndWait('pageAdminHome'); + $this->byId('ctl0_Main_LoginButton')->click(); + $this->byId('pageAdminHome')->click(); $this->assertEquals($this->title(), 'admin.Home'); - $this->assertTextPresent('|Param1: Set at app config|'); - $this->assertTextPresent('|Param2: Set at admin|'); - $this->assertTextPresent('|Param3: Set at admin|'); - $this->assertTextPresent('|Param4: Set at app config|'); - $this->assertTextPresent('|Param5: Set at app config|'); + $this->assertContains('|Param1: Set at app config|', $this->source()); + $this->assertContains('|Param2: Set at admin|', $this->source()); + $this->assertContains('|Param3: Set at admin|', $this->source()); + $this->assertContains('|Param4: Set at app config|', $this->source()); + $this->assertContains('|Param5: Set at app config|', $this->source()); // page: admin.Home2 - $this->clickAndWait('pageAdminHome2'); + $this->byId('pageAdminHome2')->click(); $this->assertEquals($this->title(), 'admin.Home2'); - $this->clickAndWait('ctl0_Logout'); - $this->clickAndWait('pageAdminHome2'); + $this->byId('ctl0_Logout')->click(); + $this->byId('pageAdminHome2')->click(); $this->assertEquals($this->title(), 'admin.Home2'); // page: admin.users.Home - $this->clickAndWait('pageAdminUsersHome'); + $this->byId('pageAdminUsersHome')->click(); $this->assertEquals($this->title(), 'UserLogin'); $this->type('ctl0_Main_Username','NormalUser'); $this->type('ctl0_Main_Password','demo'); - $this->clickAndWait('ctl0_Main_LoginButton'); - $this->clickAndWait('pageAdminUsersHome'); + $this->byId('ctl0_Main_LoginButton')->click(); + $this->byId('pageAdminUsersHome')->click(); $this->assertEquals($this->title(), 'UserLogin'); $this->type('ctl0_Main_Username','AdminUser'); $this->type('ctl0_Main_Password','demo'); - $this->clickAndWait('ctl0_Main_LoginButton'); - $this->clickAndWait('pageAdminUsersHome'); + $this->byId('ctl0_Main_LoginButton')->click(); + $this->byId('pageAdminUsersHome')->click(); $this->assertEquals($this->title(), 'admin.users.Home'); - $this->assertTextPresent('|Param1: Set at admin|'); - $this->assertTextPresent('|Param2: Set at admin.users|'); - $this->assertTextPresent('|Param3: default 3|'); - $this->assertTextPresent('|Param4: Set at admin|'); - $this->assertTextPresent('|Param5: Set at app config|'); + $this->assertContains('|Param1: Set at admin|', $this->source()); + $this->assertContains('|Param2: Set at admin.users|', $this->source()); + $this->assertContains('|Param3: default 3|', $this->source()); + $this->assertContains('|Param4: Set at admin|', $this->source()); + $this->assertContains('|Param5: Set at app config|', $this->source()); // page: admin.users.Home2 - $this->clickAndWait('pageAdminUsersHome2'); + $this->byId('pageAdminUsersHome2')->click(); $this->assertEquals($this->title(), 'admin.users.Home2'); // page: content.Home - $this->clickAndWait('pageContentHome'); + $this->byId('pageContentHome')->click(); $this->assertEquals($this->title(), 'content.Home'); - $this->assertTextPresent('|Param1: Set at app config|'); - $this->assertTextPresent('|Param2: Set at root|'); - $this->assertTextPresent('|Param3: default 3|'); - $this->assertTextPresent('|Param4: default 4|'); - $this->assertTextPresent('|Param5: Set at app config|'); - $this->clickAndWait('ctl0_Logout'); + $this->assertContains('|Param1: Set at app config|', $this->source()); + $this->assertContains('|Param2: Set at root|', $this->source()); + $this->assertContains('|Param3: default 3|', $this->source()); + $this->assertContains('|Param4: default 4|', $this->source()); + $this->assertContains('|Param5: Set at app config|', $this->source()); + $this->byId('ctl0_Logout')->click(); } } \ No newline at end of file diff --git a/tests/FunctionalTests/tickets/tests/Ticket703TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket703TestCase.php index 3b278557..46c240b1 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket703TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket703TestCase.php @@ -7,19 +7,20 @@ class Ticket703TestCase extends PradoGenericSelenium2Test $this->url('tickets/index.php?page=Ticket703.Ticket703'); $this->assertEquals($this->title(), "Verifying Ticket703.Ticket703 703.703"); // Start with an empty log - $this->click($base.'ctl2'); + $this->byId($base.'ctl2')->click(); // Wait for callback to be lanched $this->pause(1000); $this->assertText($base.'logBox', ""); $this->type($base.'logMessage', "Test of prado logging system"); - $this->click($base.'ctl0'); + $this->byId($base.'ctl0')->click(); $this->pause(800); - $this->click($base.'ctl1'); - $this->assertTextPresent($base.'logBox', "Test of prado logging system"); + $this->byId($base.'ctl1')->click(); + $this->pause(1000); + $this->assertContains("Test of prado logging system", $this->byId($base.'logBox')->value()); // Clean log for next run - $this->click($base.'ctl2'); + $this->byId($base.'ctl2')->click(); // Wait for callback to be lanched $this->pause(1000); $this->assertText($base.'logBox', ""); diff --git a/tests/FunctionalTests/tickets/tests/Ticket708TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket708TestCase.php index b10b070a..ab8780f6 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket708TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket708TestCase.php @@ -7,19 +7,19 @@ class Ticket708TestCase extends PradoGenericSelenium2Test $this->url('tickets/index.php?page=Ticket708'); $this->assertEquals($this->title(), "Verifying Ticket 708"); - $this->click($base."grid_ctl1_RadioButton"); + $this->byId($base."grid_ctl1_RadioButton")->click(); $this->pause(800); $this->assertText($base."Result", "You have selected Radio Button #1"); - $this->click($base."grid_ctl2_RadioButton"); + $this->byId($base."grid_ctl2_RadioButton")->click(); $this->pause(800); $this->assertText($base."Result", "You have selected Radio Button #2"); - $this->click($base."grid_ctl3_RadioButton"); + $this->byId($base."grid_ctl3_RadioButton")->click(); $this->pause(800); $this->assertText($base."Result", "You have selected Radio Button #3"); - $this->click($base."grid_ctl4_RadioButton"); + $this->byId($base."grid_ctl4_RadioButton")->click(); $this->pause(800); $this->assertText($base."Result", "You have selected Radio Button #4"); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket719TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket719TestCase.php index cb6e1bb7..cc460ee7 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket719TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket719TestCase.php @@ -5,11 +5,11 @@ class Ticket719TestCase extends PradoGenericSelenium2Test function test() { $this->url("tickets/index.php?page=Ticket719"); - $this->assertTextPresent("Verifying Ticket 719"); + $this->assertContains("Verifying Ticket 719", $this->source()); $base="ctl0_Content_"; - $this->click("${base}ctl2"); + $this->byId("${base}ctl2")->click(); $this->pause(800); $this->assertVisible("${base}ctl0", 'Required'); $this->assertVisible("${base}ctl1", 'Required'); @@ -17,26 +17,26 @@ class Ticket719TestCase extends PradoGenericSelenium2Test $this->type("${base}autocomplete", 'f'); $this->runScript("Prado.Registry.get('${base}autocomplete').onKeyPress({})"); $this->pause(500); - $this->assertTextPresent('Finland'); + $this->assertContains('Finland', $this->source()); $this->type("${base}autocomplete", 'fr'); $this->runScript("Prado.Registry.get('${base}autocomplete').onKeyPress({})"); $this->pause(500); - $this->assertTextPresent('French'); + $this->assertContains('French', $this->source()); $this->type("${base}autocomplete", 'fra'); $this->runScript("Prado.Registry.get('${base}autocomplete').onKeyPress({})"); $this->pause(500); - $this->assertTextPresent('France'); + $this->assertContains('France', $this->source()); - $this->click("css=#${base}autocomplete_result ul li"); + $this->byCssSelector("#${base}autocomplete_result ul li")->click(); $this->pause(800); $this->assertNotVisible("${base}ctl1"); $this->type("${base}textbox", "Prado"); $this->assertNotVisible("${base}ctl0"); - $this->click("${base}ctl2"); + $this->byId("${base}ctl2")->click(); $this->pause(800); $this->assertText("${base}Result", "TextBox Content : Prado -- Autocomplete Content :France"); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket722TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket722TestCase.php index f98214cc..268a3df4 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket722TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket722TestCase.php @@ -8,17 +8,17 @@ class Ticket722TestCase extends PradoGenericSelenium2Test $this->assertEquals($this->title(), "Verifying Ticket 722"); $this->assertText($base.'InPlaceTextBox__label', 'Editable Text'); - $this->click($base.'InPlaceTextBox__label'); + $this->byId($base.'InPlaceTextBox__label')->click(); $this->pause(800); $this->assertVisible($base.'InPlaceTextBox'); $this->type($base.'InPlaceTextBox',"Prado"); $this->pause(800); $this->assertNotVisible($base.'InPlaceTextBox'); $this->assertText($base.'InPlaceTextBox__label', 'Prado'); - $this->click($base.'ctl0'); + $this->byId($base.'ctl0')->click(); $this->pause(800); $this->assertText($base.'InPlaceTextBox__label', 'Prado [Read Only]'); - $this->click($base.'InPlaceTextBox__label'); + $this->byId($base.'InPlaceTextBox__label')->click(); $this->pause(800); $this->assertNotVisible($base.'InPlaceTextBox'); diff --git a/tests/FunctionalTests/tickets/tests/Ticket72TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket72TestCase.php index 1a236ffa..91fc9420 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket72TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket72TestCase.php @@ -7,8 +7,8 @@ class Ticket72TestCase extends PradoGenericSelenium2Test $this->url('tickets/index.php?page=Ticket72'); $this->type("ctl0\$Content\$K1", "abc"); $this->type("ctl0\$Content\$K2", "efg"); - $this->clickAndWait("//input[@type='submit' and @value='Send']", ""); - $this->assertTextPresent("efg", ""); - $this->assertTextNotPresent("abcefg", ""); + $this->byXPath("//input[@type='submit' and @value='Send']")->click(); + $this->assertContains("efg", $this->source()); + $this->assertNotContains("abcefg", $this->source()); } } diff --git a/tests/FunctionalTests/tickets/tests/Ticket745TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket745TestCase.php index c23aa900..690df8a1 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket745TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket745TestCase.php @@ -8,10 +8,9 @@ class Ticket745TestCase extends PradoGenericSelenium2Test $this->assertEquals($this->title(), "Verifying Ticket 745"); $this->select($base.'Wizard1_DropDownList1', 'Green'); - $this->click($base.'Wizard1_ctl4_ctl1'); + $this->byId($base.'Wizard1_ctl4_ctl1')->click(); $this->pause(800); - $this->assertTextPresent ('Step 3 of 3'); - + $this->assertContains('Step 3 of 3', $this->source()); } } \ No newline at end of file diff --git a/tests/FunctionalTests/tickets/tests/Ticket769TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket769TestCase.php index 828d4e48..6968a1d5 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket769TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket769TestCase.php @@ -8,26 +8,26 @@ class Ticket769TestCase extends PradoGenericSelenium2Test $this->url('tickets/index.php?page=Ticket769'); $this->assertEquals($this->title(), "Verifying Ticket 769"); - $this->click($base.'ctl0'); + $this->byId($base.'ctl0')->click(); $this->assertVisible($base.'ctl1'); $this->type($base.'T1', 'Prado'); - $this->click($base.'ctl0'); + $this->byId($base.'ctl0')->click(); $this->pause(800); $this->assertNotVisible($base.'ctl1'); $this->assertValue($base.'ctl0', 'T1 clicked' ); - $this->click($base.'ctl2'); + $this->byId($base.'ctl2')->click(); $this->pause(800); $this->assertText($base.'B', 'This is B'); - $this->click($base.'ctl3'); + $this->byId($base.'ctl3')->click(); $this->pause(800); $this->type($base.'T1', ''); - $this->click($base.'ctl0'); + $this->byId($base.'ctl0')->click(); $this->assertVisible($base.'ctl1'); $this->type($base.'T1', 'Prado'); - $this->click($base.'ctl0'); + $this->byId($base.'ctl0')->click(); $this->pause(800); $this->assertNotVisible($base.'ctl1'); $this->assertValue($base.'ctl0', 'T1 clicked clicked' ); diff --git a/tests/FunctionalTests/tickets/tests/Ticket785TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket785TestCase.php index 7b8e7dd0..c20f29a3 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket785TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket785TestCase.php @@ -14,18 +14,18 @@ class Ticket785TestCase extends PradoGenericSelenium2Test $expectedDate=date("d-m").'-'.$year; $this->assertText('selDate', $expectedDate); - $this->click($base."datePickerbutton"); + $this->byId($base."datePickerbutton")->click(); $this->pause(800); - $this->click("css=input.todayButton"); + $this->byCssSelector("input.todayButton")->click(); $this->pause(800); - $this->clickAt("css=body","0,0"); // Hide calendar + $this->byCssSelector("body")->click(); // Hide calendar $expectedDate=date("d-m-Y"); $this->assertText('selDate', $expectedDate); $this->assertText('selDate2', ''); $this->type($base.'datePicker2', '12/05/2006'); $this->pause(800); - $this->clickAt("css=body","0,0"); + $this->byCssSelector("body")->click(); $this->assertText('selDate2', '12/05/2006'); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket828TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket828TestCase.php index f4d3676e..9a44a5ec 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket828TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket828TestCase.php @@ -6,29 +6,29 @@ class Ticket828TestCase extends PradoGenericSelenium2Test { $base = "ctl0_Content_"; $this->url("tickets/index.php?page=Ticket828"); - $this->click("{$base}submit1"); + $this->byId("{$base}submit1")->click(); $this->assertVisible("{$base}validator1"); $this->assertVisible("{$base}validator2"); $this->assertVisible("{$base}validator3"); - $this->click("{$base}list1_c0"); - $this->addSelection("{$base}list2", "label=One"); - $this->addSelection("{$base}list2", "label=Two"); - $this->click("{$base}list3_c3"); - $this->clickAndWait("{$base}submit1"); + $this->byId("{$base}list1_c0")->click(); + $this->addSelection("{$base}list2", "One"); + $this->addSelection("{$base}list2", "Two"); + $this->byId("{$base}list3_c3")->click(); + $this->byId("{$base}submit1")->click(); $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); $this->assertNotVisible("{$base}validator3"); - $this->click("{$base}list1_c1"); - $this->click("{$base}list1_c2"); - $this->click("{$base}list1_c3"); - $this->addSelection("{$base}list2", "label=Two"); - $this->click("{$base}list1_c3"); - $this->clickAndWait("{$base}submit1"); + $this->byId("{$base}list1_c1")->click(); + $this->byId("{$base}list1_c2")->click(); + $this->byId("{$base}list1_c3")->click(); + $this->addSelection("{$base}list2", "Two"); + $this->byId("{$base}list1_c3")->click(); + $this->byId("{$base}submit1")->click(); $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); $this->assertNotVisible("{$base}validator3"); - $this->click("{$base}list3_c3"); - $this->clickAndWait("{$base}submit1"); + $this->byId("{$base}list3_c3")->click(); + $this->byId("{$base}submit1")->click(); $this->pause(200); $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); diff --git a/tests/FunctionalTests/tickets/tests/Ticket849TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket849TestCase.php index afd826f5..e354b126 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket849TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket849TestCase.php @@ -7,9 +7,9 @@ class Ticket849TestCase extends PradoGenericSelenium2Test $this->url('tickets/index.php?page=Ticket849'); $this->assertEquals($this->title(), "Verifying Ticket 849"); $base='ctl0_Content_'; - $this->click($base.'ctl0'); + $this->byId($base.'ctl0')->click(); $this->pause(800); - $this->click('css=td.date.today.selected'); + $this->byCssSelector('td.date.today.selected')->click(); $this->pause(1000); $this->assertValue($base.'ctl0', date('m-d-Y')); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket876TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket876TestCase.php index 8d64d60d..29d4d6c6 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket876TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket876TestCase.php @@ -8,14 +8,14 @@ class Ticket876TestCase extends PradoGenericSelenium2Test { $base = 'ctl0_Content_'; $this->assertElementPresent('xpath=//link[@rel="stylesheet"]'); - $this->clickAndWait($base.'Button'); + $this->byId($base.'Button')->click(); $this->assertElementNotPresent('xpath=//link[@rel="stylesheet"]'); /*$this->select($base.'Date_month', 10); $this->select($base.'Date_day', 22); - $this->clickAndWait($base.'SendButton'); - $this->assertTextPresent('2008-10-22');*/ + $this->byId($base.'SendButton')->click(); + $this->assertContains('2008-10-22', $this->source());*/ } } diff --git a/tests/FunctionalTests/tickets/tests/Ticket886TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket886TestCase.php index 820e0170..7f9c23f3 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket886TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket886TestCase.php @@ -7,8 +7,8 @@ class Ticket886TestCase extends PradoGenericSelenium2Test $this->url('tickets/index.php?page=Ticket886'); $this->assertEquals($this->title(), "Verifying Ticket 886"); $base = 'ctl0_Content_'; - $this->clickAndWait($base.'SendButton'); - $this->assertTextPresent(date('Y').'-01-01'); + $this->byId($base.'SendButton')->click(); + $this->assertContains(date('Y').'-01-01', $this->source()); } } diff --git a/tests/FunctionalTests/tickets/tests/Ticket897TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket897TestCase.php index 6c49276f..e3bac037 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket897TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket897TestCase.php @@ -11,8 +11,8 @@ class Ticket897TestCase extends PradoGenericSelenium2Test $this->select($base.'Date_month', 10); $this->select($base.'Date_day', 22); - $this->clickAndWait($base.'SendButton'); - $this->assertTextPresent(date('Y').'-10-22'); + $this->byId($base.'SendButton')->click(); + $this->assertContains(date('Y').'-10-22', $this->source()); } } diff --git a/tests/FunctionalTests/tickets/tests/Ticket900TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket900TestCase.php index a6f823bc..fc0bcc01 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket900TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket900TestCase.php @@ -8,10 +8,10 @@ class Ticket900TestCase extends PradoGenericSelenium2Test $this->assertEquals($this->title(), "Verifying Ticket 900"); $base = 'ctl0_Content_'; - $this->clickAndWait('ctl0$Content$DataGrid$ctl1$ctl3'); + $this->byName('ctl0$Content$DataGrid$ctl1$ctl3')->click(); $this->type($base.'DataGrid_ctl1_TextBox', ''); - $this->click($base.'DataGrid_ctl1_ctl3'); - $this->clickAndWait('ctl0$Content$DataGrid$ctl1$ctl4'); + $this->byId($base.'DataGrid_ctl1_ctl3')->click(); + $this->byName('ctl0$Content$DataGrid$ctl1$ctl4')->click(); $this->assertText($base.'CommandName', 'cancel'); } } diff --git a/tests/FunctionalTests/tickets/tests/Ticket922TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket922TestCase.php index 64490f1f..f03f980e 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket922TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket922TestCase.php @@ -9,7 +9,7 @@ class Ticket922TestCase extends PradoGenericSelenium2Test $base = 'ctl0_Content_'; $this->type($base.'Text', 'two words'); - $this->clickAndWait('ctl0$Content$ctl0'); + $this->byName('ctl0$Content$ctl0')->click(); $this->assertText($base.'Result','two words'); } diff --git a/tests/FunctionalTests/tickets/tests/Ticket93TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket93TestCase.php index 51d5b582..538860d4 100755 --- a/tests/FunctionalTests/tickets/tests/Ticket93TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket93TestCase.php @@ -9,7 +9,7 @@ class Ticket93TestCase extends PradoGenericSelenium2Test function test() { $this->url('tickets/index.php?page=Ticket93'); - $this->assertTextPresent("ValidationGroups without any inputs with grouping"); + $this->assertContains("ValidationGroups without any inputs with grouping", $this->source()); } } diff --git a/tests/FunctionalTests/validators/tests/ButtonTestCase.php b/tests/FunctionalTests/validators/tests/ButtonTestCase.php index 898c6ff3..90265156 100755 --- a/tests/FunctionalTests/validators/tests/ButtonTestCase.php +++ b/tests/FunctionalTests/validators/tests/ButtonTestCase.php @@ -13,51 +13,51 @@ class ButtonTestCase extends PradoGenericSelenium2Test $this->assertNotVisible('ctl0_Content_ctl4'); // verify the first validator shows the error - $this->click("ctl0_Content_ctl1"); + $this->byId("ctl0_Content_ctl1")->click(); $this->assertVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); // verify the first validation is passed $this->pause(500); - $this->assertTextNotPresent('Button1 is clicked'); + $this->assertNotContains('Button1 is clicked', $this->source()); $this->type("ctl0_Content_TextBox1", "test"); - $this->clickAndWait("ctl0_Content_ctl1"); + $this->byId("ctl0_Content_ctl1")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); - $this->assertTextPresent('Button1 is clicked and valid'); + $this->assertContains('Button1 is clicked and valid', $this->source()); // verify the second validator shows the error - $this->click("ctl0_Content_ctl3"); + $this->byId("ctl0_Content_ctl3")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); // verify the second validation is passed $this->pause(500); - $this->assertTextNotPresent('Button2 is clicked'); + $this->assertNotContains('Button2 is clicked', $this->source()); $this->type("ctl0_Content_TextBox2", "test"); - $this->clickAndWait("ctl0_Content_ctl3"); + $this->byId("ctl0_Content_ctl3")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); - $this->assertTextPresent('Button2 is clicked and valid'); + $this->assertContains('Button2 is clicked and valid', $this->source()); // verify the third validator shows the error - $this->clickAndWait("ctl0_Content_ctl5"); + $this->byId("ctl0_Content_ctl5")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertVisible('ctl0_Content_ctl4'); // verify the third validation is passed - $this->assertTextPresent('Button3 is clicked'); - $this->assertTextNotPresent('Button3 is clicked and valid'); + $this->assertContains('Button3 is clicked', $this->source()); + $this->assertNotContains('Button3 is clicked and valid', $this->source()); $this->type("ctl0_Content_TextBox3", "test"); - $this->clickAndWait("ctl0_Content_ctl5"); + $this->byId("ctl0_Content_ctl5")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); - $this->assertTextPresent('Button3 is clicked and valid'); + $this->assertContains('Button3 is clicked and valid', $this->source()); } } diff --git a/tests/FunctionalTests/validators/tests/CheckBoxTestCase.php b/tests/FunctionalTests/validators/tests/CheckBoxTestCase.php index ebcffd00..8e6e1583 100755 --- a/tests/FunctionalTests/validators/tests/CheckBoxTestCase.php +++ b/tests/FunctionalTests/validators/tests/CheckBoxTestCase.php @@ -13,53 +13,53 @@ class CheckBoxTestCase extends PradoGenericSelenium2Test $this->assertNotVisible('ctl0_Content_ctl4'); // verify the first validator shows the error - $this->click("ctl0_Content_ctl1"); + $this->byId("ctl0_Content_ctl1")->click(); $this->assertVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); // verify the first validation is passed $this->pause(500); - $this->assertTextNotPresent('Button1 is clicked'); + $this->assertNotContains('Button1 is clicked', $this->source()); $this->type("ctl0_Content_TextBox1", "test"); - $this->clickAndWait("ctl0_Content_ctl1"); - $this->clickAndWait("ctl0_Content_ctl1"); + $this->byId("ctl0_Content_ctl1")->click(); + $this->byId("ctl0_Content_ctl1")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); - $this->assertTextPresent('Button1 is clicked and valid'); + $this->assertContains('Button1 is clicked and valid', $this->source()); // verify the second validator shows the error - $this->click("ctl0_Content_ctl3"); + $this->byId("ctl0_Content_ctl3")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); // verify the second validation is passed $this->pause(500); - $this->assertTextNotPresent('Button2 is clicked'); + $this->assertNotContains('Button2 is clicked', $this->source()); $this->type("ctl0_Content_TextBox2", "test"); - $this->clickAndWait("ctl0_Content_ctl3"); - $this->clickAndWait("ctl0_Content_ctl3"); + $this->byId("ctl0_Content_ctl3")->click(); + $this->byId("ctl0_Content_ctl3")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); - $this->assertTextPresent('Button2 is clicked and valid'); + $this->assertContains('Button2 is clicked and valid', $this->source()); // verify the third validator shows the error - $this->clickAndWait("ctl0_Content_ctl5"); + $this->byId("ctl0_Content_ctl5")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertVisible('ctl0_Content_ctl4'); // verify the third validation is passed - $this->assertTextPresent('Button3 is clicked'); - $this->assertTextNotPresent('Button3 is clicked and valid'); + $this->assertContains('Button3 is clicked', $this->source()); + $this->assertNotContains('Button3 is clicked and valid', $this->source()); $this->type("ctl0_Content_TextBox3", "test"); - $this->clickAndWait("ctl0_Content_ctl5"); + $this->byId("ctl0_Content_ctl5")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); - $this->assertTextPresent('Button3 is clicked and valid'); + $this->assertContains('Button3 is clicked and valid', $this->source()); } } diff --git a/tests/FunctionalTests/validators/tests/CompareValidatorTestCase.php b/tests/FunctionalTests/validators/tests/CompareValidatorTestCase.php index 5c45f49a..bdc2e4a9 100755 --- a/tests/FunctionalTests/validators/tests/CompareValidatorTestCase.php +++ b/tests/FunctionalTests/validators/tests/CompareValidatorTestCase.php @@ -8,26 +8,26 @@ class CompareValidatorTestCase extends PradoGenericSelenium2Test $base = "ctl0_Content_"; $this->url("validators/index.php?page=CompareValidator"); - $this->assertTextPresent("Prado CompareValidator Tests", ""); + $this->assertContains("Prado CompareValidator Tests", $this->source()); $this->type("{$base}text1", "qwe"); $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); - $this->click("//input[@type='submit' and @value='Test']", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); $this->type("{$base}text2", "1234"); - $this->click("//input[@type='submit' and @value='Test']", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); $this->assertVisible("{$base}validator1"); $this->type("{$base}text2", "qwe"); - $this->clickAndWait("//input[@type='submit' and @value='Test']", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); $this->type("{$base}text3", "12312"); - $this->click("//input[@type='submit' and @value='Test']", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); $this->assertVisible("{$base}validator2"); $this->type("{$base}text3", "13/1/2005"); @@ -35,7 +35,7 @@ class CompareValidatorTestCase extends PradoGenericSelenium2Test $this->type("{$base}text3", "12/1/2005"); - $this->clickAndWait("//input[@type='submit' and @value='Test']", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); diff --git a/tests/FunctionalTests/validators/tests/ConditionalValidationTestCase.php b/tests/FunctionalTests/validators/tests/ConditionalValidationTestCase.php index d9981eb8..32e79a90 100755 --- a/tests/FunctionalTests/validators/tests/ConditionalValidationTestCase.php +++ b/tests/FunctionalTests/validators/tests/ConditionalValidationTestCase.php @@ -6,47 +6,47 @@ class ConditionalValidationTestCase extends PradoGenericSelenium2Test { $base = "ctl0_Content_"; $this->url("validators/index.php?page=ConditionalValidation"); - $this->assertTextPresent("Conditional Validation (clientside + server side)", ""); - $this->assertNotVisible("{$base}validator1", ""); - $this->assertNotVisible("{$base}validator2", ""); + $this->assertContains("Conditional Validation (clientside + server side)", $this->source()); + $this->assertNotVisible("{$base}validator1"); + $this->assertNotVisible("{$base}validator2"); - $this->click("{$base}submit1"); - $this->assertVisible("{$base}validator1", ""); - $this->assertNotVisible("{$base}validator2", ""); + $this->byId("{$base}submit1")->click(); + $this->assertVisible("{$base}validator1"); + $this->assertNotVisible("{$base}validator2"); - $this->click("{$base}check1"); - $this->click("{$base}submit1"); - $this->assertVisible("{$base}validator1", ""); - $this->assertVisible("{$base}validator2", ""); + $this->byId("{$base}check1")->click(); + $this->byId("{$base}submit1")->click(); + $this->assertVisible("{$base}validator1"); + $this->assertVisible("{$base}validator2"); - $this->click("{$base}check1"); - $this->click("{$base}submit1"); - $this->assertVisible("{$base}validator1", ""); - $this->assertNotVisible("{$base}validator2", ""); + $this->byId("{$base}check1")->click(); + $this->byId("{$base}submit1")->click(); + $this->assertVisible("{$base}validator1"); + $this->assertNotVisible("{$base}validator2"); $this->type("{$base}text1", "testing"); - $this->clickAndWait("{$base}submit1"); - $this->assertNotVisible("{$base}validator1", ""); - $this->assertNotVisible("{$base}validator2", ""); + $this->byId("{$base}submit1")->click(); + $this->assertNotVisible("{$base}validator1"); + $this->assertNotVisible("{$base}validator2"); $this->type("{$base}text1" ,""); - $this->click("{$base}check1"); - $this->click("{$base}submit1"); - $this->assertVisible("{$base}validator1", ""); - $this->assertVisible("{$base}validator2", ""); + $this->byId("{$base}check1")->click(); + $this->byId("{$base}submit1")->click(); + $this->assertVisible("{$base}validator1"); + $this->assertVisible("{$base}validator2"); $this->type("{$base}text1", "test"); $this->type("{$base}text2", "123"); - $this->clickAndWait("{$base}submit1"); - $this->assertNotVisible("{$base}validator1", ""); - $this->assertNotVisible("{$base}validator2", ""); + $this->byId("{$base}submit1")->click(); + $this->assertNotVisible("{$base}validator1"); + $this->assertNotVisible("{$base}validator2"); - $this->click("{$base}check1"); + $this->byId("{$base}check1")->click(); $this->type("{$base}text1", ""); $this->type("{$base}text2", ""); - $this->click("{$base}submit1"); - $this->assertVisible("{$base}validator1", ""); - $this->assertNotVisible("{$base}validator2", ""); + $this->byId("{$base}submit1")->click(); + $this->assertVisible("{$base}validator1"); + $this->assertNotVisible("{$base}validator2"); } diff --git a/tests/FunctionalTests/validators/tests/CustomValidatorTestCase.php b/tests/FunctionalTests/validators/tests/CustomValidatorTestCase.php index c7bb6f9c..ca48a453 100755 --- a/tests/FunctionalTests/validators/tests/CustomValidatorTestCase.php +++ b/tests/FunctionalTests/validators/tests/CustomValidatorTestCase.php @@ -7,10 +7,10 @@ class CustomValidatorTestCase extends PradoGenericSelenium2Test { $base = "ctl0_Content_"; $this->url("validators/index.php?page=CustomValidator"); - $this->assertTextPresent("Prado CustomValidator Tests", ""); + $this->assertContains("Prado CustomValidator Tests", $this->source()); $this->assertNotVisible("{$base}validator1"); - $this->click("//input[@type='submit' and @value='Test']", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); $this->assertVisible("{$base}validator1"); $this->type("{$base}text1", "Prado"); @@ -22,7 +22,7 @@ class CustomValidatorTestCase extends PradoGenericSelenium2Test $this->type("{$base}text1", "Prado"); $this->pause(250); $this->assertNotVisible("{$base}validator1"); - $this->clickAndWait("//input[@type='submit' and @value='Test']", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); $this->assertNotVisible("{$base}validator1"); } diff --git a/tests/FunctionalTests/validators/tests/DataTypeValidatorTestCase.php b/tests/FunctionalTests/validators/tests/DataTypeValidatorTestCase.php index c70549d0..6da797f1 100755 --- a/tests/FunctionalTests/validators/tests/DataTypeValidatorTestCase.php +++ b/tests/FunctionalTests/validators/tests/DataTypeValidatorTestCase.php @@ -10,8 +10,8 @@ class DataTypeValidatorTestCase extends PradoGenericSelenium2Test $this->setSpeed(500); $base = "ctl0_Content_"; $this->url("validators/index.php?page=DataTypeValidator"); - $this->assertTextPresent("Data Type Validator Tests", ""); - $this->click("//input[@type='submit' and @value='submit!']", ""); + $this->assertContains("Data Type Validator Tests", $this->source()); + $this->byXPath("//input[@type='submit' and @value='submit!']")->click(); $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); @@ -20,7 +20,7 @@ class DataTypeValidatorTestCase extends PradoGenericSelenium2Test $this->type("{$base}textbox1", "a"); $this->type("{$base}textbox2", "b"); $this->type("{$base}textbox3", "c"); - $this->click("//input[@type='submit' and @value='submit!']", ""); + $this->byXPath("//input[@type='submit' and @value='submit!']")->click(); $this->assertVisible("{$base}validator1"); $this->assertVisible("{$base}validator2"); @@ -29,7 +29,7 @@ class DataTypeValidatorTestCase extends PradoGenericSelenium2Test $this->type("{$base}textbox1", "12"); $this->type("{$base}textbox2", "12.5"); $this->type("{$base}textbox3", "2/10/2005"); - $this->clickAndWait("//input[@type='submit' and @value='submit!']", ""); + $this->byXPath("//input[@type='submit' and @value='submit!']")->click(); $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); @@ -38,7 +38,7 @@ class DataTypeValidatorTestCase extends PradoGenericSelenium2Test $this->type("{$base}textbox1", "12.2"); $this->type("{$base}textbox2", "-12.5"); $this->type("{$base}textbox3", "2/13/2005"); - $this->click("//input[@type='submit' and @value='submit!']", ""); + $this->byXPath("//input[@type='submit' and @value='submit!']")->click(); $this->assertVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); diff --git a/tests/FunctionalTests/validators/tests/DatePickerTestCase.php b/tests/FunctionalTests/validators/tests/DatePickerTestCase.php index 81c24aca..ab68a619 100755 --- a/tests/FunctionalTests/validators/tests/DatePickerTestCase.php +++ b/tests/FunctionalTests/validators/tests/DatePickerTestCase.php @@ -8,61 +8,61 @@ class DatePickerTestCase extends PradoGenericSelenium2Test $year2=2013; $base = "ctl0_Content_"; $this->url("validators/index.php?page=DatePicker"); - $this->assertTextPresent("Date Picker validation Test", ""); - $this->assertNotVisible("{$base}validator1", ""); - $this->assertNotVisible("{$base}validator2", ""); - $this->assertNotVisible("{$base}validator4", ""); - $this->assertNotVisible("{$base}validator5", ""); - $this->assertNotVisible("{$base}validator6", ""); - $this->assertNotVisible("{$base}validator8", ""); + $this->assertContains("Date Picker validation Test", $this->source()); + $this->assertNotVisible("{$base}validator1"); + $this->assertNotVisible("{$base}validator2"); + $this->assertNotVisible("{$base}validator4"); + $this->assertNotVisible("{$base}validator5"); + $this->assertNotVisible("{$base}validator6"); + $this->assertNotVisible("{$base}validator8"); - $this->click("{$base}submit1"); - $this->assertVisible("{$base}validator1", ""); - $this->assertNotVisible("{$base}validator2", ""); + $this->byId("{$base}submit1")->click(); + $this->assertVisible("{$base}validator1"); + $this->assertNotVisible("{$base}validator2"); //the range validator is visible because the date is a drop down list //thus has default value != "" - $this->assertVisible("{$base}validator4", ""); - $this->assertVisible("{$base}validator5", ""); - $this->assertNotVisible("{$base}validator6", ""); - $this->assertVisible("{$base}validator8", ""); + $this->assertVisible("{$base}validator4"); + $this->assertVisible("{$base}validator5"); + $this->assertNotVisible("{$base}validator6"); + $this->assertVisible("{$base}validator8"); $this->type("{$base}picker1", "13/4/$year"); - $this->select("{$base}picker2_month", "label=9"); - $this->select("{$base}picker2_day", "label=10"); - $this->select("{$base}picker2_year", "label=$year"); + $this->select("{$base}picker2_month", "9"); + $this->select("{$base}picker2_day", "10"); + $this->select("{$base}picker2_year", "$year"); $this->pause(250); $this->type("{$base}picker3", "14/4/$year"); $this->pause(250); $this->type("{$base}picker4", "7/4/$year"); - $this->select("{$base}picker5_day", "label=6"); - $this->select("{$base}picker5_month", "label=3"); - $this->select("{$base}picker5_year", "label=$year2"); - $this->select("{$base}picker6_month", "label=3"); - $this->select("{$base}picker6_year", "label=$year2"); - $this->select("{$base}picker6_day", "label=5"); + $this->select("{$base}picker5_day", "6"); + $this->select("{$base}picker5_month", "3"); + $this->select("{$base}picker5_year", "$year2"); + $this->select("{$base}picker6_month", "3"); + $this->select("{$base}picker6_year", "$year2"); + $this->select("{$base}picker6_day", "5"); + $this->byId("{$base}submit1")->click(); + $this->pause(500); - $this->click("{$base}submit1"); - - $this->assertNotVisible("{$base}validator1", ""); - $this->assertVisible("{$base}validator2", ""); - $this->assertNotVisible("{$base}validator4", ""); - $this->assertNotVisible("{$base}validator5", ""); - $this->assertVisible("{$base}validator6", ""); - $this->assertVisible("{$base}validator8", ""); + $this->assertNotVisible("{$base}validator1"); + $this->assertVisible("{$base}validator2"); + $this->assertNotVisible("{$base}validator4"); + $this->assertNotVisible("{$base}validator5"); + $this->assertVisible("{$base}validator6"); + $this->assertVisible("{$base}validator8"); $this->type("{$base}picker1", "20/4/$year2"); $this->type("{$base}picker4", "29/4/$year"); - $this->select("{$base}picker6_day", "label=10"); + $this->select("{$base}picker6_day", "10"); - $this->clickAndWait("{$base}submit1"); + $this->byId("{$base}submit1")->click(); - $this->assertNotVisible("{$base}validator1", ""); - $this->assertNotVisible("{$base}validator2", ""); - $this->assertNotVisible("{$base}validator4", ""); - $this->assertNotVisible("{$base}validator5", ""); - $this->assertNotVisible("{$base}validator6", ""); - $this->assertNotVisible("{$base}validator8", ""); + $this->assertNotVisible("{$base}validator1"); + $this->assertNotVisible("{$base}validator2"); + $this->assertNotVisible("{$base}validator4"); + $this->assertNotVisible("{$base}validator5"); + $this->assertNotVisible("{$base}validator6"); + $this->assertNotVisible("{$base}validator8"); } } diff --git a/tests/FunctionalTests/validators/tests/ImageButtonTestCase.php b/tests/FunctionalTests/validators/tests/ImageButtonTestCase.php index ef086baa..800e36ff 100755 --- a/tests/FunctionalTests/validators/tests/ImageButtonTestCase.php +++ b/tests/FunctionalTests/validators/tests/ImageButtonTestCase.php @@ -13,51 +13,51 @@ class ImageButtonTestCase extends PradoGenericSelenium2Test $this->assertNotVisible('ctl0_Content_ctl4'); // verify the first validator shows the error - $this->click("ctl0_Content_ctl1"); + $this->byId("ctl0_Content_ctl1")->click(); $this->assertVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); // verify the first validation is passed $this->pause(500); - $this->assertTextNotPresent('Button1 is clicked'); + $this->assertNotContains('Button1 is clicked', $this->source()); $this->type("ctl0_Content_TextBox1", "test"); - $this->clickAndWait("ctl0_Content_ctl1"); + $this->byId("ctl0_Content_ctl1")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); - $this->assertTextPresent('Button1 is clicked and valid'); + $this->assertContains('Button1 is clicked and valid', $this->source()); // verify the second validator shows the error - $this->click("ctl0_Content_ctl3"); + $this->byId("ctl0_Content_ctl3")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); // verify the second validation is passed $this->pause(500); - $this->assertTextNotPresent('Button2 is clicked'); + $this->assertNotContains('Button2 is clicked', $this->source()); $this->type("ctl0_Content_TextBox2", "test"); - $this->clickAndWait("ctl0_Content_ctl3"); + $this->byId("ctl0_Content_ctl3")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); - $this->assertTextPresent('Button2 is clicked and valid'); + $this->assertContains('Button2 is clicked and valid', $this->source()); // verify the third validator shows the error - $this->clickAndWait("ctl0_Content_ctl5"); + $this->byId("ctl0_Content_ctl5")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertVisible('ctl0_Content_ctl4'); // verify the third validation is passed - $this->assertTextPresent('Button3 is clicked'); - $this->assertTextNotPresent('Button3 is clicked and valid'); + $this->assertContains('Button3 is clicked', $this->source()); + $this->assertNotContains('Button3 is clicked and valid', $this->source()); $this->type("ctl0_Content_TextBox3", "test"); - $this->clickAndWait("ctl0_Content_ctl5"); + $this->byId("ctl0_Content_ctl5")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); - $this->assertTextPresent('Button3 is clicked and valid'); + $this->assertContains('Button3 is clicked and valid', $this->source()); } } diff --git a/tests/FunctionalTests/validators/tests/LinkButtonTestCase.php b/tests/FunctionalTests/validators/tests/LinkButtonTestCase.php index 66e2fc61..394556e9 100755 --- a/tests/FunctionalTests/validators/tests/LinkButtonTestCase.php +++ b/tests/FunctionalTests/validators/tests/LinkButtonTestCase.php @@ -12,51 +12,51 @@ class LinkButtonTestCase extends PradoGenericSelenium2Test $this->assertNotVisible('ctl0_Content_ctl4'); // verify the first validator shows the error - $this->click("ctl0_Content_ctl1"); + $this->byId("ctl0_Content_ctl1")->click(); $this->assertVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); // verify the first validation is passed $this->pause(500); - $this->assertTextNotPresent('Button1 is clicked'); + $this->assertNotContains('Button1 is clicked', $this->source()); $this->type("ctl0_Content_TextBox1", "test"); - $this->clickAndWait("ctl0_Content_ctl1"); + $this->byId("ctl0_Content_ctl1")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); - $this->assertTextPresent('Button1 is clicked and valid'); + $this->assertContains('Button1 is clicked and valid', $this->source()); // verify the second validator shows the error - $this->click("ctl0_Content_ctl3"); + $this->byId("ctl0_Content_ctl3")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); // verify the second validation is passed $this->pause(500); - $this->assertTextNotPresent('Button2 is clicked'); + $this->assertNotContains('Button2 is clicked', $this->source()); $this->type("ctl0_Content_TextBox2", "test"); - $this->clickAndWait("ctl0_Content_ctl3"); + $this->byId("ctl0_Content_ctl3")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); - $this->assertTextPresent('Button2 is clicked and valid'); + $this->assertContains('Button2 is clicked and valid', $this->source()); // verify the third validator shows the error - $this->clickAndWait("ctl0_Content_ctl5"); + $this->byId("ctl0_Content_ctl5")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertVisible('ctl0_Content_ctl4'); // verify the third validation is passed - $this->assertTextPresent('Button3 is clicked'); - $this->assertTextNotPresent('Button3 is clicked and valid'); + $this->assertContains('Button3 is clicked', $this->source()); + $this->assertNotContains('Button3 is clicked and valid', $this->source()); $this->type("ctl0_Content_TextBox3", "test"); - $this->clickAndWait("ctl0_Content_ctl5"); + $this->byId("ctl0_Content_ctl5")->click(); $this->assertNotVisible('ctl0_Content_ctl0'); $this->assertNotVisible('ctl0_Content_ctl2'); $this->assertNotVisible('ctl0_Content_ctl4'); - $this->assertTextPresent('Button3 is clicked and valid'); + $this->assertContains('Button3 is clicked and valid', $this->source()); } } diff --git a/tests/FunctionalTests/validators/tests/ListControlTestCase.php b/tests/FunctionalTests/validators/tests/ListControlTestCase.php index a8aca64b..55e370c5 100755 --- a/tests/FunctionalTests/validators/tests/ListControlTestCase.php +++ b/tests/FunctionalTests/validators/tests/ListControlTestCase.php @@ -9,19 +9,19 @@ class ListControlTestCase extends PradoGenericSelenium2Test { $base = "ctl0_Content_"; $this->url("validators/index.php?page=ListControl"); - $this->assertTextPresent("List Control Required Field Validation Test", ""); - $this->click("//input[@type='submit' and @value='Submit!']", ""); + $this->assertContains("List Control Required Field Validation Test", $this->source()); + $this->byXPath("//input[@type='submit' and @value='Submit!']")->click(); $this->assertVisible("{$base}validator1"); $this->assertVisible("{$base}validator2"); $this->assertVisible("{$base}validator3"); $this->assertVisible("{$base}validator4"); - $this->click("//input[@id='{$base}list1_c1' and @value='Red']", ""); - $this->select("{$base}list2", "label=Red"); - $this->select("{$base}list3", "label=Blue"); - $this->click("{$base}list4_c3", ""); - $this->clickAndWait("//input[@type='submit' and @value='Submit!']", ""); + $this->byXPath("//input[@id='{$base}list1_c1' and @value='Red']")->click(); + $this->select("{$base}list2", "Red"); + $this->select("{$base}list3", "Blue"); + $this->byId("{$base}list4_c3")->click(); + $this->byXPath("//input[@type='submit' and @value='Submit!']")->click(); $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); @@ -29,13 +29,13 @@ class ListControlTestCase extends PradoGenericSelenium2Test $this->assertNotVisible("{$base}validator4"); //invalid selector: Unable to locate an element with the xpath expression .//option[.='Don\'t select this one'] because of the following error: SyntaxError: Failed to execute 'evaluate' on 'Document': The string './/option[.='Don\'t select this one']' is not a valid XPath expression. - $this->select("{$base}list3", "label=Dont select this one"); - $this->click("{$base}list4_c0"); - $this->select("{$base}list2", "label=--- Select a color ---"); - $this->click("//input[@type='submit' and @value='Submit!']", ""); - $this->click("//input[@id='{$base}list1_c1' and @value='Red']", ""); - $this->click("//input[@id='{$base}list1_c0' and @value='Select a color below']", ""); - $this->click("//input[@type='submit' and @value='Submit!']", ""); + $this->select("{$base}list3", "Dont select this one"); + $this->byId("{$base}list4_c0")->click(); + $this->select("{$base}list2", "--- Select a color ---"); + $this->byXPath("//input[@type='submit' and @value='Submit!']")->click(); + $this->byXPath("//input[@id='{$base}list1_c1' and @value='Red']")->click(); + $this->byXPath("//input[@id='{$base}list1_c0' and @value='Select a color below']")->click(); + $this->byXPath("//input[@type='submit' and @value='Submit!']")->click(); $this->assertVisible("{$base}validator1"); $this->assertVisible("{$base}validator2"); diff --git a/tests/FunctionalTests/validators/tests/RangeValidatorTestCase.php b/tests/FunctionalTests/validators/tests/RangeValidatorTestCase.php index 668260ad..485c6a24 100755 --- a/tests/FunctionalTests/validators/tests/RangeValidatorTestCase.php +++ b/tests/FunctionalTests/validators/tests/RangeValidatorTestCase.php @@ -7,39 +7,39 @@ class RangeValidatorTestCase extends PradoGenericSelenium2Test { $base = "ctl0_Content_"; $this->url("validators/index.php?page=RangeValidatorInteger"); - $this->assertTextPresent("Prado RangeValidator Tests Integer", ""); + $this->assertContains("Prado RangeValidator Tests Integer", $this->source()); //between 1 and 4 $this->type("{$base}text1", "ad"); - $this->assertNotVisible("{$base}validator1", ""); - $this->click("//input[@type='submit' and @value='Test']", ""); - $this->assertVisible("{$base}validator1", ""); + $this->assertNotVisible("{$base}validator1"); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertVisible("{$base}validator1"); $this->type("{$base}text1", "12"); - $this->click("//input[@type='submit' and @value='Test']", ""); - $this->assertVisible("{$base}validator1", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertVisible("{$base}validator1"); $this->type("{$base}text1", "2"); - $this->assertNotVisible("{$base}validator1", ""); - $this->clickAndWait("//input[@type='submit' and @value='Test']", ""); - $this->assertNotVisible("{$base}validator1", ""); + $this->assertNotVisible("{$base}validator1"); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertNotVisible("{$base}validator1"); // >= 2 - $this->assertNotVisible("{$base}validator2", ""); + $this->assertNotVisible("{$base}validator2"); $this->type("{$base}text2", "1"); - $this->click("//input[@type='submit' and @value='Test']", ""); - $this->assertVisible("{$base}validator2", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertVisible("{$base}validator2"); $this->type("{$base}text2", "10"); - $this->clickAndWait("//input[@type='submit' and @value='Test']", ""); - $this->assertNotVisible("{$base}validator2", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertNotVisible("{$base}validator2"); // <= 20 - $this->assertNotVisible("{$base}validator3", ""); + $this->assertNotVisible("{$base}validator3"); $this->type("{$base}text3", "100"); - $this->click("//input[@type='submit' and @value='Test']", ""); - $this->assertVisible("{$base}validator3", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertVisible("{$base}validator3"); $this->type("{$base}text3", "10"); - $this->clickAndWait("//input[@type='submit' and @value='Test']", ""); - $this->assertNotVisible("{$base}validator3", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertNotVisible("{$base}validator3"); } @@ -47,120 +47,120 @@ class RangeValidatorTestCase extends PradoGenericSelenium2Test { $base = "ctl0_Content_"; $this->url("validators/index.php?page=RangeValidatorFloat"); - $this->assertTextPresent("Prado RangeValidator Tests Float", ""); + $this->assertContains("Prado RangeValidator Tests Float", $this->source()); //between 1 and 4 $this->type("{$base}text1", "ad"); - $this->assertNotVisible("{$base}validator1", ""); - $this->click("//input[@type='submit' and @value='Test']", ""); - $this->assertVisible("{$base}validator1", ""); + $this->assertNotVisible("{$base}validator1"); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertVisible("{$base}validator1"); $this->type("{$base}text1", "12"); - $this->click("//input[@type='submit' and @value='Test']", ""); - $this->assertVisible("{$base}validator1", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertVisible("{$base}validator1"); $this->type("{$base}text1", "2"); - $this->assertNotVisible("{$base}validator1", ""); - $this->clickAndWait("//input[@type='submit' and @value='Test']", ""); - $this->assertNotVisible("{$base}validator1", ""); + $this->assertNotVisible("{$base}validator1"); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertNotVisible("{$base}validator1"); // >= 2 - $this->assertNotVisible("{$base}validator2", ""); + $this->assertNotVisible("{$base}validator2"); $this->type("{$base}text2", "1"); - $this->click("//input[@type='submit' and @value='Test']", ""); - $this->assertVisible("{$base}validator2", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertVisible("{$base}validator2"); $this->type("{$base}text2", "10"); - $this->clickAndWait("//input[@type='submit' and @value='Test']", ""); - $this->assertNotVisible("{$base}validator2", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertNotVisible("{$base}validator2"); // <= 20 - $this->assertNotVisible("{$base}validator3", ""); + $this->assertNotVisible("{$base}validator3"); $this->type("{$base}text3", "100"); - $this->click("//input[@type='submit' and @value='Test']", ""); - $this->assertVisible("{$base}validator3", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertVisible("{$base}validator3"); $this->type("{$base}text3", "10"); - $this->clickAndWait("//input[@type='submit' and @value='Test']", ""); - $this->assertNotVisible("{$base}validator3", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertNotVisible("{$base}validator3"); } function testDateRange() { $base = "ctl0_Content_"; $this->url("validators/index.php?page=RangeValidatorDate"); - $this->assertTextPresent("Prado RangeValidator Tests Date", ""); + $this->assertContains("Prado RangeValidator Tests Date", $this->source()); //between 22/1/2005 and 3/2/2005 $this->type("{$base}text1", "ad"); - $this->assertNotVisible("{$base}validator1", ""); - $this->click("//input[@type='submit' and @value='Test']", ""); - $this->assertVisible("{$base}validator1", ""); + $this->assertNotVisible("{$base}validator1"); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertVisible("{$base}validator1"); $this->type("{$base}text1", "27/2/2005"); - $this->click("//input[@type='submit' and @value='Test']", ""); - $this->assertVisible("{$base}validator1", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertVisible("{$base}validator1"); $this->type("{$base}text1", "1/2/2005"); - $this->clickAndWait("//input[@type='submit' and @value='Test']", ""); - $this->assertNotVisible("{$base}validator1", ""); - $this->clickAndWait("//input[@type='submit' and @value='Test']", ""); - $this->assertNotVisible("{$base}validator1", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertNotVisible("{$base}validator1"); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertNotVisible("{$base}validator1"); // >= 22/1/2005 - $this->assertNotVisible("{$base}validator2", ""); + $this->assertNotVisible("{$base}validator2"); $this->type("{$base}text2", "1/1/2005"); - $this->click("//input[@type='submit' and @value='Test']", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); $this->pause(250); - $this->assertVisible("{$base}validator2", ""); + $this->assertVisible("{$base}validator2"); $this->type("{$base}text2", "1/4/2005"); - $this->clickAndWait("//input[@type='submit' and @value='Test']", ""); - $this->assertNotVisible("{$base}validator2", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertNotVisible("{$base}validator2"); // <= 3/2/2005 - $this->assertNotVisible("{$base}validator3", ""); + $this->assertNotVisible("{$base}validator3"); $this->type("{$base}text3", "4/5/2005"); - $this->click("//input[@type='submit' and @value='Test']", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); $this->pause(250); - $this->assertVisible("{$base}validator3", ""); + $this->assertVisible("{$base}validator3"); $this->type("{$base}text3", "1/2/2005"); - $this->clickAndWait("//input[@type='submit' and @value='Test']", ""); - $this->assertNotVisible("{$base}validator3", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertNotVisible("{$base}validator3"); } function testStringRange() { $base = "ctl0_Content_"; $this->url("validators/index.php?page=RangeValidatorString"); - $this->assertTextPresent("Prado RangeValidator Tests String", ""); + $this->assertContains("Prado RangeValidator Tests String", $this->source()); //between 'd' and 'y' $this->type("{$base}text1", "a"); - $this->assertNotVisible("{$base}validator1", ""); - $this->click("//input[@type='submit' and @value='Test']", ""); - $this->assertVisible("{$base}validator1", ""); + $this->assertNotVisible("{$base}validator1"); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertVisible("{$base}validator1"); $this->type("{$base}text1", "b"); - $this->click("//input[@type='submit' and @value='Test']", ""); - $this->assertVisible("{$base}validator1", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertVisible("{$base}validator1"); $this->type("{$base}text1", "f"); - $this->assertNotVisible("{$base}validator1", ""); - $this->clickAndWait("//input[@type='submit' and @value='Test']", ""); - $this->assertNotVisible("{$base}validator1", ""); + $this->assertNotVisible("{$base}validator1"); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertNotVisible("{$base}validator1"); // >= 'd' - $this->assertNotVisible("{$base}validator2", ""); + $this->assertNotVisible("{$base}validator2"); $this->type("{$base}text2", "a"); - $this->click("//input[@type='submit' and @value='Test']", ""); - $this->assertVisible("{$base}validator2", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertVisible("{$base}validator2"); $this->type("{$base}text2", "g"); - $this->clickAndWait("//input[@type='submit' and @value='Test']", ""); - $this->assertNotVisible("{$base}validator2", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertNotVisible("{$base}validator2"); // <= 'y' - $this->assertNotVisible("{$base}validator3", ""); + $this->assertNotVisible("{$base}validator3"); $this->type("{$base}text3", "z"); - $this->click("//input[@type='submit' and @value='Test']", ""); - $this->assertVisible("{$base}validator3", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertVisible("{$base}validator3"); $this->type("{$base}text3", "t"); - $this->clickAndWait("//input[@type='submit' and @value='Test']", ""); - $this->assertNotVisible("{$base}validator3", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertNotVisible("{$base}validator3"); } } diff --git a/tests/FunctionalTests/validators/tests/RegExpValidatorTestCase.php b/tests/FunctionalTests/validators/tests/RegExpValidatorTestCase.php index b45ebcf3..ffa30126 100755 --- a/tests/FunctionalTests/validators/tests/RegExpValidatorTestCase.php +++ b/tests/FunctionalTests/validators/tests/RegExpValidatorTestCase.php @@ -7,26 +7,26 @@ class RegExpValidatorTestCase extends PradoGenericSelenium2Test { $base = "ctl0_Content_"; $this->url("validators/index.php?page=RegularExpressionValidator"); - $this->assertTextPresent("Prado RegularExpressionValidator Tests", ""); - $this->assertNotVisible("{$base}validator1", ""); - $this->assertNotVisible("{$base}validator2", ""); + $this->assertContains("Prado RegularExpressionValidator Tests", $this->source()); + $this->assertNotVisible("{$base}validator1"); + $this->assertNotVisible("{$base}validator2"); $this->type("{$base}text1", "1"); $this->type("{$base}text2", "2"); - $this->click("//input[@type='submit' and @value='Test']", ""); - $this->assertVisible("{$base}validator1", ""); - $this->assertVisible("{$base}validator2", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertVisible("{$base}validator1"); + $this->assertVisible("{$base}validator2"); $this->type("{$base}text1", "asdasd"); - $this->click("//input[@type='submit' and @value='Test']", ""); - $this->assertVisible("{$base}validator1", ""); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertVisible("{$base}validator1"); $this->type("{$base}text1", "12345"); - $this->assertNotVisible("{$base}validator1", ""); - $this->assertVisible("{$base}validator2", ""); + $this->assertNotVisible("{$base}validator1"); + $this->assertVisible("{$base}validator2"); $this->type("{$base}text2", "wei@gmail.com"); - $this->assertNotVisible("{$base}validator1", ""); - $this->assertNotVisible("{$base}validator2", ""); - $this->clickAndWait("//input[@type='submit' and @value='Test']", ""); - $this->assertNotVisible("{$base}validator1", ""); - $this->assertNotVisible("{$base}validator2", ""); + $this->assertNotVisible("{$base}validator1"); + $this->assertNotVisible("{$base}validator2"); + $this->byXPath("//input[@type='submit' and @value='Test']")->click(); + $this->assertNotVisible("{$base}validator1"); + $this->assertNotVisible("{$base}validator2"); } } diff --git a/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php b/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php index 4dd645b4..249f5ae8 100755 --- a/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php +++ b/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php @@ -6,49 +6,49 @@ class RequiredFieldTestCase extends PradoGenericSelenium2Test { $base = "ctl0_Content_"; $this->url("validators/index.php?page=RequiredFieldValidator"); - $this->assertTextPresent("RequiredFieldValidator Tests"); + $this->assertContains("RequiredFieldValidator Tests", $this->source()); $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); - $this->click("{$base}submit1"); + $this->byId("{$base}submit1")->click(); $this->assertVisible("{$base}validator1"); $this->assertVisible("{$base}validator2"); $this->type("{$base}text1", "testing"); - $this->click("{$base}submit1"); + $this->byId("{$base}submit1")->click(); $this->assertNotVisible("{$base}validator1"); - $this->click("{$base}submit2"); + $this->byId("{$base}submit2")->click(); $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); $this->assertVisible("{$base}validator3"); $this->assertVisible("{$base}validator4"); $this->type("{$base}text2", "testing2"); - $this->click("{$base}submit2"); + $this->byId("{$base}submit2")->click(); $this->assertNotVisible("{$base}validator3"); - $this->click("{$base}submit3"); + $this->byId("{$base}submit3")->click(); $this->assertVisible("{$base}summary3"); - $this->clickAndWait("{$base}submit4"); + $this->byId("{$base}submit4")->click(); $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); $this->assertNotVisible("{$base}validator3"); $this->assertNotVisible("{$base}validator4"); - $this->click("{$base}submit1"); + $this->byId("{$base}submit1")->click(); $this->assertVisible("{$base}validator2"); - $this->click("{$base}check1"); - $this->click("{$base}submit2"); + $this->byId("{$base}check1")->click(); + $this->byId("{$base}submit2")->click(); $this->assertVisible("{$base}validator4"); - $this->clickAndWait("{$base}submit1"); + $this->byId("{$base}submit1")->click(); $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); $this->type("{$base}text1"); - $this->click("{$base}check1"); - $this->click("{$base}submit1"); + $this->byId("{$base}check1")->click(); + $this->byId("{$base}submit1")->click(); $this->assertVisible("{$base}validator1"); $this->assertVisible("{$base}validator2"); - $this->click("{$base}check2"); - $this->clickAndWait("{$base}submit2"); + $this->byId("{$base}check2")->click(); + $this->byId("{$base}submit2")->click(); $this->type("{$base}text1", "Hello"); - $this->click("{$base}check1"); - $this->clickAndWait("{$base}submit2"); + $this->byId("{$base}check1")->click(); + $this->byId("{$base}submit2")->click(); $this->assertNotVisible("{$base}validator5"); $this->assertNotVisible("{$base}validator6"); @@ -56,14 +56,14 @@ class RequiredFieldTestCase extends PradoGenericSelenium2Test $this->assertNotVisible("{$base}validator8"); $this->type("{$base}text1"); $this->type("{$base}text2"); - $this->click("{$base}check1"); - $this->click("{$base}check2"); - $this->click("{$base}submit3"); + $this->byId("{$base}check1")->click(); + $this->byId("{$base}check2")->click(); + $this->byId("{$base}submit3")->click(); $this->assertVisible("{$base}validator5"); $this->assertVisible("{$base}validator6"); $this->assertVisible("{$base}validator7"); $this->assertVisible("{$base}validator8"); - $this->clickAndWait("{$base}submit4"); + $this->byId("{$base}submit4")->click(); $this->assertNotVisible("{$base}validator5"); $this->assertNotVisible("{$base}validator6"); $this->assertNotVisible("{$base}validator7"); @@ -74,9 +74,9 @@ class RequiredFieldTestCase extends PradoGenericSelenium2Test { $base = "ctl0_Content_"; $this->url("validators/index.php?page=RequiredFieldValidator"); - $this->assertTextPresent("InitialValue Test"); + $this->assertContains("InitialValue Test", $this->source()); $this->assertNotVisible("{$base}validator9"); - $this->click("{$base}submit5"); + $this->byId("{$base}submit5")->click(); $this->pause(250); $this->assertVisible("{$base}validator9"); $this->type("{$base}text5", "adasd"); diff --git a/tests/FunctionalTests/validators/tests/RequiredListTestCase.php b/tests/FunctionalTests/validators/tests/RequiredListTestCase.php index 6fbb1905..0de6815e 100755 --- a/tests/FunctionalTests/validators/tests/RequiredListTestCase.php +++ b/tests/FunctionalTests/validators/tests/RequiredListTestCase.php @@ -7,29 +7,29 @@ class RequiredListTestCase extends PradoGenericSelenium2Test { $base = "ctl0_Content_"; $this->url("validators/index.php?page=RequiredListValidator"); - $this->click("{$base}submit1"); + $this->byId("{$base}submit1")->click(); $this->assertVisible("{$base}validator1"); $this->assertVisible("{$base}validator2"); $this->assertVisible("{$base}validator3"); - $this->click("{$base}list1_c0"); - $this->addSelection("{$base}list2", "label=One"); - $this->addSelection("{$base}list2", "label=Two"); - $this->click("{$base}list3_c3"); - $this->clickAndWait("{$base}submit1"); + $this->byId("{$base}list1_c0")->click(); + $this->addSelection("{$base}list2", "One"); + $this->addSelection("{$base}list2", "Two"); + $this->byId("{$base}list3_c3")->click(); + $this->byId("{$base}submit1")->click(); $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); $this->assertNotVisible("{$base}validator3"); - $this->click("{$base}list1_c1"); - $this->click("{$base}list1_c2"); - $this->click("{$base}list1_c3"); - $this->addSelection("{$base}list2", "label=Two"); - $this->click("{$base}list1_c3"); - $this->clickAndWait("{$base}submit1"); + $this->byId("{$base}list1_c1")->click(); + $this->byId("{$base}list1_c2")->click(); + $this->byId("{$base}list1_c3")->click(); + $this->addSelection("{$base}list2", "Two"); + $this->byId("{$base}list1_c3")->click(); + $this->byId("{$base}submit1")->click(); $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); $this->assertNotVisible("{$base}validator3"); - $this->click("{$base}list3_c3"); - $this->clickAndWait("{$base}submit1"); + $this->byId("{$base}list3_c3")->click(); + $this->byId("{$base}submit1")->click(); $this->pause(200); $this->assertNotVisible("{$base}validator1"); $this->assertNotVisible("{$base}validator2"); diff --git a/tests/FunctionalTests/validators/tests/ValidationSummaryTestCase.php b/tests/FunctionalTests/validators/tests/ValidationSummaryTestCase.php index 0ee8c27c..d4c44a34 100755 --- a/tests/FunctionalTests/validators/tests/ValidationSummaryTestCase.php +++ b/tests/FunctionalTests/validators/tests/ValidationSummaryTestCase.php @@ -8,36 +8,36 @@ class ValidationSummaryTestCase extends PradoGenericSelenium2Test $base = "ctl0_Content_"; $this->url("validators/index.php?page=ValidationSummary"); - $this->assertTextPresent("Validation Summary Test", ""); + $this->assertContains("Validation Summary Test", $this->source()); //$this->assertText("{$base}summary1", ""); //$this->assertText("{$base}summary2", ""); - $this->click("//input[@type='submit' and @value='Create New Account']", ""); + $this->byXPath("//input[@type='submit' and @value='Create New Account']")->click(); $this->assertVisible("{$base}summary1"); $this->assertNotVisible("{$base}summary2"); - $this->click("//input[@type='submit' and @value='Sign In']", ""); + $this->byXPath("//input[@type='submit' and @value='Sign In']")->click(); $this->assertNotVisible("{$base}summary1"); $this->assertVisible("{$base}summary2"); $this->type("{$base}Username", "qwe"); $this->type("{$base}Password", "ewwq"); - $this->click("//input[@type='submit' and @value='Sign In']", ""); + $this->byXPath("//input[@type='submit' and @value='Sign In']")->click(); $this->assertNotVisible("{$base}summary1"); $this->assertVisible("{$base}summary2"); - /*$this->clickAndWait("//input[@type='submit' and @value='Create New Account']", ""); + /*$this->byXPath("//input[@type='submit' and @value='Create New Account']")->click(); $this->type("{$base}UserID", "123"); $this->type("{$base}Pass", "123"); - $this->clickAndWait("//input[@type='submit' and @value='Sign In']", ""); + $this->byXPath("//input[@type='submit' and @value='Sign In']")->click(); //$this->assertText("{$base}summary1", ""); //$this->assertText("{$base}summary2", ""); - $this->clickAndWait("//input[@type='submit' and @value='Create New Account']", ""); + $this->byXPath("//input[@type='submit' and @value='Create New Account']")->click(); //$this->assertText("{$base}summary1", ""); //$this->assertText("{$base}summary2", ""); $this->type("{$base}Password", ""); - $this->click("//input[@type='submit' and @value='Create New Account']", ""); + $this->byXPath("//input[@type='submit' and @value='Create New Account']")->click(); $this->assertVisible("{$base}summary1"); $this->assertNotVisible("{$base}summary2"); diff --git a/tests/test_tools/PradoGenericSelenium2Test.php b/tests/test_tools/PradoGenericSelenium2Test.php index ec948f7f..c81f6e9a 100644 --- a/tests/test_tools/PradoGenericSelenium2Test.php +++ b/tests/test_tools/PradoGenericSelenium2Test.php @@ -39,7 +39,6 @@ class PradoGenericSelenium2Test extends PHPUnit_Extensions_Selenium2TestCase static $baseurl='http://127.0.0.1/prado-master/tests/FunctionalTests/'; static $timeout=5; //seconds - static $wait=1000; //msecs protected function setUp() { @@ -48,22 +47,7 @@ class PradoGenericSelenium2Test extends PHPUnit_Extensions_Selenium2TestCase $this->setSeleniumServerRequestsTimeout(static::$timeout); } - protected function verifyTitle($txt) - { - $this->assertEquals($txt, $this->title()); - } - - protected function assertTextPresent($txt) - { - if(strpos($txt, 'regexp:')===0) - { - $this->assertRegExp('/'.substr($txt, 7).'/', $this->source()); - } else { - $this->assertContains($txt, $this->source()); - } - } - - protected function verifyAttribute($idattr, $txt) + protected function assertAttribute($idattr, $txt) { list($id, $attr) = explode('@', $idattr); @@ -78,21 +62,6 @@ class PradoGenericSelenium2Test extends PHPUnit_Extensions_Selenium2TestCase } } - protected function assertTextNotPresent($txt) - { - $this->assertNotContains($txt, $this->source()); - } - - protected function assertChecked($id) - { - $this->assertTrue($this->getElement($id)->selected()); - } - - protected function assertNotChecked($id) - { - $this->assertFalse($this->getElement($id)->selected()); - } - protected function getElement($id) { if(strpos($id, 'xpath=')===0) @@ -140,23 +109,6 @@ class PradoGenericSelenium2Test extends PHPUnit_Extensions_Selenium2TestCase $this->assertTrue($this->getElement($id)!==null); } - protected function assertAlert($txt) - { - $this->assertEquals($txt, $this->alertText()); - $this->acceptAlert(); - } - - protected function verifyConfirmation($txt) - { - $this->assertAlert($txt); - } - - protected function verifyConfirmationDismiss($txt) - { - $this->assertEquals($txt, $this->alertText()); - $this->dismissAlert(); - } - protected function assertElementNotPresent($id) { try { @@ -193,24 +145,7 @@ class PradoGenericSelenium2Test extends PHPUnit_Extensions_Selenium2TestCase $element->value($txt); // trigger onblur() event - $this->clickAt('css=body', '1,1'); - } - - protected function click($id, $foo='bar') - { - $this->getElement($id)->click(); - } - - protected function clickAt($id, $coords) - { -// list($x, $y) = explode(',', $coords); - $this->moveto(array( - 'element' => $this->getElement($id), -// 'xoffset' => intval($x), -// 'yoffset' => intval($y), - )); - - parent::click(); + $this->byCssSelector('body')->click(); } protected function mouseOver($id) @@ -231,22 +166,12 @@ class PradoGenericSelenium2Test extends PHPUnit_Extensions_Selenium2TestCase )); } - protected function clickAndWait($id, $foo='bar') - { - $this->click($id, $foo); - } - protected function select($id, $value) { $select = parent::select($this->getElement($id)); $select->clearSelectedOptions(); - if(strpos($value, 'label=')===0) - { - $select->selectOptionByLabel(substr($value, 6)); - } else { - $select->selectOptionByLabel($value); - } + $select->selectOptionByLabel($value); } protected function selectAndWait($id, $value) @@ -256,14 +181,7 @@ class PradoGenericSelenium2Test extends PHPUnit_Extensions_Selenium2TestCase protected function addSelection($id, $value) { - $select = parent::select($this->getElement($id)); - - if(strpos($value, 'label=')===0) - { - $select->selectOptionByLabel(substr($value, 6)); - } else { - $select->selectOptionByLabel($value); - } + parent::select($this->getElement($id))->selectOptionByLabel($value); } protected function getSelectedLabels($id) -- cgit v1.2.3 From 94e34ad61868dc6a28de6f1a708d63ae0b6b4cf9 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Tue, 25 Mar 2014 22:41:33 +0100 Subject: More selenium2 tests porting (cherry picked from commit 68bbb645ba5be61c2e3024ac3943c7346b30f1f2) Conflicts: tests/FunctionalTests/tickets/tests/Ticket587TestCase.php tests/FunctionalTests/tickets/tests/Ticket719TestCase.php --- .../ActiveRatingListTestCase.php | 6 +-- .../quickstart/Controls/TextBoxTestCase.php | 14 +++---- .../tickets/protected/pages/Ticket290.page | 9 ++--- .../tickets/protected/pages/Ticket586.page | 1 - .../tickets/protected/pages/Ticket719.page | 3 +- .../tickets/protected/pages/ToggleTest.page | 0 .../tickets/protected/pages/ToggleTest.php | 0 .../tickets/tests/Ticket205TestCase.php | 13 +++++-- .../tickets/tests/Ticket578TestCase.php | 7 +++- .../tickets/tests/Ticket587TestCase.php | 1 - .../tickets/tests/Ticket622TestCase.php | 7 ++-- .../tickets/tests/Ticket719TestCase.php | 17 +++++---- .../tickets/tests/Ticket823TestCase.php | 2 +- .../tickets/tests/Ticket876TestCase.php | 4 +- tests/test_tools/PradoGenericSelenium2Test.php | 44 +++++----------------- 15 files changed, 57 insertions(+), 71 deletions(-) mode change 100644 => 100755 tests/FunctionalTests/tickets/protected/pages/ToggleTest.page mode change 100644 => 100755 tests/FunctionalTests/tickets/protected/pages/ToggleTest.php mode change 100644 => 100755 tests/test_tools/PradoGenericSelenium2Test.php (limited to 'tests/FunctionalTests/tickets/protected') diff --git a/tests/FunctionalTests/active-controlstests/ActiveRatingListTestCase.php b/tests/FunctionalTests/active-controlstests/ActiveRatingListTestCase.php index 6b2f6f97..2b9a0166 100755 --- a/tests/FunctionalTests/active-controlstests/ActiveRatingListTestCase.php +++ b/tests/FunctionalTests/active-controlstests/ActiveRatingListTestCase.php @@ -207,7 +207,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test $this->assertElementPresent("//input[@id='{$base}RatingList_c4']/../../../td[contains(@class, 'rating')]"); $this->assertElementPresent("//input[@id='{$base}RatingList_c5']/../../../td[contains(@class, 'rating')]"); - $this->mouseOver("//input[@id='{$base}RatingList_c4']/../.."); + $this->moveto($this->byXPath("//input[@id='{$base}RatingList_c4']/../..")); $this->assertText("{$base}Status", "Excellent"); $this->assertElementPresent("//input[@id='{$base}RatingList_c0']/../../../td[contains(@class, 'rating_hover')]"); $this->assertElementPresent("//input[@id='{$base}RatingList_c1']/../../../td[contains(@class, 'rating_hover')]"); @@ -217,7 +217,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test $this->assertElementPresent("//input[@id='{$base}RatingList_c5']/../../../td[not(contains(@class, 'rating_hover'))]"); $this->assertElementPresent("//input[@id='{$base}RatingList_c5']/../../../td[contains(@class, 'rating')]"); - $this->mouseOut("//input[@id='{$base}RatingList_c4']/../.."); + $this->moveto($this->byCssSelector('body')); $this->assertText("{$base}Status", "CaptionID='Status'"); $this->assertElementPresent("//input[@id='{$base}RatingList_c0']/../../../td[contains(@class, 'rating_selected')]"); $this->assertElementPresent("//input[@id='{$base}RatingList_c1']/../../../td[contains(@class, 'rating_selected')]"); @@ -228,7 +228,7 @@ class ActiveRatingListTestCase extends PradoGenericSelenium2Test $this->assertElementPresent("//input[@id='{$base}RatingList_c5']/../../../td[contains(@class, 'rating')]"); - $this->mouseOver("//input[@id='{$base}RatingList_c1']/../.."); + $this->moveto($this->byXPath("//input[@id='{$base}RatingList_c1']/../..")); $this->assertText("{$base}Status", "Fair"); $this->byXPath("//input[@id='{$base}RatingList_c1']/../..")->click(); diff --git a/tests/FunctionalTests/quickstart/Controls/TextBoxTestCase.php b/tests/FunctionalTests/quickstart/Controls/TextBoxTestCase.php index 52095321..3865e33d 100755 --- a/tests/FunctionalTests/quickstart/Controls/TextBoxTestCase.php +++ b/tests/FunctionalTests/quickstart/Controls/TextBoxTestCase.php @@ -30,15 +30,15 @@ class QuickstartTextBoxTestCase extends PradoGenericSelenium2Test // auto postback textbox, CausesValidation=false $this->assertValue("ctl0\$body\$ctl6", "change me"); - $this->type("ctl0\$body\$ctl6", "change mes"); + $this->typeSpecial("ctl0\$body\$ctl6", "change mes"); $this->assertValue("ctl0\$body\$ctl6", "text changed"); // auto postback textbox, CausesValidation=true $this->assertNotVisible('ctl0_body_ctl7'); - $this->type("ctl0\$body\$TextBox3", "test"); + $this->typeSpecial("ctl0\$body\$TextBox3", "test"); // $this->pause(1000); $this->assertVisible('ctl0_body_ctl7'); - $this->type("ctl0\$body\$TextBox3", "non test"); + $this->typeSpecial("ctl0\$body\$TextBox3", "non test"); $this->assertNotVisible('ctl0_body_ctl7'); // submitting textbox with a button @@ -48,7 +48,7 @@ class QuickstartTextBoxTestCase extends PradoGenericSelenium2Test // SafeText $this->assertText("ctl0_body_Output","test"); - $this->type("ctl0\$body\$TextBox2","malicious code"); + $this->typeSpecial("ctl0\$body\$TextBox2","malicious code"); $this->assertText("ctl0_body_Output","malicious code"); // password @@ -72,7 +72,7 @@ End of message // auto postback textbox $this->assertValue("ctl0\$body\$ctl14", "change me"); - $this->type("ctl0\$body\$ctl14", "change mes"); + $this->typeSpecial("ctl0\$body\$ctl14", "change mes"); $this->assertValue("ctl0\$body\$ctl14", "text changed"); $this->assertValue("ctl0\$body\$ctl10", "This is a\nmultiline\ntextbox."); $this->assertValue("ctl0\$body\$ctl11", "This is a multiline text box. @@ -82,10 +82,10 @@ End of message // textbox associated with a validator $this->assertNotVisible('ctl0_body_ctl15'); - $this->type("ctl0\$body\$MultiTextBox3", "demo"); + $this->typeSpecial("ctl0\$body\$MultiTextBox3", "demo"); // $this->pause(1000); $this->assertVisible('ctl0_body_ctl15'); - $this->type("ctl0\$body\$MultiTextBox3", "non demo"); + $this->typeSpecial("ctl0\$body\$MultiTextBox3", "non demo"); $this->assertNotVisible('ctl0_body_ctl15'); } } diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket290.page b/tests/FunctionalTests/tickets/protected/pages/Ticket290.page index e9d40b92..3d4bf647 100755 --- a/tests/FunctionalTests/tickets/protected/pages/Ticket290.page +++ b/tests/FunctionalTests/tickets/protected/pages/Ticket290.page @@ -1,18 +1,17 @@ -

    Needs manual testing

    - + - - - diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket586.page b/tests/FunctionalTests/tickets/protected/pages/Ticket586.page index 29751cab..31bc7237 100755 --- a/tests/FunctionalTests/tickets/protected/pages/Ticket586.page +++ b/tests/FunctionalTests/tickets/protected/pages/Ticket586.page @@ -1,5 +1,4 @@ -

    Needs manual testing

    diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket719.page b/tests/FunctionalTests/tickets/protected/pages/Ticket719.page index b36d2d66..3f2bc17b 100755 --- a/tests/FunctionalTests/tickets/protected/pages/Ticket719.page +++ b/tests/FunctionalTests/tickets/protected/pages/Ticket719.page @@ -1,5 +1,4 @@ -

    Needs manual testing