rdfapi-php-svn

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

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

Log Message:
-----------
Make DBModel tests use config.php db settings

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

Modified: trunk/rdfapi-php/test/unit/Model/dBModel_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Model/dBModel_test.php	2007-08-16 07:22:32 UTC (rev 526)
+++ trunk/rdfapi-php/test/unit/Model/dBModel_test.php	2007-08-16 08:56:31 UTC (rev 527)
@@ -7,7 +7,7 @@
  * This class tests the functions of DbModel and DbStore
  *
  * @version  $Id$
- * @author Tobias Gau\xDF	<tob...@we...>
+ * @author Tobias Gauss <tob...@we...>
  *
  * @package unittests
  * @access	public
@@ -16,19 +16,19 @@
 class dBModel_test extends UnitTestCase {
 
 	function testSize(){
-		$mysql_database = new DbStore('MySQL', 'localhost', 'rdf_db', 'test_user', '1234');
+		$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');
-		$this->assertEqual($dbmodel->size(),1);	
+		$this->assertEqual($dbmodel->size(),1);
 	    $dbmodel->delete();
 	}
-	
 
+
 	function testAdd(){
 		$_SESSION['test']='DbModel add test';
-		$mysql_database = new DbStore('MySQL', 'localhost', 'rdf_db', 'test_user', '1234');
+		$mysql_database = $this->createDatabaseConnection();
 		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
 		$dbmodel=$mysql_database->getModel('http://www.example.org');
 		$statement=new Statement(new Resource('http://www.example.org/subject2'),new Resource('http://www.example.org/predicate2'),new Resource('http://www.example.org/object2'));
@@ -37,11 +37,11 @@
 		$this->assertEqual($dbmodel->size(),2);
 		$dbmodel->delete();
 	}
-	
 
+
 	function testRemove(){
 		$_SESSION['test']='DbModel remove test';
-		$mysql_database = new DbStore('MySQL', 'localhost', 'rdf_db', 'test_user', '1234');
+		$mysql_database = $this->createDatabaseConnection();
 		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
 		$dbmodel=$mysql_database->getModel('http://www.example.org');
 		$statement=new Statement(new Resource('http://www.example.org/subject2'),new Resource('http://www.example.org/predicate2'),new Resource('http://www.example.org/object2'));
@@ -50,54 +50,54 @@
 		$this->assertFalse($dbmodel->contains($statement));
 		$dbmodel->delete();
 	}
-	
-	
+
+
 	function testSetBaseUri(){
 		$_SESSION['test']='DbModel setBaseURI test';
-		$mysql_database = new DbStore('MySQL', 'localhost', 'rdf_db', 'test_user', '1234');
+		$mysql_database = $this->createDatabaseConnection();
 		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
 		$dbmodel=$mysql_database->getModel('http://www.example.org');
-		$this->assertEqual($dbmodel->baseURI,'http://www.example.org#');	
+		$this->assertEqual($dbmodel->baseURI,'http://www.example.org#');
 		$dbmodel->delete();
 	}
-	
-	
+
+
 	function testContains(){
 		$_SESSION['test']='DbModel testContains test';
-		$mysql_database = new DbStore('MySQL', 'localhost', 'rdf_db', 'test_user', '1234');
+		$mysql_database = $this->createDatabaseConnection();
 		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
 		$dbmodel=$mysql_database->getModel('http://www.example.org');
 		$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));	
-		$this->assertFalse($dbmodel->contains($stat2));	
+		$this->assertTrue($dbmodel->contains($stat));
+		$this->assertFalse($dbmodel->contains($stat2));
 		$dbmodel->delete();
 	}
-	
+
 	function testContainsAll(){
 		$_SESSION['test']='DbModel testContainsAll test';
-		$mysql_database = new DbStore('MySQL', 'localhost', 'rdf_db', 'test_user', '1234');
+		$mysql_database = $this->createDatabaseConnection();
 		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
 		$dbmodel=$mysql_database->getModel('http://www.example.org');
 		$memModel=$this->_generateModel();
 		$this->assertTrue($dbmodel->containsAll($memModel));
 		$dbmodel->delete();
 	}
-	
+
 	function testContainsAny(){
 		$_SESSION['test']='DbModel testContainsAny test';
-		$mysql_database = new DbStore('MySQL', 'localhost', 'rdf_db', 'test_user', '1234');
+		$mysql_database = $this->createDatabaseConnection();
 		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
 		$dbmodel=$mysql_database->getModel('http://www.example.org');
 		$memModel=$this->_generateModel();
 		$this->assertTrue($dbmodel->containsAny($memModel));
 		$dbmodel->delete();
 	}
-	
-	
+
+
 	function testLiteral(){
 		$_SESSION['test']='DbModel testContainsAny test';
-		$mysql_database = new DbStore('MySQL', 'localhost', 'rdf_db', 'test_user', '1234');
+		$mysql_database = $this->createDatabaseConnection();
 		$mysql_database->putModel($this->_generateModelLiteral(),'http://www.example.org');
 		$dbmodel=$mysql_database->getModel('http://www.example.org');
 		$memModel=$dbmodel->getMemModel();
@@ -107,9 +107,9 @@
 		$this->assertEqual($obj->getLanguage(),'DE');
 		$dbmodel->delete();
 	}
-	
-	
- 	
+
+
+
 //===================================================================
 //                helper functions
 //===================================================================
@@ -141,6 +141,19 @@
 		return $model;
 	}
 
+
+
+    function createDatabaseConnection()
+    {
+        return new DbStore(
+            $GLOBALS['dbConf']['type'],
+            $GLOBALS['dbConf']['host'],
+            $GLOBALS['dbConf']['database'],
+            $GLOBALS['dbConf']['user'],
+            $GLOBALS['dbConf']['password']
+        );
+    }
+
 }
- 	
+
 ?>
\ No newline at end of file


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