Started cleaning tests' selenium2 compatibility layer

1 files changed, 35 insertions, 35 deletions

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