Skip to content

Commit

Permalink
Fixes further unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Philipp Frischmuth committed Jul 2, 2012
1 parent 63ff6d1 commit 8a8323f
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 23 deletions.
15 changes: 8 additions & 7 deletions tests/Erfurt/Syntax/RdfParser/Adapter/RdfJsonTest.php
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?php
class Erfurt_Syntax_RdfParser_Adapter_RdfJsonTest extends Erfurt_TestCase
{
const SYNTAX_TEST_DIR = 'resources/syntax/valid/';
const SYNTAX_TEST_DIR = 'valid/';

/**
* @var Erfurt_Syntax_RdfParser_Adapter_RdfXml
* @access protected
*/
protected $_object;
protected $_object = null;

/**
* Sets up the fixture, for example, opens a network connection.
Expand All @@ -17,7 +17,7 @@ class Erfurt_Syntax_RdfParser_Adapter_RdfJsonTest extends Erfurt_TestCase
*/
protected function setUp()
{
$this->_object = new Erfurt_Syntax_RdfParser_Adapter_RdfJson();
$this->_object = new Erfurt_Syntax_RdfParser_Adapter_RdfJson();
}

/**
Expand All @@ -41,15 +41,16 @@ public function providerTestParseFromFileName()
{
$dataArray = array();

if (is_readable(self::SYNTAX_TEST_DIR)) {
$dirIterator = new DirectoryIterator(self::SYNTAX_TEST_DIR);
$dirName = realpath(dirname(dirname(dirname(__FILE__)))) . '/_files/' . self::SYNTAX_TEST_DIR;
if (is_readable($dirName)) {
$dirIterator = new DirectoryIterator($dirName);

foreach ($dirIterator as $file) {
if (!$file->isDot() && !$file->isDir()) {
$fileName = $file->getFileName();

if ((substr($fileName, -5) === '.json') && is_readable(self::SYNTAX_TEST_DIR . $fileName)) {
$dataArray[] = array((self::SYNTAX_TEST_DIR . $fileName));
if ((substr($fileName, -5) === '.json') && is_readable($dirName . $fileName)) {
$dataArray[] = array(($dirName . $fileName));
}
}
}
Expand Down
25 changes: 15 additions & 10 deletions tests/Erfurt/Syntax/RdfParser/Adapter/RdfXmlTest.php
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
class Erfurt_Syntax_RdfParser_Adapter_RdfXmlTest extends Erfurt_TestCase
{
const SYNTAX_TEST_DIR = 'resources/syntax/valid/';
const SYNTAX_INVALID_TEST_DIR = 'resources/syntax/invalid/';
const SYNTAX_TEST_DIR = 'valid/';
const SYNTAX_INVALID_TEST_DIR = 'invalid/';

/**
* @var Erfurt_Syntax_RdfParser_Adapter_RdfXml
Expand Down Expand Up @@ -227,15 +227,16 @@ public function providerTestParseFromDataString()
{
$dataArray = array();

if (is_readable(self::SYNTAX_TEST_DIR)) {
$dirIterator = new DirectoryIterator(self::SYNTAX_TEST_DIR);
$dirName = realpath(dirname(dirname(dirname(__FILE__)))) . '/_files/' . self::SYNTAX_TEST_DIR;
if (is_readable($dirName)) {
$dirIterator = new DirectoryIterator($dirName);

foreach ($dirIterator as $file) {
if (!$file->isDot() && !$file->isDir()) {
$fileName = $file->getFileName();

if ((substr($fileName, -4) === '.rdf') && is_readable(self::SYNTAX_TEST_DIR . $fileName)) {
$dataArray[] = array((self::SYNTAX_TEST_DIR . $fileName));
if ((substr($fileName, -4) === '.rdf') && is_readable($dirName . $fileName)) {
$dataArray[] = array(($dirName . $fileName));
}
}
}
Expand All @@ -248,15 +249,16 @@ public function providerTestParseFromInvalidDataString()
{
$dataArray = array();

if (is_readable(self::SYNTAX_INVALID_TEST_DIR)) {
$dirIterator = new DirectoryIterator(self::SYNTAX_INVALID_TEST_DIR);
$dirName = realpath(dirname(dirname(dirname(__FILE__)))) . '/_files/' . self::SYNTAX_INVALID_TEST_DIR;
if (is_readable($dirName)) {
$dirIterator = new DirectoryIterator($dirName);

foreach ($dirIterator as $file) {
if (!$file->isDot() && !$file->isDir()) {
$fileName = $file->getFileName();

if ((substr($fileName, -4) === '.rdf') && is_readable(self::SYNTAX_INVALID_TEST_DIR . $fileName)) {
$dataArray[] = array((self::SYNTAX_INVALID_TEST_DIR . $fileName));
if ((substr($fileName, -4) === '.rdf') && is_readable($dirName . $fileName)) {
$dataArray[] = array(($dirName . $fileName));
}
}
}
Expand All @@ -265,6 +267,8 @@ public function providerTestParseFromInvalidDataString()
return $dataArray;
}

// TODO use a test http adapter
/*
public function testParseFromUrlWithConferenceModelFromTrunk()
{
$url = 'http://ontowiki.googlecode.com/svn/trunk/models/Conferences/conferences.rdf';
Expand All @@ -275,6 +279,7 @@ public function testParseFromUrlWithConferenceModelFromTrunk()
$this->fail($e->getMessage());
}
}
*/

public function testParseRecursiveEntity()
{
Expand Down
11 changes: 6 additions & 5 deletions tests/Erfurt/Syntax/RdfParser/Adapter/TurtleTest.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
class Erfurt_Syntax_RdfParser_Adapter_TurtleTest extends Erfurt_TestCase
{
const SYNTAX_TEST_DIR = 'resources/syntax/valid/';
const SYNTAX_TEST_DIR = 'valid/';

/**
* @var Erfurt_Syntax_RdfParser_Adapter_Turtle
Expand Down Expand Up @@ -126,15 +126,16 @@ public function providerTestParseFromFileName()
{
$dataArray = array();

if (is_readable(self::SYNTAX_TEST_DIR)) {
$dirIterator = new DirectoryIterator(self::SYNTAX_TEST_DIR);
$dirName = realpath(dirname(dirname(dirname(__FILE__)))) . '/_files/' . self::SYNTAX_TEST_DIR;
if (is_readable($dirName)) {
$dirIterator = new DirectoryIterator($dirName);

foreach ($dirIterator as $file) {
if (!$file->isDot() && !$file->isDir()) {
$fileName = $file->getFileName();

if ((substr($fileName, -4) === '.ttl') && is_readable(self::SYNTAX_TEST_DIR . $fileName)) {
$dataArray[] = array((self::SYNTAX_TEST_DIR . $fileName));
if ((substr($fileName, -4) === '.ttl') && is_readable($dirName . $fileName)) {
$dataArray[] = array(($dirName . $fileName));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Erfurt/Wrapper/RegistryTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public function testGetWrapperInstanceWillSucceed()
public function testListActiveWrapperEmpty()
{
$result = $this->_registry->listActiveWrapper();
var_dump($result);exit;
$this->assertTrue(empty($result));
}

Expand Down
Empty file added tests/cache.sqlite
View file
Empty file.

0 comments on commit 8a8323f

Please sign in to comment.