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

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

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

Log Message:
-----------
getParsedNamespaces() should return empty array instead of
 boolean false if there are no namespaces

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 08:57:35 UTC (rev 528)
+++ trunk/rdfapi-php/api/model/DbModel.php	2007-08-16 09:06:06 UTC (rev 529)
@@ -1156,7 +1156,7 @@
 	function getParsedNamespaces(){
 		$sql = "SELECT * FROM namespaces
            WHERE modelID = " .$this->modelID;
-		$temp=false;
+		$temp=array();
 		$res = $this->dbConn->execute($sql);
 		if($res){
 			while (!$res->EOF) {

Modified: trunk/rdfapi-php/test/unit/Model/dBModel_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Model/dBModel_test.php	2007-08-16 08:57:35 UTC (rev 528)
+++ trunk/rdfapi-php/test/unit/Model/dBModel_test.php	2007-08-16 09:06:06 UTC (rev 529)
@@ -13,14 +13,16 @@
  * @access	public
  */
 
-class dBModel_test extends UnitTestCase {
+class dBModel_test extends UnitTestCase
+{
+    protected static $strModelUri = 'http://example.org/rap-unittests-dbmodel';
 
 	function testSize(){
 		$mysql_database = $this->createDatabaseConnection();
 		//$mysql_database->createTables('MySQL');
 		$_SESSION['test']='DbModel size test';
-		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
-		$dbmodel=$mysql_database->getModel('http://www.example.org');
+		$mysql_database->putModel($this->_generateModel(), self::$strModelUri);
+		$dbmodel=$mysql_database->getModel(self::$strModelUri);
 		$this->assertEqual($dbmodel->size(),1);
 	    $dbmodel->delete();
 	}
@@ -29,8 +31,8 @@
 	function testAdd(){
 		$_SESSION['test']='DbModel add test';
 		$mysql_database = $this->createDatabaseConnection();
-		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
-		$dbmodel=$mysql_database->getModel('http://www.example.org');
+		$mysql_database->putModel($this->_generateModel(),self::$strModelUri);
+		$dbmodel=$mysql_database->getModel(self::$strModelUri);
 		$statement=new Statement(new Resource('http://www.example.org/subject2'),new Resource('http://www.example.org/predicate2'),new Resource('http://www.example.org/object2'));
 		$dbmodel->add($statement);
 		$this->assertTrue($dbmodel->contains($statement));
@@ -42,8 +44,8 @@
 	function testRemove(){
 		$_SESSION['test']='DbModel remove test';
 		$mysql_database = $this->createDatabaseConnection();
-		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
-		$dbmodel=$mysql_database->getModel('http://www.example.org');
+		$mysql_database->putModel($this->_generateModel(),self::$strModelUri);
+		$dbmodel=$mysql_database->getModel(self::$strModelUri);
 		$statement=new Statement(new Resource('http://www.example.org/subject2'),new Resource('http://www.example.org/predicate2'),new Resource('http://www.example.org/object2'));
 		$dbmodel->remove($statement);
 		$mod1=$dbmodel->getMemModel();
@@ -55,8 +57,8 @@
 	function testSetBaseUri(){
 		$_SESSION['test']='DbModel setBaseURI test';
 		$mysql_database = $this->createDatabaseConnection();
-		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
-		$dbmodel=$mysql_database->getModel('http://www.example.org');
+		$mysql_database->putModel($this->_generateModel(),self::$strModelUri);
+		$dbmodel=$mysql_database->getModel(self::$strModelUri);
 		$this->assertEqual($dbmodel->baseURI,'http://www.example.org#');
 		$dbmodel->delete();
 	}
@@ -65,8 +67,8 @@
 	function testContains(){
 		$_SESSION['test']='DbModel testContains test';
 		$mysql_database = $this->createDatabaseConnection();
-		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
-		$dbmodel=$mysql_database->getModel('http://www.example.org');
+		$mysql_database->putModel($this->_generateModel(),self::$strModelUri);
+		$dbmodel=$mysql_database->getModel(self::$strModelUri);
 		$stat=new Statement(new Resource('http://www.example.org/subject1'),new Resource('http://www.example.org/predicate1'),new Resource('http://www.example.org/object1'));
 		$stat2=new Statement(new Resource('http://www.example.org/subject2'),new Resource('http://www.example.org/predicate2'),new Resource('http://www.example.org/object2'));
 		$this->assertTrue($dbmodel->contains($stat));
@@ -77,8 +79,8 @@
 	function testContainsAll(){
 		$_SESSION['test']='DbModel testContainsAll test';
 		$mysql_database = $this->createDatabaseConnection();
-		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
-		$dbmodel=$mysql_database->getModel('http://www.example.org');
+		$mysql_database->putModel($this->_generateModel(),self::$strModelUri);
+		$dbmodel=$mysql_database->getModel(self::$strModelUri);
 		$memModel=$this->_generateModel();
 		$this->assertTrue($dbmodel->containsAll($memModel));
 		$dbmodel->delete();
@@ -87,8 +89,8 @@
 	function testContainsAny(){
 		$_SESSION['test']='DbModel testContainsAny test';
 		$mysql_database = $this->createDatabaseConnection();
-		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
-		$dbmodel=$mysql_database->getModel('http://www.example.org');
+		$mysql_database->putModel($this->_generateModel(),self::$strModelUri);
+		$dbmodel=$mysql_database->getModel(self::$strModelUri);
 		$memModel=$this->_generateModel();
 		$this->assertTrue($dbmodel->containsAny($memModel));
 		$dbmodel->delete();
@@ -98,8 +100,8 @@
 	function testLiteral(){
 		$_SESSION['test']='DbModel testContainsAny test';
 		$mysql_database = $this->createDatabaseConnection();
-		$mysql_database->putModel($this->_generateModelLiteral(),'http://www.example.org');
-		$dbmodel=$mysql_database->getModel('http://www.example.org');
+		$mysql_database->putModel($this->_generateModelLiteral(),self::$strModelUri);
+		$dbmodel=$mysql_database->getModel(self::$strModelUri);
 		$memModel=$dbmodel->getMemModel();
 		$stat=$memModel->triples[0];
 		$obj=$stat->getObject();
@@ -108,8 +110,19 @@
 		$dbmodel->delete();
 	}
 
+    function testNamespaces()
+    {
+        $_SESSION['test']='DbModel testNamespaces test';
+        $mysql_database = $this->createDatabaseConnection();
+        $mysql_database->putModel($this->_generateModelLiteral(),self::$strModelUri);
 
+        $dbmodel = $mysql_database->getModel(self::$strModelUri);
+        //no namespaces
+        $this->assertIdentical(array(), $dbmodel->getParsedNamespaces());
 
+    }
+
+
 //===================================================================
 //                helper functions
 //===================================================================


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