Refactor test helpers and test directory structure

Refactor TestRender to use only constructor injected objects. Rename test format helper classes to indicate which package they belong to. Move TestRender and all format helper classes into the phpdotnet phd directory to enable autoloading. Remove all unnecessary lines from setup.php. Restructure test directory to follow the structure of the tested classes.
php · Feb 25, 2024 · c5fce08 · c5fce08
1 parent 547fc20
commit c5fce08
Show file tree

Hide file tree

Showing 39 changed files with 149 additions and 373 deletions.
diff --git a/phpdotnet/phd/Index.php b/phpdotnet/phd/Index.php
@@ -527,6 +527,3 @@ public function setMembership($membership) {
     }
 
 }
-
-
-
diff --git a/tests/xhtml/TestChunkedXHTML.php → phpdotnet/phd/TestGenericChunkedXHTML.php b/tests/xhtml/TestChunkedXHTML.php → phpdotnet/phd/TestGenericChunkedXHTML.php
@@ -1,7 +1,7 @@
 <?php
 namespace phpdotnet\phd;
 
-class TestChunkedXHTML extends Package_Generic_ChunkedXHTML {
+class TestGenericChunkedXHTML extends Package_Generic_ChunkedXHTML {
     public function update($event, $val = null) {
         switch($event) {
         case Render::CHUNK:

diff --git a/tests/php/TestBigXHTML.php → phpdotnet/phd/TestPHPBigXHTML.php b/tests/php/TestBigXHTML.php → phpdotnet/phd/TestPHPBigXHTML.php
@@ -1,7 +1,7 @@
 <?php
 namespace phpdotnet\phd;
 
-class TestBigXHTML extends Package_PHP_BigXHTML {
+class TestPHPBigXHTML extends Package_PHP_BigXHTML {
     public function update($event, $val = null) {
         switch($event) {
         case Render::CHUNK:
@@ -40,5 +40,3 @@ public function appendData($data) {
     }
 
 }
-
-
diff --git a/tests/php/TestChunkedXHTML.php → phpdotnet/phd/TestPHPChunkedXHTML.php b/tests/php/TestChunkedXHTML.php → phpdotnet/phd/TestPHPChunkedXHTML.php
@@ -1,7 +1,7 @@
 <?php
 namespace phpdotnet\phd;
 
-class TestChunkedXHTML extends Package_PHP_ChunkedXHTML {
+class TestPHPChunkedXHTML extends Package_PHP_ChunkedXHTML {
     public function update($event, $val = null) {
         switch($event) {
         case Render::CHUNK:
@@ -32,5 +32,3 @@ public function writeChunk($id, $fp) {
         echo "Content:" . $content . "\n";
     }
 }
-
-
diff --git a/phpdotnet/phd/TestRender.php b/phpdotnet/phd/TestRender.php
@@ -0,0 +1,33 @@
+<?php
+namespace phpdotnet\phd;
+
+class TestRender extends Render {
+    public function __construct(
+        protected Reader $reader,
+        protected Config $config,
+        protected ?Format $format = null,
+        protected ?Index $index = null,
+    ) {}
+
+    public function run() {
+        if ($this->index && $this->index::requireIndexing()) {
+            if (!file_exists($this->config->output_dir())) {
+                mkdir($this->config->output_dir(), 0755);
+            }
+            $this->attach($this->index);
+            $this->reader->open($this->config->xml_file());
+            $this->execute($this->reader);
+            $this->detach($this->index);
+        }
+
+        if ($this->format !== null) {
+            $this->attach($this->format);
+            $this->reader->open($this->config->xml_file());
+            $this->execute($this->reader);
+        }
+    }
+
+    public function getIndex(): ?Index {
+        return $this->index;
+    }
+}
diff --git a/tests/TestRender.php b/tests/TestRender.php
diff --git a/tests/xhtml/001.phpt → tests/package/generic/001.phpt b/tests/xhtml/001.phpt → tests/package/generic/001.phpt
@@ -4,27 +4,14 @@ CALS Table rendering
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
 $xml_file = __DIR__ . "/data/001-1.xml";
 
-Config::init([
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-    "lang_dir" => __PHDDIR__ . "phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-]);
-
-$format = new TestChunkedXHTML;
-$render = new TestRender($format, new Config);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
+Config::init(["xml_file" => $xml_file]);
+
+$format = new TestGenericChunkedXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
 $render->run();
 ?>

diff --git a/tests/xhtml/002.phpt → tests/package/generic/002.phpt b/tests/xhtml/002.phpt → tests/package/generic/002.phpt
@@ -4,27 +4,14 @@ CALS Table rendering#002
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
 $xml_file = __DIR__ . "/data/002.xml";
 
-Config::init([
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-    "lang_dir" => __PHDDIR__ . "phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-]);
-
-$format = new TestChunkedXHTML;
-$render = new TestRender($format, new Config);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
+Config::init(["xml_file" => $xml_file]);
+
+$format = new TestGenericChunkedXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
 $render->run();
 ?>

diff --git a/tests/xhtml/003.phpt → tests/package/generic/003.phpt b/tests/xhtml/003.phpt → tests/package/generic/003.phpt
@@ -4,27 +4,14 @@ CALS Table rendering#003
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
 $xml_file = __DIR__ . "/data/003.xml";
 
-Config::init([
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-    "lang_dir" => __PHDDIR__ . "phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-]);
-
-$format = new TestChunkedXHTML;
-$render = new TestRender($format, new Config);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
+Config::init(["xml_file" => $xml_file]);
+
+$format = new TestGenericChunkedXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
 $render->run();
 ?>

diff --git a/tests/xhtml/data/001-1.xml → tests/package/generic/data/001-1.xml b/tests/xhtml/data/001-1.xml → tests/package/generic/data/001-1.xml
diff --git a/tests/xhtml/data/002.xml → tests/package/generic/data/002.xml b/tests/xhtml/data/002.xml → tests/package/generic/data/002.xml
diff --git a/tests/xhtml/data/003.xml → tests/package/generic/data/003.xml b/tests/xhtml/data/003.xml → tests/package/generic/data/003.xml
diff --git a/tests/xhtml/data/simplelist.xml → tests/package/generic/data/simplelist.xml b/tests/xhtml/data/simplelist.xml → tests/package/generic/data/simplelist.xml
diff --git a/.../xhtml/data/whitespace_formatting_001.xml → ...eneric/data/whitespace_formatting_001.xml b/.../xhtml/data/whitespace_formatting_001.xml → ...eneric/data/whitespace_formatting_001.xml
diff --git a/tests/xhtml/simplelist_001.phpt → tests/package/generic/simplelist_001.phpt b/tests/xhtml/simplelist_001.phpt → tests/package/generic/simplelist_001.phpt
@@ -4,27 +4,14 @@ Simplelist rendering 001 - Types and columns
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
 $xml_file = __DIR__ . "/data/simplelist.xml";
 
-Config::init([
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-    "lang_dir" => __PHDDIR__ . "phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-]);
+Config::init(["xml_file" => $xml_file]);
 
-$format = new TestChunkedXHTML;
-$render = new TestRender($format, new Config);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
+$format = new TestGenericChunkedXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
 $render->run();
 ?>

diff --git a/tests/xhtml/whitespace_formatting_001.phpt → ...ge/generic/whitespace_formatting_001.phpt b/tests/xhtml/whitespace_formatting_001.phpt → ...ge/generic/whitespace_formatting_001.phpt
@@ -4,27 +4,14 @@ Whitespace formatting 001
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
 $xml_file = __DIR__ . "/data/whitespace_formatting_001.xml";
 
-Config::init([
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-    "lang_dir" => __PHDDIR__ . "phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-]);
+Config::init(["xml_file" => $xml_file]);
 
-$format = new TestChunkedXHTML;
-$render = new TestRender($format, new Config);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
+$format = new TestGenericChunkedXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
 $render->run();
 ?>

diff --git a/tests/php/bug49101-1.phpt → tests/package/php/bug49101-1.phpt b/tests/php/bug49101-1.phpt → tests/package/php/bug49101-1.phpt
@@ -4,27 +4,14 @@ Bug #49101-1 - Thick border again
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
 $xml_file = __DIR__ . "/data/bug49101-1.xml";
 
-Config::init([
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-    "lang_dir" => __DIR__ . "/../../phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-]);
+Config::init(["xml_file" => $xml_file]);
 
-$format = new TestChunkedXHTML;
-$render = new TestRender($format, new Config);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
+$format = new TestPHPChunkedXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
 $render->run();
 ?>
@@ -88,3 +75,5 @@ Content:
 
 
 </div>
+
+
diff --git a/tests/php/bug49101-2.phpt → tests/package/php/bug49101-2.phpt b/tests/php/bug49101-2.phpt → tests/package/php/bug49101-2.phpt
@@ -4,27 +4,14 @@ Bug #49101-2 - Thick border again - Big XHTML
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestBigXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
 $xml_file = __DIR__ . "/data/bug49101-1.xml";
 
-Config::init([
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-    "lang_dir" => __DIR__ . "/../../phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-]);
-
-$format = new TestBigXHTML;
-$render = new TestRender($format, new Config);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
+Config::init(["xml_file" => $xml_file]);
+
+$format = new TestPHPBigXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
 $render->run();
 ?>