Fixed Issue#136

3 files changed, 26 insertions, 1 deletions

diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.page
index ed35293e..64f37867 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.page
@@ -11,6 +11,14 @@
 <com:TActiveButton ID="increaseButton" OnClick="increase" Text="+1" OnCallback="testDatePicker"/>
 <com:TButton ID="toggleButton" OnClick="toggleMode" Text="Toggle input mode (postback)"/>
 </p>
+<p>
+ShowCalendar=false
+</p>
+<p>
+<com:TActiveDatePicker ID="datepicker2" DateFormat="MM-dd-yyyy" OnCallback="testDatePicker2" InputMode="DropDownList" ShowCalendar="false"/>
+<com:TActiveLabel ID="status2" /><br/>
+</p>
+
 

 </com:TForm>
 </body>
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.php b/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.php
index 6d78a664..4897a146 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.php
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.php
@@ -14,6 +14,10 @@ class ActiveDatePicker extends TPage  {
 		$this->status->Text = $this->datepicker->getText();
 	}
 
+	public function testDatePicker2($sender, $param){
+		$this->status2->Text = $this->datepicker2->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 b8e9594e..5faee611 100755
--- a/tests/FunctionalTests/active-controls/tests/ActiveDatePickerTestCase.php
+++ b/tests/FunctionalTests/active-controls/tests/ActiveDatePickerTestCase.php
@@ -35,7 +35,7 @@ class ActiveDatePickerTestCase extends SeleniumTestCase
 		$this->verifyText("status", date('m-d-Y', strtotime('+1 month')));
 		
 		$this->click('toggleButton');
-		$this->pause(1000);
+		$this->pause(2000);
 		
 		$this->click("todayButton");
 		$this->pause(800);
@@ -91,6 +91,19 @@ class ActiveDatePickerTestCase extends SeleniumTestCase
 		$this->verifySelected("datepicker_day", date('d', $dateToCheck));
 		$this->verifySelected("datepicker_year", date('Y', $dateToCheck));
 		$this->verifyText("status", date('m-d-Y', $dateToCheck));
+		
+		$this->click('ctl1');
+		$this->pause(800);
+		
+		$this->verifyText("status2", "");
+		$dateToCheck=time();
+		$this->verifySelected("datepicker2_month", date('m', $dateToCheck));
+		$this->verifySelected("datepicker2_day", date('d', $dateToCheck));
+		$this->verifySelected("datepicker2_year", date('Y', $dateToCheck));
+		$this->select("datepicker2_year", 2005);
+		$this->pause(800);
+		$dateToCheck=mktime(0,0,0,(int)date('m'),(int)date('d'), 2005);
+		$this->verifyText("status2", date('m-d-Y', $dateToCheck));
 	}
 }