From 93c4193f4a3c315c7785bf5f9f522c955ef6fce7 Mon Sep 17 00:00:00 2001
From: wei <>
Date: Sat, 5 Aug 2006 00:38:30 +0000
Subject: Fixed #274

---
 .../tickets/protected/pages/Ticket274.page         | 22 ++++++++++++++++++++
 .../tickets/tests/Ticket274TestCase.php            | 24 ++++++++++++++++++++++
 .../validators/tests/DataTypeValidatorTestCase.php |  2 +-
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 tests/FunctionalTests/tickets/protected/pages/Ticket274.page
 create mode 100644 tests/FunctionalTests/tickets/tests/Ticket274TestCase.php

(limited to 'tests/FunctionalTests')

diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket274.page b/tests/FunctionalTests/tickets/protected/pages/Ticket274.page
new file mode 100644
index 00000000..4e1441ed
--- /dev/null
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket274.page
@@ -0,0 +1,22 @@
+<com:TContent ID="Content">
+
+<com:TDatePicker ID="MyDate" 
+		DateFormat="dd/MM/yyyy" 
+		Mode="ImageButton" />
+	<com:TRequiredFieldValidator
+		ID="validator1" 
+		ControlToValidate="MyDate"
+		EnableClientScript="false"
+		ErrorMessage="date required (dd/MM/yyyy)" />
+		
+	<com:TDataTypeValidator
+		ID="validator2"
+		DataType="Date"
+		DateFormat="dd/MM/yyyy"
+		ControlToValidate="MyDate"
+		EnableClientScript="false"
+		ErrorMessage="date must be of the form dd/MM/yyyy" />
+
+	<com:TButton ID="button1" Text="Submit!" />
+	
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php
new file mode 100644
index 00000000..ae976a7f
--- /dev/null
+++ b/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php
@@ -0,0 +1,24 @@
+<?php
+
+class Ticket274TestCase extends SeleniumTestCase
+{
+	function test()
+	{
+		$base = 'ctl0_Content_';
+		$this->open('tickets/index.php?page=Ticket274');
+		$this->assertTitle('Verifying Ticket 274');
+		$this->assertNotVisible($base.'validator1');
+		$this->assertNotVisible($base.'validator2');
+		
+		$this->click($base.'button1');		
+		$this->assertVisible($base.'validator1');
+		$this->assertNotVisible($base.'validator2');
+		
+		$this->type($base.'MyDate', 'asd');
+		$this->click($base.'button1');
+		$this->assertVisible($base.'validator1');
+		$this->assertNotVisible($base.'validator2');		
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/validators/tests/DataTypeValidatorTestCase.php b/tests/FunctionalTests/validators/tests/DataTypeValidatorTestCase.php
index 1ca3de5d..153be373 100644
--- a/tests/FunctionalTests/validators/tests/DataTypeValidatorTestCase.php
+++ b/tests/FunctionalTests/validators/tests/DataTypeValidatorTestCase.php
@@ -10,7 +10,7 @@ class DataTypeValidatorTestCase extends SeleniumTestCase
 		$base = "ctl0_Content_";
 		$this->open("validators/index.php?page=DataTypeValidator", "");
 		$this->verifyTextPresent("Data Type Validator Tests", "");
-		$this->clickAndWait("//input[@type='submit' and @value='submit!']", "");
+		$this->click("//input[@type='submit' and @value='submit!']", "");
 		
 		$this->assertNotVisible("{$base}validator1");
 		$this->assertNotVisible("{$base}validator2");
-- 
cgit v1.2.3