[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [531] trunk/rdfapi-php

[<cw...@us...>]

Revision: 531
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=531&view=rev
Author:   cweiske
Date:     2007-08-16 02:19:14 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
Finishing namespace unit test

Modified Paths:
--------------
    trunk/rdfapi-php/api/model/DbModel.php
    trunk/rdfapi-php/test/unit/Model/dBModel_test.php

Modified: trunk/rdfapi-php/api/model/DbModel.php
===================================================================
--- trunk/rdfapi-php/api/model/DbModel.php	2007-08-16 09:12:27 UTC (rev 530)
+++ trunk/rdfapi-php/api/model/DbModel.php	2007-08-16 09:19:14 UTC (rev 531)
@@ -1267,7 +1267,7 @@
 
 		$rs =& $this->dbConn->execute($sql);
 		if (!$rs)
-		$this->dbConn->errorMsg();
+		  return $this->dbConn->errorMsg();
 	}
 
 

Modified: trunk/rdfapi-php/test/unit/Model/dBModel_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Model/dBModel_test.php	2007-08-16 09:12:27 UTC (rev 530)
+++ trunk/rdfapi-php/test/unit/Model/dBModel_test.php	2007-08-16 09:19:14 UTC (rev 531)
@@ -117,8 +117,8 @@
         $mysql_database->putModel($this->_generateModelLiteral(),self::$strModelUri);
 
         $dbmodel = $mysql_database->getModel(self::$strModelUri);
+
         //no namespaces
-var_dump($dbmodel->getParsedNamespaces());
         $this->assertIdentical(array(), $dbmodel->getParsedNamespaces());
 
         //one namespace
@@ -128,6 +128,56 @@
             $dbmodel->getParsedNamespaces()
         );
 
+        //two namespaces
+        $dbmodel->addNamespace('test2', 'http://test2.org');
+        $this->assertEqual(
+            array(
+                'http://test.org' => 'test',
+                'http://test2.org' => 'test2',
+            ),
+            $dbmodel->getParsedNamespaces()
+        );
+
+        //adding multiple namespaces
+        $dbmodel->addParsedNamespaces(
+            array(
+                'http://test3.org' => 'test3',
+                'http://test4.org' => 'test4',
+            )
+        );
+        $this->assertEqual(
+            array(
+                'http://test.org' => 'test',
+                'http://test2.org' => 'test2',
+                'http://test3.org' => 'test3',
+                'http://test4.org' => 'test4',
+            ),
+            $dbmodel->getParsedNamespaces()
+        );
+
+        //adding empty array
+        $dbmodel->addParsedNamespaces(array());
+        $this->assertEqual(
+            array(
+                'http://test.org' => 'test',
+                'http://test2.org' => 'test2',
+                'http://test3.org' => 'test3',
+                'http://test4.org' => 'test4',
+            ),
+            $dbmodel->getParsedNamespaces()
+        );
+
+        //removing namespace
+        $dbmodel->removeNamespace('http://test2.org');
+        $this->assertEqual(
+            array(
+                'http://test.org' => 'test',
+                'http://test3.org' => 'test3',
+                'http://test4.org' => 'test4',
+            ),
+            $dbmodel->getParsedNamespaces()
+        );
+
         $dbmodel->delete();
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.