From edf2251aca60a970e822079d23933e5b70b26571 Mon Sep 17 00:00:00 2001
From: ctrlaltca <>
Date: Wed, 2 Jan 2013 14:42:24 +0000
Subject: backported all related changes up to 3229 to branch/3.2

---
 tests/unit/Collections/TPriorityMapTest.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'tests/unit/Collections/TPriorityMapTest.php')

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);
     
-- 
cgit v1.2.3