From 1ba083b9bf77b334b773b84d4d9e5f44319d17a2 Mon Sep 17 00:00:00 2001
From: wei <>
Date: Mon, 2 Apr 2007 06:19:55 +0000
Subject: Fixed #585, #586

---
 .../active-controls/protected/pages/Callback.page  | 15 ++++++++++++
 .../active-controls/protected/pages/Callback.php   | 13 +++++++++++
 .../tickets/protected/pages/Ticket585.page         | 19 +++++++++++++++
 .../tickets/protected/pages/Ticket585.php          | 18 +++++++++++++++
 .../tickets/protected/pages/Ticket586.page         | 13 +++++++++++
 .../tickets/protected/pages/Ticket586.php          | 11 +++++++++
 .../tickets/tests/Ticket585TestCase.php            | 27 ++++++++++++++++++++++
 .../tickets/tests/Ticket586TestCase.php            | 21 +++++++++++++++++
 8 files changed, 137 insertions(+)
 create mode 100644 tests/FunctionalTests/active-controls/protected/pages/Callback.page
 create mode 100644 tests/FunctionalTests/active-controls/protected/pages/Callback.php
 create mode 100644 tests/FunctionalTests/tickets/protected/pages/Ticket585.page
 create mode 100644 tests/FunctionalTests/tickets/protected/pages/Ticket585.php
 create mode 100644 tests/FunctionalTests/tickets/protected/pages/Ticket586.page
 create mode 100644 tests/FunctionalTests/tickets/protected/pages/Ticket586.php
 create mode 100644 tests/FunctionalTests/tickets/tests/Ticket585TestCase.php
 create mode 100644 tests/FunctionalTests/tickets/tests/Ticket586TestCase.php

(limited to 'tests')

diff --git a/tests/FunctionalTests/active-controls/protected/pages/Callback.page b/tests/FunctionalTests/active-controls/protected/pages/Callback.page
new file mode 100644
index 00000000..d8744760
--- /dev/null
+++ b/tests/FunctionalTests/active-controls/protected/pages/Callback.page
@@ -0,0 +1,15 @@
+<com:TForm>
+
+	<com:TCallback ID="callback1" OnCallback="callback1_Requested" />
+	 <script type="text/javascript">              
+	function do_callback1()
+	{               
+		 var callback =  <%= $this->callback1->ActiveControl->Javascript %>;
+		 callback.dispatch();
+	}       
+	</script>       
+	<div onclick="do_callback1()">Click Me!</div>
+
+	<com:TJavascriptLogger />
+
+</com:TForm>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/Callback.php b/tests/FunctionalTests/active-controls/protected/pages/Callback.php
new file mode 100644
index 00000000..d19d92aa
--- /dev/null
+++ b/tests/FunctionalTests/active-controls/protected/pages/Callback.php
@@ -0,0 +1,13 @@
+<?php
+
+Prado::using('System.Web.UI.ActiveControls.*');
+
+class Callback extends TPage
+{
+	function callback1_Requested()
+	{
+		var_dump("ok!");
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket585.page b/tests/FunctionalTests/tickets/protected/pages/Ticket585.page
new file mode 100644
index 00000000..f5e26f24
--- /dev/null
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket585.page
@@ -0,0 +1,19 @@
+<com:TContent ID="Content">
+
+<com:TDatePicker id="test" />
+<com:TActiveCustomValidator
+	ID="validator1"
+	ControlToValidate="test"
+	OnServerValidate="ChkDate"
+	ErrorMessage="*">		
+	<prop:ClientSide
+		OnValidationError="$('error').innerHTML='Error'"
+		OnValidationSuccess="$('error').innerHTML='Success'"
+		ObserveChanges="false"
+		
+	 />
+</com:TActiveCustomValidator>
+<span id="error"></span>
+<com:TButton ID="button1" Text="ok"/>
+
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket585.php b/tests/FunctionalTests/tickets/protected/pages/Ticket585.php
new file mode 100644
index 00000000..5932146d
--- /dev/null
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket585.php
@@ -0,0 +1,18 @@
+<?php
+Prado::using('System.Web.UI.ActiveControls.*');
+class Ticket585 extends TPage
+{
+
+	public function ChkDate ($sender, $param)
+	{
+		if ($param->Value == "15-03-2007")
+		{
+			$param->IsValid=false;
+		}
+		else
+			$param->IsValid=true;
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket586.page b/tests/FunctionalTests/tickets/protected/pages/Ticket586.page
new file mode 100644
index 00000000..93c27385
--- /dev/null
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket586.page
@@ -0,0 +1,13 @@
+<com:TContent ID="Content">
+
+<com:TPanel DefaultButton="button2" Style="border:1px solid #ccc; padding:2em;">
+
+<com:TTextBox ID="text1" />
+<com:TButton ID="button1" Text="Button 1" OnClick="button_clicked"/>
+<com:TButton ID="button2" Text="Button 2 (default)" OnClick="button_clicked"/>
+<com:TButton ID="button3" Text="Button 3" OnClick="button_clicked" />
+
+<com:TLabel ID="label1" Text="Status" />
+</com:TPanel>
+
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket586.php b/tests/FunctionalTests/tickets/protected/pages/Ticket586.php
new file mode 100644
index 00000000..d6fafd0d
--- /dev/null
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket586.php
@@ -0,0 +1,11 @@
+<?php
+
+class Ticket586 extends TPage
+{
+	function button_clicked($sender, $param)
+	{
+		$this->label1->Text = $sender->Text . ' Clicked!';
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/tests/Ticket585TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket585TestCase.php
new file mode 100644
index 00000000..cbcb7bb2
--- /dev/null
+++ b/tests/FunctionalTests/tickets/tests/Ticket585TestCase.php
@@ -0,0 +1,27 @@
+<?php
+
+class Ticket585TestCase extends SeleniumTestCase
+{
+	function test()
+	{
+		$base = 'ctl0_Content_';
+		$this->open('tickets/index.php?page=Ticket585');
+		$this->verifyTitle("Verifying Ticket 585", "");
+
+		$this->assertText("error", "");
+		$this->assertNotVisible("{$base}validator1");
+
+		$this->click("{$base}button1");
+		$this->pause(800);
+		$this->assertText("error", "Success");
+		$this->assertNotVisible("{$base}validator1");
+
+		$this->type("{$base}test", "15-03-2007");
+		$this->click("{$base}button1");
+		$this->pause(800);
+		$this->assertText("error", "Error");
+		$this->assertVisible("{$base}validator1");
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/tests/Ticket586TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket586TestCase.php
new file mode 100644
index 00000000..4b5619cd
--- /dev/null
+++ b/tests/FunctionalTests/tickets/tests/Ticket586TestCase.php
@@ -0,0 +1,21 @@
+<?php
+
+class Ticket586TestCase extends SeleniumTestCase
+{
+	function test()
+	{
+		$base = 'ctl0_Content_';
+		$this->open('tickets/index.php?page=Ticket586');
+		$this->verifyTitle("Verifying Ticket 586", "");
+
+		$this->assertText("{$base}label1", "Status");
+		$this->clickAndWait("{$base}button1");
+		$this->assertText("{$base}label1", "Button 1 Clicked!");
+
+		$this->type("{$base}text1", "testing");
+		$this->keyDownAndWait("{$base}text1", '\13');
+		$this->assertText("{$base}label1", "Button 2 (default) Clicked!");
+	}
+}
+
+?>
\ No newline at end of file
-- 
cgit v1.2.3