From 6dff17fee04f8b8a1f35ec8e9afe65ae32b2684c Mon Sep 17 00:00:00 2001
From: ctrlaltca <>
Date: Sun, 18 Nov 2012 19:08:27 +0000
Subject: Reworked the "test" task in order to make it work again:  - it will
 use the system PHPUnit installation if available (bundled PHPUnit with prado
 is no more a choice)  - fixed tests in order to be compatible with recent
 phpunit versions (currently 3.7)  - dropped old tests referring to unexisting
 components (NOTE: this includes what seems a test suite for an older version
 of SQLMap) Added some svn-ignore properties

---
 tests/unit/Collections/TMapTest.php         |  8 ++++----
 tests/unit/Collections/TPriorityMapTest.php | 13 ++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'tests/unit/Collections')

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