Merge pull request #530 from pradosoft/prado-3.2.43.2.4prado-3.2

Backports for Prado 3.2.4

1 files changed, 26 insertions, 26 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/TabPanelTestCase.php b/tests/FunctionalTests/quickstart/Controls/TabPanelTestCase.php
index d01e824d..13392ca5 100755
--- a/tests/FunctionalTests/quickstart/Controls/TabPanelTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/TabPanelTestCase.php
@@ -1,47 +1,47 @@
 <?php
 
-class QuickstartTabPanelTestCase extends PradoGenericSeleniumTest
+class QuickstartTabPanelTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TTabPanel.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TTabPanel.Home&amp;notheme=true&amp;lang=en");
 
-		$this->verifyTitle("PRADO QuickStart Sample", "");
+		$this->assertEquals("PRADO QuickStart Sample", $this->title());
 
 		// verify initial visibility
-		$this->verifyNotVisible('ctl0_body_View1');		// view 1
-		$this->verifyVisible('ctl0_body_View2');		// view 2
-		$this->verifyNotVisible('ctl0_body_ctl2');		// view 3
+		$this->assertNotVisible('ctl0_body_View1');		// view 1
+		$this->assertVisible('ctl0_body_View2');		// view 2
+		$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->verifyVisible('ctl0_body_View1');		// view 1
-		$this->verifyNotVisible('ctl0_body_View2');		// view 2
-		$this->verifyNotVisible('ctl0_body_ctl2');		// view 3
-		$this->verifyNotVisible('ctl0_body_View11');	// view 11
-		$this->verifyVisible('ctl0_body_View21');		// view 21
+		$this->assertVisible('ctl0_body_View1');		// view 1
+		$this->assertNotVisible('ctl0_body_View2');		// view 2
+		$this->assertNotVisible('ctl0_body_ctl2');		// view 3
+		$this->assertNotVisible('ctl0_body_View11');	// view 11
+		$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->verifyVisible('ctl0_body_View1');		// view 1
-		$this->verifyNotVisible('ctl0_body_View2');		// view 2
-		$this->verifyNotVisible('ctl0_body_ctl2');		// view 3
-		$this->verifyVisible('ctl0_body_View11');		// view 11
-		$this->verifyNotVisible('ctl0_body_View21');	// view 21
+		$this->assertVisible('ctl0_body_View1');		// view 1
+		$this->assertNotVisible('ctl0_body_View2');		// view 2
+		$this->assertNotVisible('ctl0_body_ctl2');		// view 3
+		$this->assertVisible('ctl0_body_View11');		// view 11
+		$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->verifyNotVisible('ctl0_body_View1');		// view 1
-		$this->verifyNotVisible('ctl0_body_View2');		// view 2
-		$this->verifyVisible('ctl0_body_ctl2');			// view 3
+		$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->verifyNotVisible('ctl0_body_View1');		// view 1
-		$this->verifyNotVisible('ctl0_body_View2');		// view 2
-		$this->verifyVisible('ctl0_body_ctl2');			// view 3
+		$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
 	}
 }