diff options
19 files changed, 674 insertions, 757 deletions
diff --git a/tests/app/Module/AhnentafelReportModuleTest.php b/tests/app/Module/AhnentafelReportModuleTest.php index bf75736200..f1e9063638 100644 --- a/tests/app/Module/AhnentafelReportModuleTest.php +++ b/tests/app/Module/AhnentafelReportModuleTest.php @@ -24,10 +24,10 @@ use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; use Fisharebest\Webtrees\Report\PdfRenderer; +use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; -use Fisharebest\Webtrees\Webtrees; use League\Flysystem\Adapter\NullAdapter; use League\Flysystem\Filesystem; use PHPUnit\Framework\Error\Notice; @@ -37,61 +37,63 @@ use function ob_start; /** * Test harness for the class AhnentafelReportModule - * - * @covers \Fisharebest\Webtrees\Module\AhnentafelReportModule - * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractRenderer - * @covers \Fisharebest\Webtrees\Report\ReportBaseCell - * @covers \Fisharebest\Webtrees\Report\ReportBaseElement - * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote - * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml - * @covers \Fisharebest\Webtrees\Report\ReportBaseImage - * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader - * @covers \Fisharebest\Webtrees\Report\ReportBaseText - * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox - * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\HtmlRenderer - * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell - * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote - * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml - * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage - * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportHtmlText - * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox - * @covers \Fisharebest\Webtrees\Report\ReportParserBase - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate - * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\PdfRenderer - * @covers \Fisharebest\Webtrees\Report\ReportPdfCell - * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote - * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml - * @covers \Fisharebest\Webtrees\Report\ReportPdfImage - * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox - * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class AhnentafelReportModuleTest extends TestCase { protected static $uses_database = true; /** + * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait + * @covers \Fisharebest\Webtrees\Module\PedigreeReportModule + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer + * @covers \Fisharebest\Webtrees\Report\PdfRenderer + * @covers \Fisharebest\Webtrees\Report\ReportBaseCell + * @covers \Fisharebest\Webtrees\Report\ReportBaseElement + * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote + * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml + * @covers \Fisharebest\Webtrees\Report\ReportBaseImage + * @covers \Fisharebest\Webtrees\Report\ReportBaseLine + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader + * @covers \Fisharebest\Webtrees\Report\ReportBaseText + * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox + * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider + * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell + * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote + * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml + * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage + * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlText + * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox + * @covers \Fisharebest\Webtrees\Report\ReportParserBase + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportParserSetup + * @covers \Fisharebest\Webtrees\Report\ReportPdfCell + * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote + * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml + * @covers \Fisharebest\Webtrees\Report\ReportPdfImage + * @covers \Fisharebest\Webtrees\Report\ReportPdfLine + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportPdfText + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox + * @covers \Fisharebest\Webtrees\Report\TcpdfWrapper + * * @return void */ public function testReportRunsWithoutError(): void { $data_filesystem = new Filesystem(new NullAdapter()); + $module_service = new ModuleService(); $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret'); $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1'); Auth::login($user); - $tree = $this->importTree('demo.ged'); - $xml = Webtrees::ROOT_DIR . 'resources/xml/reports/ahnentafel_report.xml'; - $vars = [ + $tree = $this->importTree('demo.ged'); + $module = $module_service->findByInterface(AhnentafelReportModule::class)->first(); + $xml = 'resources/' . $module->xmlFilename(); + $vars = [ 'pid' => ['id' => 'X1030'], 'maxgen' => ['id' => '3'], 'sources' => ['id' => 'on'], diff --git a/tests/app/Module/BirthDeathMarriageReportModuleTest.php b/tests/app/Module/BirthDeathMarriageReportModuleTest.php index 5b14d8c161..e10d57f4ea 100644 --- a/tests/app/Module/BirthDeathMarriageReportModuleTest.php +++ b/tests/app/Module/BirthDeathMarriageReportModuleTest.php @@ -23,64 +23,66 @@ use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; use Fisharebest\Webtrees\Report\PdfRenderer; +use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\TestCase; -use Fisharebest\Webtrees\Webtrees; use League\Flysystem\Adapter\NullAdapter; use League\Flysystem\Filesystem; /** * Test harness for the class BirthDeathMarriageReportModule - * - * @covers \Fisharebest\Webtrees\Module\BirthDeathMarriageReportModule - * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractRenderer - * @covers \Fisharebest\Webtrees\Report\ReportBaseCell - * @covers \Fisharebest\Webtrees\Report\ReportBaseElement - * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote - * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml - * @covers \Fisharebest\Webtrees\Report\ReportBaseImage - * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader - * @covers \Fisharebest\Webtrees\Report\ReportBaseText - * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox - * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\HtmlRenderer - * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell - * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote - * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml - * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage - * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportHtmlText - * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox - * @covers \Fisharebest\Webtrees\Report\ReportParserBase - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate - * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\PdfRenderer - * @covers \Fisharebest\Webtrees\Report\ReportPdfCell - * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote - * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml - * @covers \Fisharebest\Webtrees\Report\ReportPdfImage - * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox - * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class BirthDeathMarriageReportModuleTest extends TestCase { protected static $uses_database = true; /** + * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait + * @covers \Fisharebest\Webtrees\Module\PedigreeReportModule + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer + * @covers \Fisharebest\Webtrees\Report\PdfRenderer + * @covers \Fisharebest\Webtrees\Report\ReportBaseCell + * @covers \Fisharebest\Webtrees\Report\ReportBaseElement + * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote + * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml + * @covers \Fisharebest\Webtrees\Report\ReportBaseImage + * @covers \Fisharebest\Webtrees\Report\ReportBaseLine + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader + * @covers \Fisharebest\Webtrees\Report\ReportBaseText + * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox + * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider + * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell + * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote + * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml + * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage + * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlText + * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox + * @covers \Fisharebest\Webtrees\Report\ReportParserBase + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportParserSetup + * @covers \Fisharebest\Webtrees\Report\ReportPdfCell + * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote + * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml + * @covers \Fisharebest\Webtrees\Report\ReportPdfImage + * @covers \Fisharebest\Webtrees\Report\ReportPdfLine + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportPdfText + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox + * @covers \Fisharebest\Webtrees\Report\TcpdfWrapper + * * @return void */ public function testReportRunsWithoutError(): void { $data_filesystem = new Filesystem(new NullAdapter()); + $module_service = new ModuleService(); - $tree = $this->importTree('demo.ged'); - $xml = Webtrees::ROOT_DIR . 'resources/xml/reports/bdm_report.xml'; - $vars = [ + $tree = $this->importTree('demo.ged'); + $module = $module_service->findByInterface(BirthDeathMarriageReportModule::class)->first(); + $xml = 'resources/' . $module->xmlFilename(); + $vars = [ 'name' => ['id' => ''], 'bdmplace' => ['id' => ''], 'birthdate1' => ['id' => ''], diff --git a/tests/app/Module/BirthReportModuleTest.php b/tests/app/Module/BirthReportModuleTest.php index 84419ff784..56dc111065 100644 --- a/tests/app/Module/BirthReportModuleTest.php +++ b/tests/app/Module/BirthReportModuleTest.php @@ -24,70 +24,72 @@ use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; use Fisharebest\Webtrees\Report\PdfRenderer; +use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; -use Fisharebest\Webtrees\Webtrees; use League\Flysystem\Adapter\NullAdapter; use League\Flysystem\Filesystem; /** * Test harness for the class BirthReportModule - * - * @covers \Fisharebest\Webtrees\Module\BirthReportModule - * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractRenderer - * @covers \Fisharebest\Webtrees\Report\ReportBaseCell - * @covers \Fisharebest\Webtrees\Report\ReportBaseElement - * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote - * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml - * @covers \Fisharebest\Webtrees\Report\ReportBaseImage - * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader - * @covers \Fisharebest\Webtrees\Report\ReportBaseText - * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox - * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\HtmlRenderer - * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell - * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote - * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml - * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage - * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportHtmlText - * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox - * @covers \Fisharebest\Webtrees\Report\ReportParserBase - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate - * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\PdfRenderer - * @covers \Fisharebest\Webtrees\Report\ReportPdfCell - * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote - * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml - * @covers \Fisharebest\Webtrees\Report\ReportPdfImage - * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox - * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class BirthReportModuleTest extends TestCase { protected static $uses_database = true; /** + * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait + * @covers \Fisharebest\Webtrees\Module\PedigreeReportModule + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer + * @covers \Fisharebest\Webtrees\Report\PdfRenderer + * @covers \Fisharebest\Webtrees\Report\ReportBaseCell + * @covers \Fisharebest\Webtrees\Report\ReportBaseElement + * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote + * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml + * @covers \Fisharebest\Webtrees\Report\ReportBaseImage + * @covers \Fisharebest\Webtrees\Report\ReportBaseLine + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader + * @covers \Fisharebest\Webtrees\Report\ReportBaseText + * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox + * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider + * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell + * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote + * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml + * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage + * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlText + * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox + * @covers \Fisharebest\Webtrees\Report\ReportParserBase + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportParserSetup + * @covers \Fisharebest\Webtrees\Report\ReportPdfCell + * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote + * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml + * @covers \Fisharebest\Webtrees\Report\ReportPdfImage + * @covers \Fisharebest\Webtrees\Report\ReportPdfLine + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportPdfText + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox + * @covers \Fisharebest\Webtrees\Report\TcpdfWrapper + * * @return void */ public function testReportRunsWithoutError(): void { $data_filesystem = new Filesystem(new NullAdapter()); + $module_service = new ModuleService(); $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret'); $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1'); Auth::login($user); - $tree = $this->importTree('demo.ged'); - $xml = Webtrees::ROOT_DIR . 'resources/xml/reports/birth_report.xml'; - $vars = [ + $tree = $this->importTree('demo.ged'); + $module = $module_service->findByInterface(BirthReportModule::class)->first(); + $xml = 'resources/' . $module->xmlFilename(); + $vars = [ 'name' => ['id' => ''], 'birthplace' => ['id' => ''], 'birthdate1' => ['id' => ''], diff --git a/tests/app/Module/CemeteryReportModuleTest.php b/tests/app/Module/CemeteryReportModuleTest.php index 6102bc9bcf..42f8acbbfa 100644 --- a/tests/app/Module/CemeteryReportModuleTest.php +++ b/tests/app/Module/CemeteryReportModuleTest.php @@ -24,70 +24,72 @@ use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; use Fisharebest\Webtrees\Report\PdfRenderer; +use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; -use Fisharebest\Webtrees\Webtrees; use League\Flysystem\Adapter\NullAdapter; use League\Flysystem\Filesystem; /** * Test harness for the class CemeteryReportModule - * - * @covers \Fisharebest\Webtrees\Module\CemeteryReportModule - * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractRenderer - * @covers \Fisharebest\Webtrees\Report\ReportBaseCell - * @covers \Fisharebest\Webtrees\Report\ReportBaseElement - * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote - * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml - * @covers \Fisharebest\Webtrees\Report\ReportBaseImage - * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader - * @covers \Fisharebest\Webtrees\Report\ReportBaseText - * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox - * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\HtmlRenderer - * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell - * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote - * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml - * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage - * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportHtmlText - * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox - * @covers \Fisharebest\Webtrees\Report\ReportParserBase - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate - * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\PdfRenderer - * @covers \Fisharebest\Webtrees\Report\ReportPdfCell - * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote - * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml - * @covers \Fisharebest\Webtrees\Report\ReportPdfImage - * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox - * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class CemeteryReportModuleTest extends TestCase { protected static $uses_database = true; /** + * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait + * @covers \Fisharebest\Webtrees\Module\PedigreeReportModule + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer + * @covers \Fisharebest\Webtrees\Report\PdfRenderer + * @covers \Fisharebest\Webtrees\Report\ReportBaseCell + * @covers \Fisharebest\Webtrees\Report\ReportBaseElement + * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote + * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml + * @covers \Fisharebest\Webtrees\Report\ReportBaseImage + * @covers \Fisharebest\Webtrees\Report\ReportBaseLine + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader + * @covers \Fisharebest\Webtrees\Report\ReportBaseText + * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox + * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider + * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell + * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote + * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml + * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage + * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlText + * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox + * @covers \Fisharebest\Webtrees\Report\ReportParserBase + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportParserSetup + * @covers \Fisharebest\Webtrees\Report\ReportPdfCell + * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote + * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml + * @covers \Fisharebest\Webtrees\Report\ReportPdfImage + * @covers \Fisharebest\Webtrees\Report\ReportPdfLine + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportPdfText + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox + * @covers \Fisharebest\Webtrees\Report\TcpdfWrapper + * * @return void */ public function testReportRunsWithoutError(): void { $data_filesystem = new Filesystem(new NullAdapter()); + $module_service = new ModuleService(); $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret'); $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1'); Auth::login($user); - $tree = $this->importTree('demo.ged'); - $xml = Webtrees::ROOT_DIR . 'resources/xml/reports/cemetery_report.xml'; - $vars = [ + $tree = $this->importTree('demo.ged'); + $module = $module_service->findByInterface(CemeteryReportModule::class)->first(); + $xml = 'resources/' . $module->xmlFilename(); + $vars = [ 'deathplace' => ['id' => ''], 'adlist' => ['id' => 'none'], 'sortby' => ['id' => 'NAME'], diff --git a/tests/app/Module/ChangeReportModuleTest.php b/tests/app/Module/ChangeReportModuleTest.php index 4c62652b13..4d8c0a5abe 100644 --- a/tests/app/Module/ChangeReportModuleTest.php +++ b/tests/app/Module/ChangeReportModuleTest.php @@ -25,70 +25,72 @@ use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; use Fisharebest\Webtrees\Report\PdfRenderer; +use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; -use Fisharebest\Webtrees\Webtrees; use League\Flysystem\Adapter\NullAdapter; use League\Flysystem\Filesystem; /** * Test harness for the class ChangeReportModule - * - * @covers \Fisharebest\Webtrees\Module\ChangeReportModule - * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractRenderer - * @covers \Fisharebest\Webtrees\Report\ReportBaseCell - * @covers \Fisharebest\Webtrees\Report\ReportBaseElement - * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote - * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml - * @covers \Fisharebest\Webtrees\Report\ReportBaseImage - * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader - * @covers \Fisharebest\Webtrees\Report\ReportBaseText - * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox - * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\HtmlRenderer - * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell - * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote - * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml - * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage - * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportHtmlText - * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox - * @covers \Fisharebest\Webtrees\Report\ReportParserBase - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate - * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\PdfRenderer - * @covers \Fisharebest\Webtrees\Report\ReportPdfCell - * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote - * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml - * @covers \Fisharebest\Webtrees\Report\ReportPdfImage - * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox - * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class ChangeReportModuleTest extends TestCase { protected static $uses_database = true; /** + * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait + * @covers \Fisharebest\Webtrees\Module\PedigreeReportModule + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer + * @covers \Fisharebest\Webtrees\Report\PdfRenderer + * @covers \Fisharebest\Webtrees\Report\ReportBaseCell + * @covers \Fisharebest\Webtrees\Report\ReportBaseElement + * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote + * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml + * @covers \Fisharebest\Webtrees\Report\ReportBaseImage + * @covers \Fisharebest\Webtrees\Report\ReportBaseLine + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader + * @covers \Fisharebest\Webtrees\Report\ReportBaseText + * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox + * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider + * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell + * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote + * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml + * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage + * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlText + * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox + * @covers \Fisharebest\Webtrees\Report\ReportParserBase + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportParserSetup + * @covers \Fisharebest\Webtrees\Report\ReportPdfCell + * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote + * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml + * @covers \Fisharebest\Webtrees\Report\ReportPdfImage + * @covers \Fisharebest\Webtrees\Report\ReportPdfLine + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportPdfText + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox + * @covers \Fisharebest\Webtrees\Report\TcpdfWrapper + * * @return void */ public function testReportRunsWithoutError(): void { $data_filesystem = new Filesystem(new NullAdapter()); + $module_service = new ModuleService(); $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret'); $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1'); Auth::login($user); - $tree = $this->importTree('demo.ged'); - $xml = Webtrees::ROOT_DIR . 'resources/xml/reports/change_report.xml'; - $vars = [ + $tree = $this->importTree('demo.ged'); + $module = $module_service->findByInterface(ChangeReportModule::class)->first(); + $xml = 'resources/' . $module->xmlFilename(); + $vars = [ 'changeRangeStart' => ['id' => Carbon::now()->subMonths(1)->format('d M Y')], 'changeRangeEnd' => ['id' => Carbon::now()->format('d M Y')], 'pending' => ['id' => 'yes'], diff --git a/tests/app/Module/DeathReportModuleTest.php b/tests/app/Module/DeathReportModuleTest.php index b5ec3e3862..ece3c0a777 100644 --- a/tests/app/Module/DeathReportModuleTest.php +++ b/tests/app/Module/DeathReportModuleTest.php @@ -24,70 +24,72 @@ use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; use Fisharebest\Webtrees\Report\PdfRenderer; +use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; -use Fisharebest\Webtrees\Webtrees; use League\Flysystem\Adapter\NullAdapter; use League\Flysystem\Filesystem; /** * Test harness for the class FactSourcesReportModule - * - * @covers \Fisharebest\Webtrees\Module\FactSourcesReportModule - * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractRenderer - * @covers \Fisharebest\Webtrees\Report\ReportBaseCell - * @covers \Fisharebest\Webtrees\Report\ReportBaseElement - * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote - * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml - * @covers \Fisharebest\Webtrees\Report\ReportBaseImage - * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader - * @covers \Fisharebest\Webtrees\Report\ReportBaseText - * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox - * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\HtmlRenderer - * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell - * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote - * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml - * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage - * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportHtmlText - * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox - * @covers \Fisharebest\Webtrees\Report\ReportParserBase - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate - * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\PdfRenderer - * @covers \Fisharebest\Webtrees\Report\ReportPdfCell - * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote - * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml - * @covers \Fisharebest\Webtrees\Report\ReportPdfImage - * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox - * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class DeathReportModuleTest extends TestCase { protected static $uses_database = true; /** + * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait + * @covers \Fisharebest\Webtrees\Module\PedigreeReportModule + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer + * @covers \Fisharebest\Webtrees\Report\PdfRenderer + * @covers \Fisharebest\Webtrees\Report\ReportBaseCell + * @covers \Fisharebest\Webtrees\Report\ReportBaseElement + * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote + * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml + * @covers \Fisharebest\Webtrees\Report\ReportBaseImage + * @covers \Fisharebest\Webtrees\Report\ReportBaseLine + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader + * @covers \Fisharebest\Webtrees\Report\ReportBaseText + * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox + * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider + * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell + * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote + * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml + * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage + * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlText + * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox + * @covers \Fisharebest\Webtrees\Report\ReportParserBase + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportParserSetup + * @covers \Fisharebest\Webtrees\Report\ReportPdfCell + * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote + * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml + * @covers \Fisharebest\Webtrees\Report\ReportPdfImage + * @covers \Fisharebest\Webtrees\Report\ReportPdfLine + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportPdfText + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox + * @covers \Fisharebest\Webtrees\Report\TcpdfWrapper + * * @return void */ public function testReportRunsWithoutError(): void { $data_filesystem = new Filesystem(new NullAdapter()); + $module_service = new ModuleService(); $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret'); $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1'); Auth::login($user); - $tree = $this->importTree('demo.ged'); - $xml = Webtrees::ROOT_DIR . 'resources/xml/reports/death_report.xml'; - $vars = [ + $tree = $this->importTree('demo.ged'); + $module = $module_service->findByInterface(DeathReportModule::class)->first(); + $xml = 'resources/' . $module->xmlFilename(); + $vars = [ 'name' => ['id' => ''], 'deathplace' => ['id' => ''], 'deathdate1' => ['id' => ''], diff --git a/tests/app/Module/DescendancyReportModuleTest.php b/tests/app/Module/DescendancyReportModuleTest.php index ae3b208883..4984073cad 100644 --- a/tests/app/Module/DescendancyReportModuleTest.php +++ b/tests/app/Module/DescendancyReportModuleTest.php @@ -24,10 +24,10 @@ use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; use Fisharebest\Webtrees\Report\PdfRenderer; +use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; -use Fisharebest\Webtrees\Webtrees; use League\Flysystem\Adapter\NullAdapter; use League\Flysystem\Filesystem; use PHPUnit\Framework\Error\Notice; @@ -37,61 +37,63 @@ use function ob_start; /** * Test harness for the class DescendancyReportModule - * - * @covers \Fisharebest\Webtrees\Module\DescendancyReportModule - * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractRenderer - * @covers \Fisharebest\Webtrees\Report\ReportBaseCell - * @covers \Fisharebest\Webtrees\Report\ReportBaseElement - * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote - * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml - * @covers \Fisharebest\Webtrees\Report\ReportBaseImage - * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader - * @covers \Fisharebest\Webtrees\Report\ReportBaseText - * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox - * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\HtmlRenderer - * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell - * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote - * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml - * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage - * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportHtmlText - * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox - * @covers \Fisharebest\Webtrees\Report\ReportParserBase - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate - * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\PdfRenderer - * @covers \Fisharebest\Webtrees\Report\ReportPdfCell - * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote - * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml - * @covers \Fisharebest\Webtrees\Report\ReportPdfImage - * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox - * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class DescendancyReportModuleTest extends TestCase { protected static $uses_database = true; /** + * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait + * @covers \Fisharebest\Webtrees\Module\PedigreeReportModule + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer + * @covers \Fisharebest\Webtrees\Report\PdfRenderer + * @covers \Fisharebest\Webtrees\Report\ReportBaseCell + * @covers \Fisharebest\Webtrees\Report\ReportBaseElement + * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote + * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml + * @covers \Fisharebest\Webtrees\Report\ReportBaseImage + * @covers \Fisharebest\Webtrees\Report\ReportBaseLine + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader + * @covers \Fisharebest\Webtrees\Report\ReportBaseText + * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox + * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider + * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell + * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote + * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml + * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage + * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlText + * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox + * @covers \Fisharebest\Webtrees\Report\ReportParserBase + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportParserSetup + * @covers \Fisharebest\Webtrees\Report\ReportPdfCell + * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote + * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml + * @covers \Fisharebest\Webtrees\Report\ReportPdfImage + * @covers \Fisharebest\Webtrees\Report\ReportPdfLine + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportPdfText + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox + * @covers \Fisharebest\Webtrees\Report\TcpdfWrapper + * * @return void */ public function testReportRunsWithoutError(): void { $data_filesystem = new Filesystem(new NullAdapter()); + $module_service = new ModuleService(); $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret'); $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1'); Auth::login($user); - $tree = $this->importTree('demo.ged'); - $xml = Webtrees::ROOT_DIR . 'resources/xml/reports/descendancy_report.xml'; - $vars = [ + $tree = $this->importTree('demo.ged'); + $module = $module_service->findByInterface(DescendancyReportModule::class)->first(); + $xml = 'resources/' . $module->xmlFilename(); + $vars = [ 'pid' => ['id' => 'X1030'], 'maxgen' => ['id' => '3'], 'sources' => ['id' => 'on'], diff --git a/tests/app/Module/FactSourcesReportModuleTest.php b/tests/app/Module/FactSourcesReportModuleTest.php index 5f9a0d0ebb..63506912ee 100644 --- a/tests/app/Module/FactSourcesReportModuleTest.php +++ b/tests/app/Module/FactSourcesReportModuleTest.php @@ -24,70 +24,72 @@ use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; use Fisharebest\Webtrees\Report\PdfRenderer; +use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; -use Fisharebest\Webtrees\Webtrees; use League\Flysystem\Adapter\NullAdapter; use League\Flysystem\Filesystem; /** * Test harness for the class FactSourcesReportModule - * - * @covers \Fisharebest\Webtrees\Module\FactSourcesReportModule - * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractRenderer - * @covers \Fisharebest\Webtrees\Report\ReportBaseCell - * @covers \Fisharebest\Webtrees\Report\ReportBaseElement - * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote - * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml - * @covers \Fisharebest\Webtrees\Report\ReportBaseImage - * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader - * @covers \Fisharebest\Webtrees\Report\ReportBaseText - * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox - * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\HtmlRenderer - * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell - * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote - * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml - * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage - * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportHtmlText - * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox - * @covers \Fisharebest\Webtrees\Report\ReportParserBase - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate - * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\PdfRenderer - * @covers \Fisharebest\Webtrees\Report\ReportPdfCell - * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote - * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml - * @covers \Fisharebest\Webtrees\Report\ReportPdfImage - * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox - * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class FactSourcesReportModuleTest extends TestCase { protected static $uses_database = true; /** + * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait + * @covers \Fisharebest\Webtrees\Module\PedigreeReportModule + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer + * @covers \Fisharebest\Webtrees\Report\PdfRenderer + * @covers \Fisharebest\Webtrees\Report\ReportBaseCell + * @covers \Fisharebest\Webtrees\Report\ReportBaseElement + * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote + * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml + * @covers \Fisharebest\Webtrees\Report\ReportBaseImage + * @covers \Fisharebest\Webtrees\Report\ReportBaseLine + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader + * @covers \Fisharebest\Webtrees\Report\ReportBaseText + * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox + * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider + * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell + * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote + * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml + * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage + * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlText + * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox + * @covers \Fisharebest\Webtrees\Report\ReportParserBase + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportParserSetup + * @covers \Fisharebest\Webtrees\Report\ReportPdfCell + * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote + * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml + * @covers \Fisharebest\Webtrees\Report\ReportPdfImage + * @covers \Fisharebest\Webtrees\Report\ReportPdfLine + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportPdfText + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox + * @covers \Fisharebest\Webtrees\Report\TcpdfWrapper + * * @return void */ public function testReportRunsWithoutError(): void { $data_filesystem = new Filesystem(new NullAdapter()); + $module_service = new ModuleService(); $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret'); $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1'); Auth::login($user); - $tree = $this->importTree('demo.ged'); - $xml = Webtrees::ROOT_DIR . 'resources/xml/reports/fact_sources.xml'; - $vars = [ + $tree = $this->importTree('demo.ged'); + $module = $module_service->findByInterface(FactSourcesReportModule::class)->first(); + $xml = 'resources/' . $module->xmlFilename(); + $vars = [ 'id' => ['id' => 's1'], 'stype' => ['id' => 'facts'], 'sortby' => ['id' => 'BIRT:DATE'], diff --git a/tests/app/Module/FamilyGroupReportModuleTest.php b/tests/app/Module/FamilyGroupReportModuleTest.php index 85ba46c699..11d7c1c4ea 100644 --- a/tests/app/Module/FamilyGroupReportModuleTest.php +++ b/tests/app/Module/FamilyGroupReportModuleTest.php @@ -24,70 +24,72 @@ use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; use Fisharebest\Webtrees\Report\PdfRenderer; +use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; -use Fisharebest\Webtrees\Webtrees; use League\Flysystem\Adapter\NullAdapter; use League\Flysystem\Filesystem; /** * Test harness for the class FamilyGroupReportModule - * - * @covers \Fisharebest\Webtrees\Module\FamilyGroupReportModule - * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractRenderer - * @covers \Fisharebest\Webtrees\Report\ReportBaseCell - * @covers \Fisharebest\Webtrees\Report\ReportBaseElement - * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote - * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml - * @covers \Fisharebest\Webtrees\Report\ReportBaseImage - * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader - * @covers \Fisharebest\Webtrees\Report\ReportBaseText - * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox - * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\HtmlRenderer - * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell - * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote - * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml - * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage - * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportHtmlText - * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox - * @covers \Fisharebest\Webtrees\Report\ReportParserBase - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate - * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\PdfRenderer - * @covers \Fisharebest\Webtrees\Report\ReportPdfCell - * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote - * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml - * @covers \Fisharebest\Webtrees\Report\ReportPdfImage - * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox - * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class FamilyGroupReportModuleTest extends TestCase { protected static $uses_database = true; /** + * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait + * @covers \Fisharebest\Webtrees\Module\PedigreeReportModule + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer + * @covers \Fisharebest\Webtrees\Report\PdfRenderer + * @covers \Fisharebest\Webtrees\Report\ReportBaseCell + * @covers \Fisharebest\Webtrees\Report\ReportBaseElement + * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote + * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml + * @covers \Fisharebest\Webtrees\Report\ReportBaseImage + * @covers \Fisharebest\Webtrees\Report\ReportBaseLine + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader + * @covers \Fisharebest\Webtrees\Report\ReportBaseText + * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox + * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider + * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell + * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote + * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml + * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage + * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlText + * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox + * @covers \Fisharebest\Webtrees\Report\ReportParserBase + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportParserSetup + * @covers \Fisharebest\Webtrees\Report\ReportPdfCell + * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote + * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml + * @covers \Fisharebest\Webtrees\Report\ReportPdfImage + * @covers \Fisharebest\Webtrees\Report\ReportPdfLine + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportPdfText + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox + * @covers \Fisharebest\Webtrees\Report\TcpdfWrapper + * * @return void */ public function testReportRunsWithoutError(): void { $data_filesystem = new Filesystem(new NullAdapter()); + $module_service = new ModuleService(); $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret'); $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1'); Auth::login($user); - $tree = $this->importTree('demo.ged'); - $xml = Webtrees::ROOT_DIR . 'resources/xml/reports/family_group_report.xml'; - $vars = [ + $tree = $this->importTree('demo.ged'); + $module = $module_service->findByInterface(FamilyGroupReportModule::class)->first(); + $xml = 'resources/' . $module->xmlFilename(); + $vars = [ 'id' => ['id' => 'f1'], 'sources' => ['id' => 'on'], 'notes' => ['id' => 'on'], diff --git a/tests/app/Module/IndividualFamiliesReportModuleTest.php b/tests/app/Module/IndividualFamiliesReportModuleTest.php index 1944c3cb0b..26668b70c3 100644 --- a/tests/app/Module/IndividualFamiliesReportModuleTest.php +++ b/tests/app/Module/IndividualFamiliesReportModuleTest.php @@ -24,10 +24,10 @@ use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; use Fisharebest\Webtrees\Report\PdfRenderer; +use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; -use Fisharebest\Webtrees\Webtrees; use League\Flysystem\Adapter\NullAdapter; use League\Flysystem\Filesystem; use PHPUnit\Framework\Error\Notice; @@ -37,61 +37,63 @@ use function ob_start; /** * Test harness for the class IndividualFamiliesReportModule - * - * @covers \Fisharebest\Webtrees\Module\IndividualFamiliesReportModule - * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractRenderer - * @covers \Fisharebest\Webtrees\Report\ReportBaseCell - * @covers \Fisharebest\Webtrees\Report\ReportBaseElement - * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote - * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml - * @covers \Fisharebest\Webtrees\Report\ReportBaseImage - * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader - * @covers \Fisharebest\Webtrees\Report\ReportBaseText - * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox - * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\HtmlRenderer - * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell - * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote - * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml - * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage - * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportHtmlText - * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox - * @covers \Fisharebest\Webtrees\Report\ReportParserBase - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate - * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\PdfRenderer - * @covers \Fisharebest\Webtrees\Report\ReportPdfCell - * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote - * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml - * @covers \Fisharebest\Webtrees\Report\ReportPdfImage - * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox - * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class IndividualFamiliesReportModuleTest extends TestCase { protected static $uses_database = true; /** + * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait + * @covers \Fisharebest\Webtrees\Module\PedigreeReportModule + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer + * @covers \Fisharebest\Webtrees\Report\PdfRenderer + * @covers \Fisharebest\Webtrees\Report\ReportBaseCell + * @covers \Fisharebest\Webtrees\Report\ReportBaseElement + * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote + * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml + * @covers \Fisharebest\Webtrees\Report\ReportBaseImage + * @covers \Fisharebest\Webtrees\Report\ReportBaseLine + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader + * @covers \Fisharebest\Webtrees\Report\ReportBaseText + * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox + * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider + * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell + * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote + * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml + * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage + * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlText + * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox + * @covers \Fisharebest\Webtrees\Report\ReportParserBase + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportParserSetup + * @covers \Fisharebest\Webtrees\Report\ReportPdfCell + * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote + * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml + * @covers \Fisharebest\Webtrees\Report\ReportPdfImage + * @covers \Fisharebest\Webtrees\Report\ReportPdfLine + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportPdfText + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox + * @covers \Fisharebest\Webtrees\Report\TcpdfWrapper + * * @return void */ public function testReportRunsWithoutError(): void { $data_filesystem = new Filesystem(new NullAdapter()); + $module_service = new ModuleService(); $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret'); $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1'); Auth::login($user); - $tree = $this->importTree('demo.ged'); - $xml = Webtrees::ROOT_DIR . 'resources/xml/reports/individual_ext_report.xml'; - $vars = [ + $tree = $this->importTree('demo.ged'); + $module = $module_service->findByInterface(IndividualFamiliesReportModule::class)->first(); + $xml = 'resources/' . $module->xmlFilename(); + $vars = [ 'pid' => ['id' => 'X1030'], 'relatives' => ['id' => 'child-families'], 'maxgen' => ['id' => '4'], diff --git a/tests/app/Module/IndividualReportModuleTest.php b/tests/app/Module/IndividualReportModuleTest.php index 1e73a4113c..77efbfcb49 100644 --- a/tests/app/Module/IndividualReportModuleTest.php +++ b/tests/app/Module/IndividualReportModuleTest.php @@ -24,75 +24,76 @@ use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; use Fisharebest\Webtrees\Report\PdfRenderer; +use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; -use Fisharebest\Webtrees\Webtrees; use League\Flysystem\Adapter\NullAdapter; use League\Flysystem\Filesystem; /** * Test harness for the class IndividualReportModule - * - * @covers \Fisharebest\Webtrees\Module\IndividualReportModule - * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractRenderer - * @covers \Fisharebest\Webtrees\Report\ReportBaseCell - * @covers \Fisharebest\Webtrees\Report\ReportBaseElement - * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote - * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml - * @covers \Fisharebest\Webtrees\Report\ReportBaseImage - * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader - * @covers \Fisharebest\Webtrees\Report\ReportBaseText - * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox - * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\HtmlRenderer - * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell - * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote - * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml - * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage - * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportHtmlText - * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox - * @covers \Fisharebest\Webtrees\Report\ReportParserBase - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate - * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\PdfRenderer - * @covers \Fisharebest\Webtrees\Report\ReportPdfCell - * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote - * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml - * @covers \Fisharebest\Webtrees\Report\ReportPdfImage - * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox - * @covers \Fisharebest\Webtrees\Report\ReportTcpdf - * @covers \Fisharebest\Webtrees\Report\PdfRenderer */ class IndividualReportModuleTest extends TestCase { protected static $uses_database = true; /** + * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait + * @covers \Fisharebest\Webtrees\Module\PedigreeReportModule + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer + * @covers \Fisharebest\Webtrees\Report\PdfRenderer + * @covers \Fisharebest\Webtrees\Report\ReportBaseCell + * @covers \Fisharebest\Webtrees\Report\ReportBaseElement + * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote + * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml + * @covers \Fisharebest\Webtrees\Report\ReportBaseImage + * @covers \Fisharebest\Webtrees\Report\ReportBaseLine + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader + * @covers \Fisharebest\Webtrees\Report\ReportBaseText + * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox + * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider + * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell + * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote + * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml + * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage + * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlText + * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox + * @covers \Fisharebest\Webtrees\Report\ReportParserBase + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportParserSetup + * @covers \Fisharebest\Webtrees\Report\ReportPdfCell + * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote + * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml + * @covers \Fisharebest\Webtrees\Report\ReportPdfImage + * @covers \Fisharebest\Webtrees\Report\ReportPdfLine + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportPdfText + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox + * @covers \Fisharebest\Webtrees\Report\TcpdfWrapper + * * @return void */ public function testReportRunsWithoutError(): void { $data_filesystem = new Filesystem(new NullAdapter()); + $module_service = new ModuleService(); $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret'); $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1'); Auth::login($user); - $tree = $this->importTree('demo.ged'); - $xml = Webtrees::ROOT_DIR . 'resources/xml/reports/individual_report.xml'; - $vars = [ + $tree = $this->importTree('demo.ged'); + $module = $module_service->findByInterface(IndividualReportModule::class)->first(); + $xml = 'resources/' . $module->xmlFilename(); + $vars = [ 'id' => ['id' => 'X1030'], 'sources' => ['id' => 'on'], 'notes' => ['id' => 'on'], - 'photos' => ['id' => 'highlighted'], + 'photos' => ['id' => 'all'], 'colors' => ['id' => 'on'], 'pageSize' => ['id' => 'A4'], ]; diff --git a/tests/app/Module/MarriageReportModuleTest.php b/tests/app/Module/MarriageReportModuleTest.php index 215aa9ac6a..abffe015c2 100644 --- a/tests/app/Module/MarriageReportModuleTest.php +++ b/tests/app/Module/MarriageReportModuleTest.php @@ -24,70 +24,72 @@ use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; use Fisharebest\Webtrees\Report\PdfRenderer; +use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; -use Fisharebest\Webtrees\Webtrees; use League\Flysystem\Adapter\NullAdapter; use League\Flysystem\Filesystem; /** * Test harness for the class MarriageReportModule - * - * @covers \Fisharebest\Webtrees\Module\MarriageReportModule - * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractRenderer - * @covers \Fisharebest\Webtrees\Report\ReportBaseCell - * @covers \Fisharebest\Webtrees\Report\ReportBaseElement - * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote - * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml - * @covers \Fisharebest\Webtrees\Report\ReportBaseImage - * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader - * @covers \Fisharebest\Webtrees\Report\ReportBaseText - * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox - * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\HtmlRenderer - * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell - * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote - * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml - * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage - * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportHtmlText - * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox - * @covers \Fisharebest\Webtrees\Report\ReportParserBase - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate - * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\PdfRenderer - * @covers \Fisharebest\Webtrees\Report\ReportPdfCell - * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote - * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml - * @covers \Fisharebest\Webtrees\Report\ReportPdfImage - * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox - * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class MarriageReportModuleTest extends TestCase { protected static $uses_database = true; /** + * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait + * @covers \Fisharebest\Webtrees\Module\PedigreeReportModule + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer + * @covers \Fisharebest\Webtrees\Report\PdfRenderer + * @covers \Fisharebest\Webtrees\Report\ReportBaseCell + * @covers \Fisharebest\Webtrees\Report\ReportBaseElement + * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote + * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml + * @covers \Fisharebest\Webtrees\Report\ReportBaseImage + * @covers \Fisharebest\Webtrees\Report\ReportBaseLine + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader + * @covers \Fisharebest\Webtrees\Report\ReportBaseText + * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox + * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider + * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell + * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote + * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml + * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage + * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlText + * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox + * @covers \Fisharebest\Webtrees\Report\ReportParserBase + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportParserSetup + * @covers \Fisharebest\Webtrees\Report\ReportPdfCell + * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote + * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml + * @covers \Fisharebest\Webtrees\Report\ReportPdfImage + * @covers \Fisharebest\Webtrees\Report\ReportPdfLine + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportPdfText + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox + * @covers \Fisharebest\Webtrees\Report\TcpdfWrapper + * * @return void */ public function testReportRunsWithoutError(): void { $data_filesystem = new Filesystem(new NullAdapter()); + $module_service = new ModuleService(); $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret'); $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1'); Auth::login($user); - $tree = $this->importTree('demo.ged'); - $xml = Webtrees::ROOT_DIR . 'resources/xml/reports/marriage_report.xml'; - $vars = [ + $tree = $this->importTree('demo.ged'); + $module = $module_service->findByInterface(MarriageReportModule::class)->first(); + $xml = 'resources/' . $module->xmlFilename(); + $vars = [ 'name' => ['id' => ''], 'marrplace' => ['id' => ''], 'marrdate1' => ['id' => ''], diff --git a/tests/app/Module/MissingFactsReportModuleTest.php b/tests/app/Module/MissingFactsReportModuleTest.php index e8fc653dbe..862dc2c0c0 100644 --- a/tests/app/Module/MissingFactsReportModuleTest.php +++ b/tests/app/Module/MissingFactsReportModuleTest.php @@ -24,70 +24,72 @@ use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; use Fisharebest\Webtrees\Report\PdfRenderer; +use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; -use Fisharebest\Webtrees\Webtrees; use League\Flysystem\Adapter\NullAdapter; use League\Flysystem\Filesystem; /** * Test harness for the class MissingFactsReportModule - * - * @covers \Fisharebest\Webtrees\Module\MissingFactsReportModule - * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractRenderer - * @covers \Fisharebest\Webtrees\Report\ReportBaseCell - * @covers \Fisharebest\Webtrees\Report\ReportBaseElement - * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote - * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml - * @covers \Fisharebest\Webtrees\Report\ReportBaseImage - * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader - * @covers \Fisharebest\Webtrees\Report\ReportBaseText - * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox - * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\HtmlRenderer - * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell - * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote - * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml - * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage - * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportHtmlText - * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox - * @covers \Fisharebest\Webtrees\Report\ReportParserBase - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate - * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\PdfRenderer - * @covers \Fisharebest\Webtrees\Report\ReportPdfCell - * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote - * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml - * @covers \Fisharebest\Webtrees\Report\ReportPdfImage - * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox - * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class MissingFactsReportModuleTest extends TestCase { protected static $uses_database = true; /** + * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait + * @covers \Fisharebest\Webtrees\Module\PedigreeReportModule + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer + * @covers \Fisharebest\Webtrees\Report\PdfRenderer + * @covers \Fisharebest\Webtrees\Report\ReportBaseCell + * @covers \Fisharebest\Webtrees\Report\ReportBaseElement + * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote + * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml + * @covers \Fisharebest\Webtrees\Report\ReportBaseImage + * @covers \Fisharebest\Webtrees\Report\ReportBaseLine + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader + * @covers \Fisharebest\Webtrees\Report\ReportBaseText + * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox + * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider + * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell + * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote + * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml + * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage + * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlText + * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox + * @covers \Fisharebest\Webtrees\Report\ReportParserBase + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportParserSetup + * @covers \Fisharebest\Webtrees\Report\ReportPdfCell + * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote + * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml + * @covers \Fisharebest\Webtrees\Report\ReportPdfImage + * @covers \Fisharebest\Webtrees\Report\ReportPdfLine + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportPdfText + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox + * @covers \Fisharebest\Webtrees\Report\TcpdfWrapper + * * @return void */ public function testReportRunsWithoutError(): void { $data_filesystem = new Filesystem(new NullAdapter()); + $module_service = new ModuleService(); $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret'); $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1'); Auth::login($user); - $tree = $this->importTree('demo.ged'); - $xml = Webtrees::ROOT_DIR . 'resources/xml/reports/missing_facts_report.xml'; - $vars = [ + $tree = $this->importTree('demo.ged'); + $module = $module_service->findByInterface(MissingFactsReportModule::class)->first(); + $xml = 'resources/' . $module->xmlFilename(); + $vars = [ 'pid' => ['id' => 'X1030'], 'relatives' => ['id' => 'direct-ancestors'], 'maxgen' => ['id' => '*'], diff --git a/tests/app/Module/OccupationReportModuleTest.php b/tests/app/Module/OccupationReportModuleTest.php index 90b122ef27..d7184ff5f0 100644 --- a/tests/app/Module/OccupationReportModuleTest.php +++ b/tests/app/Module/OccupationReportModuleTest.php @@ -24,70 +24,72 @@ use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; use Fisharebest\Webtrees\Report\PdfRenderer; +use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; -use Fisharebest\Webtrees\Webtrees; use League\Flysystem\Adapter\NullAdapter; use League\Flysystem\Filesystem; /** * Test harness for the class OccupationReportModule - * - * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Module\OccupationReportModule - * @covers \Fisharebest\Webtrees\Report\AbstractRenderer - * @covers \Fisharebest\Webtrees\Report\ReportBaseCell - * @covers \Fisharebest\Webtrees\Report\ReportBaseElement - * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote - * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml - * @covers \Fisharebest\Webtrees\Report\ReportBaseImage - * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader - * @covers \Fisharebest\Webtrees\Report\ReportBaseText - * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox - * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\HtmlRenderer - * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell - * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote - * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml - * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage - * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportHtmlText - * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox - * @covers \Fisharebest\Webtrees\Report\ReportParserBase - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate - * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\PdfRenderer - * @covers \Fisharebest\Webtrees\Report\ReportPdfCell - * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote - * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml - * @covers \Fisharebest\Webtrees\Report\ReportPdfImage - * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox - * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class OccupationReportModuleTest extends TestCase { protected static $uses_database = true; /** + * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait + * @covers \Fisharebest\Webtrees\Module\PedigreeReportModule + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer + * @covers \Fisharebest\Webtrees\Report\PdfRenderer + * @covers \Fisharebest\Webtrees\Report\ReportBaseCell + * @covers \Fisharebest\Webtrees\Report\ReportBaseElement + * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote + * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml + * @covers \Fisharebest\Webtrees\Report\ReportBaseImage + * @covers \Fisharebest\Webtrees\Report\ReportBaseLine + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader + * @covers \Fisharebest\Webtrees\Report\ReportBaseText + * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox + * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider + * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell + * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote + * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml + * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage + * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlText + * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox + * @covers \Fisharebest\Webtrees\Report\ReportParserBase + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportParserSetup + * @covers \Fisharebest\Webtrees\Report\ReportPdfCell + * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote + * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml + * @covers \Fisharebest\Webtrees\Report\ReportPdfImage + * @covers \Fisharebest\Webtrees\Report\ReportPdfLine + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportPdfText + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox + * @covers \Fisharebest\Webtrees\Report\TcpdfWrapper + * * @return void */ public function testReportRunsWithoutError(): void { $data_filesystem = new Filesystem(new NullAdapter()); + $module_service = new ModuleService(); $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret'); $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1'); Auth::login($user); - $tree = $this->importTree('demo.ged'); - $xml = Webtrees::ROOT_DIR . 'resources/xml/reports/occupation_report.xml'; - $vars = [ + $tree = $this->importTree('demo.ged'); + $module = $module_service->findByInterface(OccupationReportModule::class)->first(); + $xml = 'resources/' . $module->xmlFilename(); + $vars = [ 'occupation' => ['id' => 'king'], 'pageSize' => ['id' => 'A4'], 'sortby' => ['id' => 'NAME'], diff --git a/tests/app/Module/PedigreeReportModuleTest.php b/tests/app/Module/PedigreeReportModuleTest.php index aa185761ae..a21109baa6 100644 --- a/tests/app/Module/PedigreeReportModuleTest.php +++ b/tests/app/Module/PedigreeReportModuleTest.php @@ -24,70 +24,72 @@ use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; use Fisharebest\Webtrees\Report\PdfRenderer; +use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; -use Fisharebest\Webtrees\Webtrees; use League\Flysystem\Adapter\NullAdapter; use League\Flysystem\Filesystem; /** * Test harness for the class PedigreeReportModule - * - * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Module\PedigreeReportModule - * @covers \Fisharebest\Webtrees\Report\AbstractRenderer - * @covers \Fisharebest\Webtrees\Report\ReportBaseCell - * @covers \Fisharebest\Webtrees\Report\ReportBaseElement - * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote - * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml - * @covers \Fisharebest\Webtrees\Report\ReportBaseImage - * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader - * @covers \Fisharebest\Webtrees\Report\ReportBaseText - * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox - * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\HtmlRenderer - * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell - * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote - * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml - * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage - * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportHtmlText - * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox - * @covers \Fisharebest\Webtrees\Report\ReportParserBase - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate - * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\PdfRenderer - * @covers \Fisharebest\Webtrees\Report\ReportPdfCell - * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote - * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml - * @covers \Fisharebest\Webtrees\Report\ReportPdfImage - * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox - * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class PedigreeReportModuleTest extends TestCase { protected static $uses_database = true; /** + * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait + * @covers \Fisharebest\Webtrees\Module\PedigreeReportModule + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer + * @covers \Fisharebest\Webtrees\Report\PdfRenderer + * @covers \Fisharebest\Webtrees\Report\ReportBaseCell + * @covers \Fisharebest\Webtrees\Report\ReportBaseElement + * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote + * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml + * @covers \Fisharebest\Webtrees\Report\ReportBaseImage + * @covers \Fisharebest\Webtrees\Report\ReportBaseLine + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader + * @covers \Fisharebest\Webtrees\Report\ReportBaseText + * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox + * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider + * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell + * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote + * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml + * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage + * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlText + * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox + * @covers \Fisharebest\Webtrees\Report\ReportParserBase + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportParserSetup + * @covers \Fisharebest\Webtrees\Report\ReportPdfCell + * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote + * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml + * @covers \Fisharebest\Webtrees\Report\ReportPdfImage + * @covers \Fisharebest\Webtrees\Report\ReportPdfLine + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportPdfText + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox + * @covers \Fisharebest\Webtrees\Report\TcpdfWrapper + * * @return void */ public function testReportRunsWithoutError(): void { $data_filesystem = new Filesystem(new NullAdapter()); + $module_service = new ModuleService(); $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret'); $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1'); Auth::login($user); - $tree = $this->importTree('demo.ged'); - $xml = Webtrees::ROOT_DIR . 'resources/xml/reports/pedigree_report.xml'; - $vars = [ + $tree = $this->importTree('demo.ged'); + $module = $module_service->findByInterface(PedigreeReportModule::class)->first(); + $xml = 'resources/' . $module->xmlFilename(); + $vars = [ 'pid' => ['id' => 'X1030'], 'spouses' => ['id' => 'on'], 'orientation' => ['id' => 'portrait'], diff --git a/tests/app/Module/RelatedIndividualsReportModuleTest.php b/tests/app/Module/RelatedIndividualsReportModuleTest.php index 0872968c28..1e2ded22c4 100644 --- a/tests/app/Module/RelatedIndividualsReportModuleTest.php +++ b/tests/app/Module/RelatedIndividualsReportModuleTest.php @@ -24,77 +24,79 @@ use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; use Fisharebest\Webtrees\Report\PdfRenderer; +use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; -use Fisharebest\Webtrees\Webtrees; use League\Flysystem\Adapter\NullAdapter; use League\Flysystem\Filesystem; /** * Test harness for the class RelatedIndividualsReportModule - * - * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Module\RelatedIndividualsReportModule - * @covers \Fisharebest\Webtrees\Report\AbstractRenderer - * @covers \Fisharebest\Webtrees\Report\ReportBaseCell - * @covers \Fisharebest\Webtrees\Report\ReportBaseElement - * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote - * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml - * @covers \Fisharebest\Webtrees\Report\ReportBaseImage - * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader - * @covers \Fisharebest\Webtrees\Report\ReportBaseText - * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox - * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\HtmlRenderer - * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell - * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote - * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml - * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage - * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportHtmlText - * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox - * @covers \Fisharebest\Webtrees\Report\ReportParserBase - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate - * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\PdfRenderer - * @covers \Fisharebest\Webtrees\Report\ReportPdfCell - * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote - * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml - * @covers \Fisharebest\Webtrees\Report\ReportPdfImage - * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader - * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox - * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class RelatedIndividualsReportModuleTest extends TestCase { protected static $uses_database = true; /** + * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait + * @covers \Fisharebest\Webtrees\Module\PedigreeReportModule + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer + * @covers \Fisharebest\Webtrees\Report\PdfRenderer + * @covers \Fisharebest\Webtrees\Report\ReportBaseCell + * @covers \Fisharebest\Webtrees\Report\ReportBaseElement + * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote + * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml + * @covers \Fisharebest\Webtrees\Report\ReportBaseImage + * @covers \Fisharebest\Webtrees\Report\ReportBaseLine + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader + * @covers \Fisharebest\Webtrees\Report\ReportBaseText + * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox + * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider + * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell + * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote + * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml + * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage + * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlText + * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox + * @covers \Fisharebest\Webtrees\Report\ReportParserBase + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportParserSetup + * @covers \Fisharebest\Webtrees\Report\ReportPdfCell + * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote + * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml + * @covers \Fisharebest\Webtrees\Report\ReportPdfImage + * @covers \Fisharebest\Webtrees\Report\ReportPdfLine + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader + * @covers \Fisharebest\Webtrees\Report\ReportPdfText + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox + * @covers \Fisharebest\Webtrees\Report\TcpdfWrapper + * * @return void */ public function testReportRunsWithoutError(): void { $data_filesystem = new Filesystem(new NullAdapter()); + $module_service = new ModuleService(); $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret'); $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1'); Auth::login($user); - $tree = $this->importTree('demo.ged'); - $xml = Webtrees::ROOT_DIR . 'resources/xml/reports/relative_ext_report.xml'; - $vars = [ + $tree = $this->importTree('demo.ged'); + $module = $module_service->findByInterface(RelatedIndividualsReportModule::class)->first(); + $xml = 'resources/' . $module->xmlFilename(); + $vars = [ 'pid' => ['id' => 'X1030'], 'relatives' => ['id' => 'child-family'], 'maxgen' => ['id' => '4'], 'sortby' => ['id' => 'BIRT:DATE'], 'sources' => ['id' => 'on'], 'notes' => ['id' => 'on'], - 'photos' => ['id' => 'highlighted'], + 'photos' => ['id' => 'all'], 'colors' => ['id' => 'on'], 'pageSize' => ['id' => 'A4'], ]; diff --git a/tests/app/Report/ReportBaseTest.php b/tests/app/Report/ReportBaseTest.php deleted file mode 100644 index 314fa06e67..0000000000 --- a/tests/app/Report/ReportBaseTest.php +++ /dev/null @@ -1,38 +0,0 @@ -<?php - -/** - * webtrees: online genealogy - * Copyright (C) 2019 webtrees development team - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -declare(strict_types=1); - -namespace Fisharebest\Webtrees\Report; - -use Fisharebest\Webtrees\TestCase; - -/** - * Test harness for the class ReportBase - */ -class ReportBaseTest extends TestCase -{ - /** - * Test that the class exists - * - * @return void - */ - public function testClassExists(): void - { - $this->assertTrue(class_exists(AbstractRenderer::class)); - } -} diff --git a/tests/app/Report/ReportHTMLTest.php b/tests/app/Report/ReportHTMLTest.php deleted file mode 100644 index fd1ed35a82..0000000000 --- a/tests/app/Report/ReportHTMLTest.php +++ /dev/null @@ -1,38 +0,0 @@ -<?php - -/** - * webtrees: online genealogy - * Copyright (C) 2019 webtrees development team - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -declare(strict_types=1); - -namespace Fisharebest\Webtrees\Report; - -use Fisharebest\Webtrees\TestCase; - -/** - * Test harness for the class ReportHtml - */ -class ReportHTMLTest extends TestCase -{ - /** - * Test that the class exists - * - * @return void - */ - public function testClassExists(): void - { - $this->assertTrue(class_exists(HtmlRenderer::class)); - } -} diff --git a/tests/app/Report/ReportPDFTest.php b/tests/app/Report/ReportPDFTest.php deleted file mode 100644 index 9ee9c401d1..0000000000 --- a/tests/app/Report/ReportPDFTest.php +++ /dev/null @@ -1,38 +0,0 @@ -<?php - -/** - * webtrees: online genealogy - * Copyright (C) 2019 webtrees development team - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -declare(strict_types=1); - -namespace Fisharebest\Webtrees\Report; - -use Fisharebest\Webtrees\TestCase; - -/** - * Test harness for the class ReportPdf - */ -class ReportPDFTest extends TestCase -{ - /** - * Test that the class exists - * - * @return void - */ - public function testClassExists(): void - { - $this->assertTrue(class_exists(PdfRenderer::class)); - } -} |