From 94e94e0a8566f23d16658a04c55b0bbfdd6689aa Mon Sep 17 00:00:00 2001
From: "godzilla80@gmx.net" <>
Date: Sun, 14 Feb 2010 01:22:57 +0000
Subject: Merge Branches & Trunk /trunk:r2680,2692,2707-2736
/branches/3.1:r2682-2686,2694-2702,2705,2738-2762
---
.../active-controls/protected/pages/ActiveDatePicker.page | 11 +++++++----
.../active-controls/protected/pages/ActiveDatePicker.php | 6 +++++-
.../active-controls/tests/ActiveDatePickerTestCase.php | 10 ++++++++++
3 files changed, 22 insertions(+), 5 deletions(-)
(limited to 'tests/FunctionalTests/active-controls')
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.page
index 64f37867..88117744 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.page
@@ -1,10 +1,10 @@
-
+
TActiveDatePicker test
-
-
+
+
@@ -18,8 +18,11 @@ ShowCalendar=false
+Partial Calendar
+
+
+
-
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.php b/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.php
index 4897a146..300574aa 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.php
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.php
@@ -17,7 +17,11 @@ class ActiveDatePicker extends TPage {
public function testDatePicker2($sender, $param){
$this->status2->Text = $this->datepicker2->getText();
}
-
+
+ public function testDatePicker3($sender, $param){
+ $this->status3->Text = $this->datepicker3->getText();
+ }
+
public function today ($sender, $param)
{
$this->datepicker->setTimestamp(time());
diff --git a/tests/FunctionalTests/active-controls/tests/ActiveDatePickerTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveDatePickerTestCase.php
index 5faee611..c3b47934 100755
--- a/tests/FunctionalTests/active-controls/tests/ActiveDatePickerTestCase.php
+++ b/tests/FunctionalTests/active-controls/tests/ActiveDatePickerTestCase.php
@@ -104,6 +104,16 @@ class ActiveDatePickerTestCase extends SeleniumTestCase
$this->pause(800);
$dateToCheck=mktime(0,0,0,(int)date('m'),(int)date('d'), 2005);
$this->verifyText("status2", date('m-d-Y', $dateToCheck));
+
+
+ $this->verifyText("status3", "");
+ $dateToCheck=time();
+ $this->verifySelected("datepicker3_month", date('F', $dateToCheck));
+ $this->verifySelected("datepicker3_year", date('Y', $dateToCheck));
+ $this->select("datepicker3_year", 2005);
+ $this->pause(800);
+ $dateToCheck=mktime(0,0,0,(int)date('m'),(int)date('d'), 2005);
+ $this->verifyText("status3", date('m/Y', $dateToCheck));
}
}
--
cgit v1.2.3