Started cleaning tests' selenium2 compatibility layer

1 files changed, 23 insertions, 23 deletions

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());
 	}
 }