backported all related changes up to 3229 to branch/3.2

2 files changed, 10 insertions, 11 deletions

diff --git a/tests/unit/Collections/TMapTest.php b/tests/unit/Collections/TMapTest.php
index c6a2172c..81062855 100644
--- a/tests/unit/Collections/TMapTest.php
+++ b/tests/unit/Collections/TMapTest.php
@@ -1,7 +1,7 @@
 <?php
 require_once dirname(__FILE__).'/../phpunit.php';
 
-class MapItem {
+class TMapTest_MapItem {
   public $data='data';
 }
 
@@ -14,9 +14,9 @@ class TMapTest extends PHPUnit_Framework_TestCase {
 
   public function setUp() {
     $this->map=new TMap;
-    $this->item1=new MapItem;
-    $this->item2=new MapItem;
-    $this->item3=new MapItem;
+    $this->item1=new TMapTest_MapItem;
+    $this->item2=new TMapTest_MapItem;
+    $this->item3=new TMapTest_MapItem;
     $this->map->add('key1',$this->item1);
     $this->map->add('key2',$this->item2);
   }
diff --git a/tests/unit/Collections/TPriorityMapTest.php b/tests/unit/Collections/TPriorityMapTest.php
index 54ff68b7..c7d56243 100644
--- a/tests/unit/Collections/TPriorityMapTest.php
+++ b/tests/unit/Collections/TPriorityMapTest.php
@@ -1,7 +1,6 @@
 <?php
-require_once dirname(__FILE__).'/../phpunit.php';
 
-class MapItem {
+class TPriorityMapTest_MapItem {
   public $data='data';
 }
 
@@ -16,11 +15,11 @@ class TPriorityMapTest extends PHPUnit_Framework_TestCase {
   public function setUp() {
   	// test that TPriorityMap complies with TMap
     $this->map=new TPriorityMap;
-    $this->item1=new MapItem;
-    $this->item2=new MapItem;
-    $this->item3=new MapItem;
-    $this->item4=new MapItem;
-    $this->item5=new MapItem;
+    $this->item1=new TPriorityMapTest_MapItem;
+    $this->item2=new TPriorityMapTest_MapItem;
+    $this->item3=new TPriorityMapTest_MapItem;
+    $this->item4=new TPriorityMapTest_MapItem;
+    $this->item5=new TPriorityMapTest_MapItem;
     $this->map->add('key1',$this->item1);
     $this->map->add('key2',$this->item2);