1 files changed, 15 insertions, 14 deletions
diff --git a/tests/FunctionalTests/active-controls/tests/CalculatorTestCase.php b/tests/FunctionalTests/active-controls/tests/CalculatorTestCase.php
index 48960d39..9bef7d00 100755
--- a/tests/FunctionalTests/active-controls/tests/CalculatorTestCase.php
+++ b/tests/FunctionalTests/active-controls/tests/CalculatorTestCase.php
@@ -1,23 +1,24 @@
 <?php
 
-class CalculatorTestCase extends PradoGenericSeleniumTest
+class CalculatorTestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open("active-controls/index.php?page=Calculator");
-		$this->assertTextPresent("Callback Enabled Calculator");
-		$this->assertNotVisible("summary");
-		
-		$this->click("sum");
-		$this->assertVisible("summary");
-		
-		$this->type("a", "2");
-		$this->type("b", "5");
-		
-		$this->click("sum");
+		$base='ctl0_Content_';
+		$this->url("active-controls/index.php?page=Calculator");
+		$this->assertContains("Callback Enabled Calculator", $this->source());
+		$this->assertNotVisible("{$base}summary");
+
+		$this->byId("{$base}sum")->click();
+		$this->assertVisible("{$base}summary");
+
+		$this->type("{$base}a", "2");
+		$this->type("{$base}b", "5");
+
+		$this->byId("{$base}sum")->click();
 		$this->pause(500);
 
-		$this->assertNotVisible("summary");
-		$this->assertValue("c", "7");
+		$this->assertNotVisible("{$base}summary");
+		$this->assertValue("{$base}c", "7");
 	}
 }