Skip to content

Commit de13e60

Browse files
GirgiasGirgias
committed
"Fix" tests
1 parent 681204e commit de13e60

File tree

9 files changed

+41
-35
lines changed

9 files changed

+41
-35
lines changed

‎composer.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,10 @@
3030
"psr-4": {
3131
"phpdotnet\\phd\\": "src/"
3232
}
33+
},
34+
"autoload-dev": {
35+
"psr-4": {
36+
"phpdotnet\\phd\\Tests\\": "tests/"
37+
}
3338
}
3439
}

‎tests/TestRender.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<?php
2-
namespace phpdotnet\phd;
2+
namespace phpdotnet\phd\Tests;
3+
4+
use phpdotnet\phd\Config;
5+
use phpdotnet\phd\Index;
6+
use phpdotnet\phd\Reader;
7+
use phpdotnet\phd\Render;
38

49
class TestRender {
510
protected $format;

‎tests/php/TestBigXHTML.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<?php
2-
namespace phpdotnet\phd;
2+
namespace phpdotnet\phd\Tests\php;
33

4-
class TestBigXHTML extends Package_PHP_BigXHTML {
4+
use phpdotnet\phd\Package\PHP\BigXHTML;
5+
use phpdotnet\phd\Render;
6+
7+
class TestBigXHTML extends BigXHTML {
58
public function update($event, $val = null) {
69
switch($event) {
710
case Render::CHUNK:

‎tests/php/TestChunkedXHTML.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
<?php
2-
namespace phpdotnet\phd;
2+
namespace phpdotnet\phd\Tests\php;
33

4-
class TestChunkedXHTML extends Package_PHP_ChunkedXHTML {
4+
use phpdotnet\phd\Config;
5+
use phpdotnet\phd\Package\PHP\ChunkedXHTML;
6+
use phpdotnet\phd\Render;
7+
8+
class TestChunkedXHTML extends ChunkedXHTML {
59
public function update($event, $val = null) {
610
switch($event) {
711
case Render::CHUNK:

‎tests/php/bug49101-1.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
Bug #49101 - Thick border again
33
--FILE--
44
<?php
5-
namespace phpdotnet\phd;
5+
namespace phpdotnet\phd\Tests\php;
6+
7+
use phpdotnet\phd\Tests\TestRender;
68

79
require_once __DIR__ . "/../setup.php";
8-
require_once __DIR__ . "/../TestRender.php";
9-
require_once __DIR__ . "/TestChunkedXHTML.php";
1010

1111
$formatclass = "TestChunkedXHTML";
1212
$xml_file = __DIR__ . "/data/bug49101-1.xml";
@@ -19,7 +19,7 @@ $opts = array(
1919
);
2020

2121
$extra = array(
22-
"lang_dir" => __DIR__ . "/../../phpdotnet/phd/data/langs/",
22+
"lang_dir" => __DIR__ . "/../../src/data/langs/",
2323
"phpweb_version_filename" => dirname($xml_file) . '/version.xml',
2424
"phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
2525
);

‎tests/php/bug49101-2.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
Bug #49101 - Thick border again - Big XHTML
33
--FILE--
44
<?php
5-
namespace phpdotnet\phd;
5+
namespace phpdotnet\phd\Tests\php;
6+
7+
use phpdotnet\phd\Tests\TestRender;
68

79
require_once __DIR__ . "/../setup.php";
8-
require_once __DIR__ . "/../TestRender.php";
9-
require_once __DIR__ . "/TestBigXHTML.php";
1010

1111
$formatclass = "TestBigXHTML";
1212
$xml_file = __DIR__ . "/data/bug49101-1.xml";
@@ -19,7 +19,7 @@ $opts = array(
1919
);
2020

2121
$extra = array(
22-
"lang_dir" => __DIR__ . "/../../phpdotnet/phd/data/langs/",
22+
"lang_dir" => __DIR__ . "/../../src/data/langs/",
2323
"phpweb_version_filename" => dirname($xml_file) . '/version.xml',
2424
"phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
2525
);

‎tests/php/bug49102-1.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
Bug #49102 - Class reference pages don't normalize the methodnames in PhD trunk/
33
--FILE--
44
<?php
5-
namespace phpdotnet\phd;
5+
namespace phpdotnet\phd\Tests\php;
6+
7+
use phpdotnet\phd\Tests\TestRender;
68

79
require_once __DIR__ . "/../setup.php";
8-
require_once __DIR__ . "/../TestRender.php";
9-
require_once __DIR__ . "/TestChunkedXHTML.php";
1010

1111
$formatclass = "TestChunkedXHTML";
1212
$xml_file = __DIR__ . "/data/bug49102-1.xml";
@@ -20,7 +20,7 @@ $opts = array(
2020
);
2121

2222
$extra = array(
23-
"lang_dir" => __DIR__ . "/../../phpdotnet/phd/data/langs/",
23+
"lang_dir" => __DIR__ . "/../../src/data/langs/",
2424
"phpweb_version_filename" => dirname($xml_file) . '/version.xml',
2525
"phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
2626
);

‎tests/php/faq001.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
Testing a simple FAQ
33
--FILE--
44
<?php
5-
namespace phpdotnet\phd;
5+
namespace phpdotnet\phd\Tests\php;
6+
7+
use phpdotnet\phd\Tests\TestRender;
68

79
require_once __DIR__ . "/../setup.php";
8-
require_once __DIR__ . "/../TestRender.php";
9-
require_once __DIR__ . "/TestChunkedXHTML.php";
1010

1111
$formatclass = "TestChunkedXHTML";
1212
$xml_file = __DIR__ . "/data/faq001.xml";
@@ -19,7 +19,7 @@ $opts = array(
1919
);
2020

2121
$extra = array(
22-
"lang_dir" => __DIR__ . "/../../phpdotnet/phd/data/langs/",
22+
"lang_dir" => __DIR__ . "/../../src/data/langs/",
2323
"phpweb_version_filename" => dirname($xml_file) . '/version.xml',
2424
"phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
2525
);

‎tests/setup.php‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,8 @@
11
<?php
2-
namespace phpdotnet\phd;
2+
namespace phpdotnet\phd\Tests;
33

4-
function autoload($name) {
5-
$file = __DIR__ . "/../" . str_replace(array('\\', '_'), '/', $name) . '.php';
6-
if (!$fp = fopen($file,'r', true)) {
7-
throw new \Exception('Cannot find file for ' . $name . ': ' . $file);
8-
}
9-
fclose($fp);
10-
require $file;
11-
12-
}
13-
spl_autoload_register(__NAMESPACE__ . '\\autoload');
14-
15-
require_once __DIR__ . "/../phpdotnet/phd/functions.php";
16-
require_once __DIR__ . "/../phpdotnet/phd/Config.php";
4+
require_once __DIR__ . '/../vendor/autoload.php';
5+
require_once __DIR__ . "/../src/functions.php";
176

187
/*
198
* vim600: sw=4 ts=4 syntax=php et

0 commit comments

Comments
 (0)