merge from 3.0 branch till 1475.

3 files changed, 6 insertions, 3 deletions

diff --git a/tests/FunctionalTests/validators/tests/DatePickerTestCase.php b/tests/FunctionalTests/validators/tests/DatePickerTestCase.php
index 297756c2..95eb88e3 100644
--- a/tests/FunctionalTests/validators/tests/DatePickerTestCase.php
+++ b/tests/FunctionalTests/validators/tests/DatePickerTestCase.php
@@ -17,6 +17,9 @@ class DatePickerTestCase extends SeleniumTestCase
 		$this->click("{$base}submit1");

 		$this->assertVisible("{$base}validator1", "");

 		$this->assertNotVisible("{$base}validator2", "");

+

+		//the range validator is visible because the date is a drop down list

+		//thus has default value != ""

 		$this->assertVisible("{$base}validator4", "");

 		$this->assertVisible("{$base}validator5", "");

 		$this->assertNotVisible("{$base}validator6", "");

@@ -60,4 +63,4 @@ class DatePickerTestCase extends SeleniumTestCase
 

 }

 

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

diff --git a/tests/unit/Collections/TListTest.php b/tests/unit/Collections/TListTest.php
index c9190da6..e090728c 100644
--- a/tests/unit/Collections/TListTest.php
+++ b/tests/unit/Collections/TListTest.php
@@ -185,7 +185,7 @@ class TListTest extends PHPUnit2_Framework_TestCase {
   }
 
   public function testArrayMisc() {
-    $this->assertEquals(1,count($this->list));
+    $this->assertEquals($this->list->Count,count($this->list));
     $this->assertTrue(isset($this->list[1]));
     $this->assertFalse(isset($this->list[2]));
   }
diff --git a/tests/unit/Collections/TMapTest.php b/tests/unit/Collections/TMapTest.php
index af92fd6a..f7661afd 100644
--- a/tests/unit/Collections/TMapTest.php
+++ b/tests/unit/Collections/TMapTest.php
@@ -146,7 +146,7 @@ class TMapTest extends PHPUnit2_Framework_TestCase {
 
 	public function testArrayMisc()
 	{
-		$this->assertEquals(1,count($this->map));
+		$this->assertEquals($this->map->Count,count($this->map));
 		$this->assertTrue(isset($this->map['key1']));
 		$this->assertFalse(isset($this->map['unknown key']));
 	}