branch/3.1: merged bugfixes from trunk/ up to current

3 files changed, 9 insertions, 9 deletions

diff --git a/tests/FunctionalTests/active-controls/tests/ActiveDatePickerTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveDatePickerTestCase.php
index c3b47934..f5915634 100755
--- a/tests/FunctionalTests/active-controls/tests/ActiveDatePickerTestCase.php
+++ b/tests/FunctionalTests/active-controls/tests/ActiveDatePickerTestCase.php
@@ -100,9 +100,9 @@ class ActiveDatePickerTestCase extends SeleniumTestCase
 		$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->select("datepicker2_year", date('Y')+1);
 		$this->pause(800);
-		$dateToCheck=mktime(0,0,0,(int)date('m'),(int)date('d'), 2005);
+		$dateToCheck=mktime(0,0,0,(int)date('m'),(int)date('d'), date('Y')+1);
 		$this->verifyText("status2", date('m-d-Y', $dateToCheck));
 
 
@@ -110,9 +110,9 @@ class ActiveDatePickerTestCase extends SeleniumTestCase
 		$dateToCheck=time();
 		$this->verifySelected("datepicker3_month", date('F', $dateToCheck));
 		$this->verifySelected("datepicker3_year", date('Y', $dateToCheck));
-		$this->select("datepicker3_year", 2005);
+		$this->select("datepicker3_year", date('Y')+1);
 		$this->pause(800);
-		$dateToCheck=mktime(0,0,0,(int)date('m'),(int)date('d'), 2005);
+		$dateToCheck=mktime(0,0,0,(int)date('m'),(int)date('d'), date('Y')+1);
 		$this->verifyText("status3", date('m/Y', $dateToCheck));
 	}
 }
diff --git a/tests/FunctionalTests/tickets/tests/Ticket439TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket439TestCase.php
index 8ba47e87..651e322c 100644
--- a/tests/FunctionalTests/tickets/tests/Ticket439TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket439TestCase.php
@@ -1,4 +1,4 @@
-<?php
+<?php

 

 class Ticket439TestCase extends SeleniumTestCase

 {

@@ -10,7 +10,7 @@ class Ticket439TestCase extends SeleniumTestCase
 		$this->click("{$base}button1");

 		$this->waitForPageToLoad(3000);

 		$this->pause(800);

-		$this->assertTitle("Verifying Ticket Home");

+		$this->assertTitle("Verifying Home");

 	}

-}
+}

 ?>
\ No newline at end of file
diff --git a/tests/simple_unit/Soap/SoapTestCase.php b/tests/simple_unit/Soap/SoapTestCase.php
index 78a6875b..d297ce41 100644
--- a/tests/simple_unit/Soap/SoapTestCase.php
+++ b/tests/simple_unit/Soap/SoapTestCase.php
@@ -21,7 +21,7 @@ class SoapTestCase extends UnitTestCase
 	{

 		$result = $this->getClient()->getContacts();

 		$this->assertEqual(count($result), 1);

-		$obj = $result[0];

+		$obj = $result->Contact;

 		$this->assertEqual($obj->name, "me");

 		$this->assertEqual($obj->id, 1);

 		$this->assertEqual($obj->address->street, "sesamstreet");

@@ -88,4 +88,4 @@ class SoapTestCase extends UnitTestCase
 	}

 }

 

-?>
\ No newline at end of file
+?>