From bdfd9f07f17de1751a7e4d94940acb426af4be77 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 6 Aug 2015 18:12:45 +0200 Subject: Fix tests work around stale references by explicitly waiting --- .../FunctionalTests/active-controls/tests/ActiveButtonTestCase.php | 2 +- .../active-controls/tests/ActiveCheckBoxListTestCase.php | 2 +- .../active-controls/tests/ActiveCheckBoxTestCase.php | 2 +- .../active-controls/tests/ActiveControlExpressTagTestCase.php | 4 ++-- .../active-controls/tests/ActiveDatePickerTestCase.php | 2 +- .../active-controls/tests/ActiveDropDownListTestCase.php | 2 +- .../active-controls/tests/ActiveHiddenFieldTestCase.php | 2 +- .../active-controls/tests/ActiveHyperLinkTestCase.php | 2 +- .../active-controls/tests/ActiveImageButtonTestCase.php | 2 +- .../active-controls/tests/ActiveLinkButtonTestCase.php | 2 +- .../active-controls/tests/ActiveListBoxMasterTestCase.php | 2 +- .../active-controls/tests/ActiveListBoxTestCase.php | 2 +- .../FunctionalTests/active-controls/tests/ActivePanelTestCase.php | 6 +++--- .../active-controls/tests/ActiveRadioButtonListTestCase.php | 2 +- .../active-controls/tests/ActiveRadioButtonTestCase.php | 2 +- .../FunctionalTests/active-controls/tests/AutoCompleteTestCase.php | 6 +++--- tests/FunctionalTests/active-controls/tests/CalculatorTestCase.php | 2 +- .../active-controls/tests/CallbackAdapterTestCase.php | 7 +++++-- .../active-controls/tests/CallbackOptionsTestCase.php | 2 +- .../active-controls/tests/CustomTemplateTestCase.php | 4 ++-- .../active-controls/tests/DelayedCallbackTestCase.php | 2 +- .../FunctionalTests/active-controls/tests/EventTriggerTestCase.php | 2 +- .../active-controls/tests/NestedActiveControlsTestCase.php | 6 +++--- .../FunctionalTests/active-controls/tests/PopulateListTestCase.php | 2 +- .../FunctionalTests/active-controls/tests/PostLoadingTestCase.php | 6 +++--- .../active-controls/tests/ReplaceContentTestCase.php | 4 ++-- .../active-controls/tests/TextBoxCallbackTestCase.php | 2 +- .../active-controls/tests/TextBoxGroupValidationTestCase.php | 2 +- .../active-controls/tests/TimeTriggeredCallbackTestCase.php | 2 +- .../active-controls/tests/ValueTriggerCallbackTestCase.php | 2 +- 30 files changed, 45 insertions(+), 42 deletions(-) (limited to 'tests/FunctionalTests/active-controls') diff --git a/tests/FunctionalTests/active-controls/tests/ActiveButtonTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveButtonTestCase.php index acbdbb2a..9054f098 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->assertContains("TActiveButton Functional Test", $this->source()); + $this->assertSourceContains("TActiveButton Functional Test"); $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 c032c084..3201b8a9 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveCheckBoxListTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveCheckBoxListTestCase.php @@ -6,7 +6,7 @@ class ActiveCheckBoxListTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=TActiveCheckBoxListTest"); - $this->assertContains("TActiveCheckBoxList Test Case", $this->source()); + $this->assertSourceContains("TActiveCheckBoxList Test Case"); $this->assertText("{$base}label1", "Label 1"); diff --git a/tests/FunctionalTests/active-controls/tests/ActiveCheckBoxTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveCheckBoxTestCase.php index 782b35be..82f94b06 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveCheckBoxTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveCheckBoxTestCase.php @@ -6,7 +6,7 @@ class ActiveCheckBoxTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveCheckBoxTest"); - $this->assertContains("Active CheckBox Test", $this->source()); + $this->assertSourceContains("Active CheckBox Test"); $this->assertText("{$base}checkbox1_label", "CheckBox 1"); $this->assertText("{$base}checkbox2_label", "CheckBox 2"); diff --git a/tests/FunctionalTests/active-controls/tests/ActiveControlExpressTagTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveControlExpressTagTestCase.php index c41988cc..e9e5f678 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveControlExpressTagTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveControlExpressTagTestCase.php @@ -6,8 +6,8 @@ class ActiveControlExpressionTagTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url('active-controls/index.php?page=ActiveControlExpressionTag'); - $this->assertContains('Active Control With Expression Tag Test', $this->source()); - $this->assertNotContains('Text box content:', $this->source()); + $this->assertSourceContains('Active Control With Expression Tag Test'); + $this->assertSourceNotContains('Text box content:'); $this->type("{$base}textbox1", 'Hello world'); $this->byId("{$base}button1")->click(); diff --git a/tests/FunctionalTests/active-controls/tests/ActiveDatePickerTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveDatePickerTestCase.php index 570a6717..f81e2129 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveDatePickerTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveDatePickerTestCase.php @@ -5,7 +5,7 @@ class ActiveDatePickerTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveDatePicker"); - $this->assertContains("TActiveDatePicker test", $this->source()); + $this->assertSourceContains("TActiveDatePicker test"); $this->assertText("{$base}status", ""); $this->assertValue("{$base}datepicker", date('m-d-Y')); $this->byId("{$base}increaseButton")->click(); diff --git a/tests/FunctionalTests/active-controls/tests/ActiveDropDownListTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveDropDownListTestCase.php index cb8c953f..a40f45b0 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveDropDownListTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveDropDownListTestCase.php @@ -6,7 +6,7 @@ class ActiveDropDownListTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveDropDownList"); - $this->assertContains('Active Drop Down List Test Case', $this->source()); + $this->assertSourceContains('Active Drop Down List Test Case'); $this->assertText("{$base}label1", "Label 1"); diff --git a/tests/FunctionalTests/active-controls/tests/ActiveHiddenFieldTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveHiddenFieldTestCase.php index d4b82068..690df3f5 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveHiddenFieldTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveHiddenFieldTestCase.php @@ -9,7 +9,7 @@ class ActiveHiddenFieldTestCase extends PradoGenericSelenium2Test $fieldEmpty = 'No longer empty'; $fieldUsed = 'My value'; - $this->assertContains('Value of current hidden field', $this->source()); + $this->assertSourceContains('Value of current hidden field'); $this->byId("{$base}Button1")->click(); $this->pause(800); $this->assertText("{$base}ResponseLabel", $fieldEmpty); diff --git a/tests/FunctionalTests/active-controls/tests/ActiveHyperLinkTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveHyperLinkTestCase.php index 6329d826..f6117b9d 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveHyperLinkTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveHyperLinkTestCase.php @@ -6,7 +6,7 @@ class ActiveHyperLinkTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveHyperLinkTest"); - $this->assertContains("Active HyperLink Test Case", $this->source()); + $this->assertSourceContains("Active HyperLink Test Case"); $this->assertText("{$base}link1", "Link 1"); diff --git a/tests/FunctionalTests/active-controls/tests/ActiveImageButtonTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveImageButtonTestCase.php index 0ef2e082..e008d53d 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveImageButtonTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveImageButtonTestCase.php @@ -6,7 +6,7 @@ class ActiveImageButtonTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveImageButtonTest"); - $this->assertContains("TActiveImageButton Functional Test", $this->source()); + $this->assertSourceContains("TActiveImageButton Functional Test"); $this->assertText("{$base}label1", "Label 1"); $this->byId("{$base}image1")->click(); $this->pause(800); diff --git a/tests/FunctionalTests/active-controls/tests/ActiveLinkButtonTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveLinkButtonTestCase.php index 1f7c40ea..09be4e7a 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveLinkButtonTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveLinkButtonTestCase.php @@ -6,7 +6,7 @@ class ActiveLinkButtonTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveLinkButtonTest"); - $this->assertContains("TActiveLinkButton Functional Test", $this->source()); + $this->assertSourceContains("TActiveLinkButton Functional Test"); $this->assertText("{$base}label1", "Label 1"); $this->byId("{$base}button2")->click(); $this->pause(800); diff --git a/tests/FunctionalTests/active-controls/tests/ActiveListBoxMasterTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveListBoxMasterTestCase.php index be2bf174..a5537e34 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveListBoxMasterTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveListBoxMasterTestCase.php @@ -5,7 +5,7 @@ class ActiveListBoxMasterTestCase extends PradoGenericSelenium2Test function test() { $this->url("active-controls/index.php?page=ActiveListBoxMasterTest"); - $this->assertContains('Active List Box Functional Test', $this->source()); + $this->assertSourceContains('Active List Box Functional Test'); $base = 'ctl0_body_'; diff --git a/tests/FunctionalTests/active-controls/tests/ActiveListBoxTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveListBoxTestCase.php index 1830f5ab..ee5c779e 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveListBoxTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveListBoxTestCase.php @@ -6,7 +6,7 @@ class ActiveListBoxTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveListBoxTest"); - $this->assertContains('Active List Box Functional Test', $this->source()); + $this->assertSourceContains('Active List Box Functional Test'); $this->assertText("{$base}label1", "Label 1"); diff --git a/tests/FunctionalTests/active-controls/tests/ActivePanelTestCase.php b/tests/FunctionalTests/active-controls/tests/ActivePanelTestCase.php index 73ab3ad0..db3999c3 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->assertContains("Active Panel replacement tests", $this->source()); - $this->assertNotContains('Something lalala', $this->source()); + $this->assertSourceContains("Active Panel replacement tests"); + $this->assertSourceNotContains('Something lalala'); $this->byId("div1")->click(); $this->pause(800); - $this->assertContains("Something lalala", $this->source()); + $this->assertSourceContains("Something lalala"); } } diff --git a/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonListTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonListTestCase.php index 82408732..e6e13b52 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonListTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonListTestCase.php @@ -6,7 +6,7 @@ class ActiveRadioButtonListTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveRadioButtonListTest"); - $this->assertContains("TActiveRadioButtonList Test Case", $this->source()); + $this->assertSourceContains("TActiveRadioButtonList Test Case"); $this->assertText("{$base}label1", "Label 1"); diff --git a/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonTestCase.php index 7606e46b..704e58dc 100755 --- a/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonTestCase.php @@ -6,7 +6,7 @@ class ActiveRadioButtonTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ActiveRadioButtonTest"); - $this->assertContains("Active Radio Button Test", $this->source()); + $this->assertSourceContains("Active Radio Button Test"); $this->assertText("{$base}label1", 'Label 1'); $this->assertFalse($this->byId("{$base}radio1")->selected()); diff --git a/tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php b/tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php index 3fbf1e5e..1fc3073a 100755 --- a/tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php @@ -6,19 +6,19 @@ class AutoCompleteTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=AutoCompleteTest"); - $this->assertContains("TAutoComplete Test", $this->source()); + $this->assertSourceContains("TAutoComplete Test"); $this->assertText("{$base}label1", "Label 1"); $this->byId("{$base}textbox3")->click(); $this->keys('a'); $this->pause(800); - $this->assertContains('Andorra', $this->source()); + $this->assertSourceContains('Andorra'); $this->assertText("{$base}label1", "suggestion for a"); $this->keys('u'); $this->pause(800); - $this->assertContains('Australia', $this->source()); + $this->assertSourceContains('Australia'); $this->assertText("{$base}label1", "suggestion for au"); $this->byCssSelector("#{$base}textbox3_result ul li")->click(); diff --git a/tests/FunctionalTests/active-controls/tests/CalculatorTestCase.php b/tests/FunctionalTests/active-controls/tests/CalculatorTestCase.php index 9bef7d00..d1496ef4 100755 --- a/tests/FunctionalTests/active-controls/tests/CalculatorTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/CalculatorTestCase.php @@ -6,7 +6,7 @@ class CalculatorTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=Calculator"); - $this->assertContains("Callback Enabled Calculator", $this->source()); + $this->assertSourceContains("Callback Enabled Calculator"); $this->assertNotVisible("{$base}summary"); $this->byId("{$base}sum")->click(); diff --git a/tests/FunctionalTests/active-controls/tests/CallbackAdapterTestCase.php b/tests/FunctionalTests/active-controls/tests/CallbackAdapterTestCase.php index d5d112d8..9f825e09 100755 --- a/tests/FunctionalTests/active-controls/tests/CallbackAdapterTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/CallbackAdapterTestCase.php @@ -6,9 +6,10 @@ class CallbackAdapterTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=ControlAdapterTest"); - $this->assertContains('Control Adapter - State Tracking Tests', $this->source()); + $this->assertSourceContains('Control Adapter - State Tracking Tests'); $this->byId("{$base}button2")->click(); + $this->pause(50); $this->assertEquals('ok', $this->alertText()); $this->acceptAlert(); @@ -22,10 +23,12 @@ class CallbackAdapterTestCase extends PradoGenericSelenium2Test $this->pause(800); $this->byId("{$base}button1")->click(); + $this->pause(50); $this->assertEquals('haha!', $this->alertText()); $this->acceptAlert(); $this->byId("{$base}button2")->click(); + $this->pause(50); $this->assertEquals('ok', $this->alertText()); $this->acceptAlert(); $this->pause(500); @@ -36,7 +39,7 @@ class CallbackAdapterTestCase extends PradoGenericSelenium2Test function testIE() { $this->url("active-controls/index.php?page=ControlAdapterTest"); - $this->assertContains('Control Adapter - State Tracking Tests', $this->source()); + $this->assertSourceContains('Control Adapter - State Tracking Tests'); $this->byId("{$base}button2")->click(); $this->assertEquals('ok', $this->alertText()); diff --git a/tests/FunctionalTests/active-controls/tests/CallbackOptionsTestCase.php b/tests/FunctionalTests/active-controls/tests/CallbackOptionsTestCase.php index 4c2c7070..ed7532e1 100755 --- a/tests/FunctionalTests/active-controls/tests/CallbackOptionsTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/CallbackOptionsTestCase.php @@ -6,7 +6,7 @@ class CallbackOptionsTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=CallbackOptionsTest"); - $this->assertContains("TCallbackOptions Test", $this->source()); + $this->assertSourceContains("TCallbackOptions Test"); $this->assertText("label1", "Label 1"); $this->assertText("label2", "Label 2"); diff --git a/tests/FunctionalTests/active-controls/tests/CustomTemplateTestCase.php b/tests/FunctionalTests/active-controls/tests/CustomTemplateTestCase.php index 3b594b39..1b5ffea2 100755 --- a/tests/FunctionalTests/active-controls/tests/CustomTemplateTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/CustomTemplateTestCase.php @@ -6,7 +6,7 @@ class CustomTemplateTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url('active-controls/index.php?page=CustomTemplateControlTest'); - $this->assertContains('Add Dynamic Custom TTemplateControl Test', $this->source()); + $this->assertSourceContains('Add Dynamic Custom TTemplateControl Test'); $this->assertText("{$base}label1", 'Label 1'); $this->type("{$base}foo", 'Foo Bar!'); @@ -14,7 +14,7 @@ class CustomTemplateTestCase extends PradoGenericSelenium2Test $this->pause(800); $this->assertVisible("{$base}ctl0_ThePanel"); - $this->assertContains("Client ID: {$base}ctl0_ThePanel", $this->source()); + $this->assertSourceContains("Client ID: {$base}ctl0_ThePanel"); $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 49c268ad..406d5ffa 100755 --- a/tests/FunctionalTests/active-controls/tests/DelayedCallbackTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/DelayedCallbackTestCase.php @@ -6,7 +6,7 @@ class DelayedCallbackTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=DelayedCallback"); - $this->assertContains("Delayed Callback Test", $this->source()); + $this->assertSourceContains("Delayed Callback Test"); $this->assertText("{$base}status", ""); $this->byId("{$base}button1")->click(); diff --git a/tests/FunctionalTests/active-controls/tests/EventTriggerTestCase.php b/tests/FunctionalTests/active-controls/tests/EventTriggerTestCase.php index 7cc9a3bd..3c5a5457 100755 --- a/tests/FunctionalTests/active-controls/tests/EventTriggerTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/EventTriggerTestCase.php @@ -6,7 +6,7 @@ class EventTriggerTestCase extends PradoGenericSelenium2Test { $base = "ctl0_Content_"; $this->url("active-controls/index.php?page=EventTriggeredCallback"); - $this->assertContains("Event Triggered Callback Test", $this->source()); + $this->assertSourceContains("Event Triggered Callback Test"); $this->assertText("{$base}label1", 'Label 1'); diff --git a/tests/FunctionalTests/active-controls/tests/NestedActiveControlsTestCase.php b/tests/FunctionalTests/active-controls/tests/NestedActiveControlsTestCase.php index f08a6f78..94e3fac6 100755 --- a/tests/FunctionalTests/active-controls/tests/NestedActiveControlsTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/NestedActiveControlsTestCase.php @@ -6,14 +6,14 @@ class NestedActiveControlsTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=NestedActiveControls"); - $this->assertContains("Nested Active Controls Test", $this->source()); + $this->assertSourceContains("Nested Active Controls Test"); $this->assertText("{$base}label1", "Label 1"); $this->assertText("{$base}label2", "Label 2"); - $this->assertNotContains("Label 3", $this->source()); + $this->assertSourceNotContains("Label 3"); $this->byId("div1")->click(); $this->pause(800); - $this->assertContains("Something lalala", $this->source()); + $this->assertSourceContains("Something lalala"); $this->assertText("{$base}label3", "Label 3"); $this->byId("{$base}button1")->click(); diff --git a/tests/FunctionalTests/active-controls/tests/PopulateListTestCase.php b/tests/FunctionalTests/active-controls/tests/PopulateListTestCase.php index e7f7f287..392cf9e6 100755 --- a/tests/FunctionalTests/active-controls/tests/PopulateListTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/PopulateListTestCase.php @@ -6,7 +6,7 @@ class PopulateListTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=PopulateActiveList"); - $this->assertContains("Populate active list controls", $this->source()); + $this->assertSourceContains("Populate active list controls"); $this->assertText("{$base}label1", ""); $this->byId("{$base}button1")->click(); diff --git a/tests/FunctionalTests/active-controls/tests/PostLoadingTestCase.php b/tests/FunctionalTests/active-controls/tests/PostLoadingTestCase.php index 271a2ffb..9bad72e0 100755 --- a/tests/FunctionalTests/active-controls/tests/PostLoadingTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/PostLoadingTestCase.php @@ -6,9 +6,9 @@ class PostLoadingTestCase extends PradoGenericSelenium2Test { $base="ctl0_Content_"; $this->url('active-controls/index.php?page=PostLoadingTest'); - $this->assertContains('PostLoading Test', $this->source()); + $this->assertSourceContains('PostLoading Test'); - $this->assertNotContains('Hello World', $this->source()); + $this->assertSourceNotContains('Hello World'); $this->byId('div1')->click(); $this->pause(800); @@ -16,6 +16,6 @@ class PostLoadingTestCase extends PradoGenericSelenium2Test $this->byId("{$base}MyButton")->click(); $this->pause(800); - $this->assertContains('Result is Hello World', $this->source()); + $this->assertSourceContains('Result is Hello World'); } } diff --git a/tests/FunctionalTests/active-controls/tests/ReplaceContentTestCase.php b/tests/FunctionalTests/active-controls/tests/ReplaceContentTestCase.php index c3345d6a..4a9579f2 100755 --- a/tests/FunctionalTests/active-controls/tests/ReplaceContentTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/ReplaceContentTestCase.php @@ -6,7 +6,7 @@ class ReplaceContentTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url('active-controls/index.php?page=ReplaceContentTest'); - $this->assertContains('Callback Replace Content Test', $this->source()); + $this->assertSourceContains('Callback Replace Content Test'); $this->assertText("{$base}subpanel", 'Sub Panel'); $this->assertText("{$base}panel1", "Main Panel\nSub Panel"); @@ -48,7 +48,7 @@ class ReplaceContentTestCase extends PradoGenericSelenium2Test function testIE() { $this->url('active-controls/index.php?page=ReplaceContentTest'); - $this->assertContains('Callback Replace Content Test', $this->source()); + $this->assertSourceContains('Callback Replace Content Test'); $this->assertText("{$base}subpanel", 'Sub Panel'); $this->assertText("{$base}panel1", 'regexp:Main Panel\s*Sub Panel'); diff --git a/tests/FunctionalTests/active-controls/tests/TextBoxCallbackTestCase.php b/tests/FunctionalTests/active-controls/tests/TextBoxCallbackTestCase.php index 559c80a6..0d7aa0a5 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->assertContains("ActiveTextBox Callback Test", $this->source()); + $this->assertSourceContains("ActiveTextBox Callback Test"); $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 2562a18b..a7bb2ef9 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->assertContains('TextBox AutoPostBack With Group Validation', $this->source()); + $this->assertSourceContains('TextBox AutoPostBack With Group Validation'); $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 741c7a2d..c12f2083 100755 --- a/tests/FunctionalTests/active-controls/tests/TimeTriggeredCallbackTestCase.php +++ b/tests/FunctionalTests/active-controls/tests/TimeTriggeredCallbackTestCase.php @@ -6,7 +6,7 @@ class TimeTriggeredCallbackTestCase extends PradoGenericSelenium2Test { $base='ctl0_Content_'; $this->url("active-controls/index.php?page=TimeTriggeredCallbackTest"); - $this->assertContains("TimeTriggeredCallback + ViewState Tests", $this->source()); + $this->assertSourceContains("TimeTriggeredCallback + ViewState Tests"); $this->assertText("{$base}label1", "ViewState Counter :"); diff --git a/tests/FunctionalTests/active-controls/tests/ValueTriggerCallbackTestCase.php b/tests/FunctionalTests/active-controls/tests/ValueTriggerCallbackTestCase.php index 8b0428a9..421c259d 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->assertContains("Value Trigger Callback Test", $this->source()); + $this->assertSourceContains("Value Trigger Callback Test"); $this->assertText("{$base}label1", 'Label 1'); -- cgit v1.2.3