From bdbea906c37e34d944f4b3914189de72835e786a Mon Sep 17 00:00:00 2001
From: Megan Watson <megan@knowledgetree.com>
Date: Thu, 18 Feb 2010 12:12:18 +0200
Subject: [PATCH] Removed assert statements that were breaking the unit tests.

---
 ktapi/KTAPIDocument.inc.php | 11 ++++++++---
 ktapi/KTAPIFolder.inc.php   | 10 +++++++---
 tests/runtests.php          |  4 ++--
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ktapi/KTAPIDocument.inc.php b/ktapi/KTAPIDocument.inc.php
index 5149704..5c01b6f 100644
--- a/ktapi/KTAPIDocument.inc.php
+++ b/ktapi/KTAPIDocument.inc.php
@@ -103,10 +103,15 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 */
 	function &get(&$ktapi, $documentid, $iMetadataVersionId = null)
 	{
-		assert(!is_null($ktapi));
-		assert(is_a($ktapi, 'KTAPI'));
-		assert(is_numeric($documentid));
+	    if(is_null($ktapi) || !is_a($ktapi, 'KTAPI')){
+	        return PEAR::raiseError('A valid KTAPI object is needed');
+	    }
+
+	    if(!is_numeric($documentid)){
+	        return PEAR::raiseError('A valid document id is required');
+	    }
 
+	    // ensure documentid is an integer
 		$documentid += 0;
 
 		$document = &Document::get($documentid, $iMetadataVersionId);
diff --git a/ktapi/KTAPIFolder.inc.php b/ktapi/KTAPIFolder.inc.php
index 08fd494..50f776b 100755
--- a/ktapi/KTAPIFolder.inc.php
+++ b/ktapi/KTAPIFolder.inc.php
@@ -86,9 +86,13 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 */
 	function get(&$ktapi, $folderid)
 	{
-		assert(!is_null($ktapi));
-		assert(is_a($ktapi, 'KTAPI'));
-		assert(is_numeric($folderid));
+	    if(is_null($ktapi) || !is_a($ktapi, 'KTAPI')){
+	        return PEAR::raiseError('A valid KTAPI object is needed');
+	    }
+
+	    if(!is_numeric($folderid)){
+	        return PEAR::raiseError('A valid folder id is required');
+	    }
 
 		$folderid += 0;
 
diff --git a/tests/runtests.php b/tests/runtests.php
index 39ab51e..22d88e6 100644
--- a/tests/runtests.php
+++ b/tests/runtests.php
@@ -52,9 +52,9 @@ class UnitTests extends TestSuite {
 //        $this->addFile('filelike/testStringFileLike.php');
 
         // Search (2) and indexing
-//        $this->addFile('documentProcessor/testExtracters.php');
+        $this->addFile('documentProcessor/testExtracters.php');
 //        $this->addFile('documentProcessor/testGuidInserter.php');
-//        $this->addFile('search2/testSearch.php');
+        $this->addFile('search2/testSearch.php');
     }
 }
 
--
libgit2 0.21.4