From afdbd94ad7292e24a94722a4359fbe551df53cde Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 14 Jun 2013 10:11:44 -0400
Subject: [PATCH] Fixed relative paths to match up with move in previous
commit.
---
.../tests/unit-tests/src/VuFindTest/Config/UpgradeTest.php | 4 ++--
.../tests/unit-tests/src/VuFindTest/Config/WriterTest.php | 2 +-
.../unit-tests/src/VuFindTest/Search/QueryAdapterTest.php | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Config/UpgradeTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Config/UpgradeTest.php
index a3b0dda883c..6807defef14 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Config/UpgradeTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Config/UpgradeTest.php
@@ -56,8 +56,8 @@ class UpgradeTest extends \VuFindTest\Unit\TestCase
*/
protected function getUpgrader($version)
{
- $oldDir = realpath(__DIR__ . '/../../../fixtures/configs/' . $version);
- $rawDir = realpath(__DIR__ . '/../../../../../../config/vufind');
+ $oldDir = realpath(__DIR__ . '/../../../../fixtures/configs/' . $version);
+ $rawDir = realpath(__DIR__ . '/../../../../../../../config/vufind');
return new Upgrade($version, $this->targetVersion, $oldDir, $rawDir);
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Config/WriterTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Config/WriterTest.php
index 9cc770be200..1f554a06a4f 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Config/WriterTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Config/WriterTest.php
@@ -47,7 +47,7 @@ class WriterTest extends \VuFindTest\Unit\TestCase
*/
public function testReadFile()
{
- $file = realpath(__DIR__ . '/../../../fixtures/configs/1.1/sms.ini');
+ $file = realpath(__DIR__ . '/../../../../fixtures/configs/1.1/sms.ini');
$test = new Writer($file);
$this->assertEquals(file_get_contents($file), $test->getContent());
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/QueryAdapterTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/QueryAdapterTest.php
index b821112b78f..1dc7174c2cf 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/QueryAdapterTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/QueryAdapterTest.php
@@ -52,7 +52,7 @@ class QueryAdapterTest extends TestCase
public function testConversions()
{
$cases = array('basic', 'advanced');
- $fixturePath = realpath(__DIR__ . '/../../../fixtures/searches') . '/';
+ $fixturePath = realpath(__DIR__ . '/../../../../fixtures/searches') . '/';
foreach ($cases as $case) {
// Load minified, unminified, and Query object data:
$min = unserialize(file_get_contents($fixturePath . $case . '/min'));
@@ -73,7 +73,7 @@ class QueryAdapterTest extends TestCase
*/
public function testAdvancedRequest()
{
- $fixturePath = realpath(__DIR__ . '/../../../fixtures/searches') . '/advanced/';
+ $fixturePath = realpath(__DIR__ . '/../../../../fixtures/searches') . '/advanced/';
$req = unserialize(file_get_contents($fixturePath . 'request'));
$q = unserialize(file_get_contents($fixturePath . 'query'));
$this->assertEquals($q, QueryAdapter::fromRequest($req, 'AllFields'));
@@ -109,7 +109,7 @@ class QueryAdapterTest extends TestCase
};
// Run the tests:
- $fixturePath = realpath(__DIR__ . '/../../../fixtures/searches') . '/';
+ $fixturePath = realpath(__DIR__ . '/../../../../fixtures/searches') . '/';
foreach ($cases as $case => $expected) {
$q = unserialize(file_get_contents($fixturePath . $case . '/query'));
$this->assertEquals($expected, QueryAdapter::display($q, $echo, $echo));
--
GitLab