Tests

2 files changed, 33 insertions, 12 deletions

diff --git a/app/Module.php b/app/Module.php
index c2d426ba73..9cf7d0c327 100644
--- a/app/Module.php
+++ b/app/Module.php
@@ -136,11 +136,11 @@ class Module
         'bdm_report'             => BirthDeathMarriageReportModule::class,
         'bing-webmaster-tools'   => BingWebmasterToolsModule::class,
         'birth_report'           => BirthReportModule::class,
-        'calendar_menu'          => CalendarMenuModule::class,
+        'calendar-menu'          => CalendarMenuModule::class,
         'cemetery_report'        => CemeteryReportModule::class,
         'change_report'          => ChangeReportModule::class,
         'charts'                 => ChartsBlockModule::class,
-        'charts_menu'            => ChartsMenuModule::class,
+        'charts-menu'            => ChartsMenuModule::class,
         'ckeditor'               => CkeditorModule::class,
         'clippings'              => ClippingsCartModule::class,
         'compact-chart'          => CompactTreeChartModule::class,
@@ -167,7 +167,7 @@ class Module
         'individual_report'      => IndividualReportModule::class,
         'lifespans_chart'        => LifespansChartModule::class,
         'lightbox'               => AlbumModule::class,
-        'lists_menu'             => ListsMenuModule::class,
+        'lists-menu'             => ListsMenuModule::class,
         'logged_in'              => LoggedInUsersModule::class,
         'login_block'            => LoginBlockModule::class,
         'marriage_report'        => MarriageReportModule::class,
@@ -186,9 +186,9 @@ class Module
         'relationships_chart'    => RelationshipsChartModule::class,
         'relative_ext_report'    => RelatedIndividualsReportModule::class,
         'relatives'              => RelativesTabModule::class,
-        'reports_menu'           => ReportsMenuModule::class,
+        'reports-menu'           => ReportsMenuModule::class,
         'review_changes'         => ReviewChangesModule::class,
-        'search_menu'            => SearchMenuModule::class,
+        'search-menu'            => SearchMenuModule::class,
         'sitemap'                => SiteMapModule::class,
         'sources_tab'            => SourcesTabModule::class,
         'statcounter'            => StatcounterModule::class,
@@ -202,7 +202,7 @@ class Module
         'top10_pageviews'        => TopPageViewsModule::class,
         'top10_surnames'         => TopSurnamesModule::class,
         'tree'                   => InteractiveTreeModule::class,
-        'trees_menu'             => TreesMenuModule::class,
+        'trees-menu'             => TreesMenuModule::class,
         'upcoming_events'        => UpcomingAnniversariesModule::class,
         'user_blog'              => UserJournalModule::class,
         'user_favorites'         => UserFavoritesModule::class,
diff --git a/tests/app/ModuleTest.php b/tests/app/ModuleTest.php
index f47481b231..73ef4f1a2f 100644
--- a/tests/app/ModuleTest.php
+++ b/tests/app/ModuleTest.php
@@ -25,6 +25,7 @@ use Fisharebest\Webtrees\Module\ModuleMenuInterface;
 use Fisharebest\Webtrees\Module\ModuleReportInterface;
 use Fisharebest\Webtrees\Module\ModuleSidebarInterface;
 use Fisharebest\Webtrees\Module\ModuleThemeInterface;
+use Fisharebest\Webtrees\Module\TreesMenuModule;
 
 /**
  * Test the modules
@@ -36,14 +37,28 @@ class ModuleTest extends \Fisharebest\Webtrees\TestCase
     protected static $uses_database = true;
 
     /**
+     * @covers \Fisharebest\Webtrees\Module::all
+     * @covers \Fisharebest\Webtrees\Module::coreModules
+     * @covers \Fisharebest\Webtrees\Module::customModules
+     * @covers \Fisharebest\Webtrees\Module::menuSorter
+     * @return void
+     */
+    public function testAll(): void
+    {
+        $this->assertNotEmpty(Module::all());
+    }
+
+    /**
      * @covers \Fisharebest\Webtrees\Module::findByComponent
-     *
+     * @covers \Fisharebest\Webtrees\Module::menuSorter
+     * @covers \Fisharebest\Webtrees\Module::sidebarSorter
+     * @covers \Fisharebest\Webtrees\Module::tabSorter
      * @return void
      */
     public function testFindByComponent(): void
     {
         $tree = $this->importTree('demo.ged');
-        $user  = User::create('UserName', 'RealName', 'user@example.com', 'secret');
+        $user = User::create('UserName', 'RealName', 'user@example.com', 'secret');
 
         $this->assertNotEmpty(Module::findByComponent('block', $tree, $user)->all());
         $this->assertNotEmpty(Module::findByComponent('chart', $tree, $user)->all());
@@ -55,14 +70,10 @@ class ModuleTest extends \Fisharebest\Webtrees\TestCase
 
     /**
      * @covers \Fisharebest\Webtrees\Module::findByInterface
-     *
      * @return void
      */
     public function testFindByInterface(): void
     {
-        $tree = $this->importTree('demo.ged');
-        $user  = User::create('UserName', 'RealName', 'user@example.com', 'secret');
-
         $this->assertNotEmpty(Module::findByInterface(ModuleBlockInterface::class)->all());
         $this->assertNotEmpty(Module::findByInterface(ModuleChartInterface::class)->all());
         $this->assertNotEmpty(Module::findByInterface(ModuleConfigInterface::class)->all());
@@ -75,4 +86,14 @@ class ModuleTest extends \Fisharebest\Webtrees\TestCase
         $this->assertEmpty(Module::findByInterface(ModuleHistoricEventsInterface::class)->all());
         $this->assertEmpty(Module::findByInterface(ModuleThemeInterface::class)->all());
     }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Module::findByName
+     * @return void
+     */
+    public function testFindByName(): void
+    {
+        $this->assertNull(Module::findByName(Module::class));
+        $this->assertInstanceOf(TreesMenuModule::class, Module::findByName('trees-menu'));
+    }
 }