Started cleaning tests' selenium2 compatibility layer

1 files changed, 11 insertions, 11 deletions

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");