Removed assert statements that were breaking the unit tests.

Committed by: Megan Watson

Removed assert statements that were breaking the unit tests.
Committed by: Megan Watson
Megan Watson
1 parent 9bb733bd
Showing 3 changed files with 17 additions and 8 deletions
ktapi/KTAPIDocument.inc.php
ktapi/KTAPIFolder.inc.php
tests/runtests.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);
@@ -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;
@@ -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');
     }
 }