Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit df0313d

Browse files
author
Jamie Snape
committed
Collapse the many style tests into a few less
1 parent 30fab4b commit df0313d

File tree

39 files changed

+64
-235
lines changed

39 files changed

+64
-235
lines changed

‎core/tests/CMakeLists.txt‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,10 @@
1717
# limitations under the License.
1818
#=============================================================================
1919

20+
add_midas_style_test(StyleCore ${CMAKE_SOURCE_DIR}/core)
21+
add_midas_style_test(StyleIndex ${CMAKE_SOURCE_DIR}/index.php)
22+
add_midas_style_test(StyleKWUtils ${CMAKE_SOURCE_DIR}/library/KWUtils.php)
23+
add_midas_style_test(StyleNotification ${CMAKE_SOURCE_DIR}/notification)
24+
2025
add_subdirectory(controllers)
2126
add_subdirectory(models)
22-
23-
add_midas_style_test(StyleCoreApiController ${CMAKE_SOURCE_DIR}/core/ApiController.php)
24-
add_midas_style_test(StyleCoreAppComponent ${CMAKE_SOURCE_DIR}/core/AppComponent.php)
25-
add_midas_style_test(StyleCoreAppController ${CMAKE_SOURCE_DIR}/core/AppController.php)
26-
add_midas_style_test(StyleCoreAppForm ${CMAKE_SOURCE_DIR}/core/AppForm.php)
27-
add_midas_style_test(StyleCoreBootstrap ${CMAKE_SOURCE_DIR}/core/Bootstrap.php)
28-
add_midas_style_test(StyleCoreComponentLoader ${CMAKE_SOURCE_DIR}/core/ComponentLoader.php)
29-
add_midas_style_test(StyleCoreConstant ${CMAKE_SOURCE_DIR}/core/constant)
30-
add_midas_style_test(StyleCoreGlobalComponent ${CMAKE_SOURCE_DIR}/core/GlobalComponent.php)
31-
add_midas_style_test(StyleCoreGlobalController ${CMAKE_SOURCE_DIR}/core/GlobalController.php)
32-
add_midas_style_test(StyleCoreInclude ${CMAKE_SOURCE_DIR}/core/include.php)
33-
add_midas_style_test(StyleCoreMidasLoader ${CMAKE_SOURCE_DIR}/core/MidasLoader.php)
34-
add_midas_style_test(StyleCoreNotification ${CMAKE_SOURCE_DIR}/core/Notification.php)
35-
add_midas_style_test(StyleCoreTestsControllers ${CMAKE_SOURCE_DIR}/core/tests/controllers)
36-
add_midas_style_test(StyleCoreTestsModels ${CMAKE_SOURCE_DIR}/core/tests/models)
37-
add_midas_style_test(StyleIndex ${CMAKE_SOURCE_DIR}/index.php)

‎core/tests/controllers/CMakeLists.txt‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,3 @@ add_midas_test(CoreUserController UserControllerTest.php)
3333

3434
add_subdirectory(api)
3535
add_subdirectory(components)
36-
37-
add_midas_style_test(StyleCoreAdminController ${CMAKE_SOURCE_DIR}/core/controllers/AdminController.php)
38-
add_midas_style_test(StyleCoreAssetstoreController ${CMAKE_SOURCE_DIR}/core/controllers/AssetstoreController.php)
39-
add_midas_style_test(StyleCoreBrowseController ${CMAKE_SOURCE_DIR}/core/controllers/BrowseController.php)
40-
add_midas_style_test(StyleCoreCommunityController ${CMAKE_SOURCE_DIR}/core/controllers/CommunityController.php)
41-
add_midas_style_test(StyleCoreControllerComponents ${CMAKE_SOURCE_DIR}/core/controllers/components)
42-
add_midas_style_test(StyleCoreControllerForms ${CMAKE_SOURCE_DIR}/core/controllers/forms)
43-
add_midas_style_test(StyleCoreDownloadController ${CMAKE_SOURCE_DIR}/core/controllers/DownloadController.php)
44-
add_midas_style_test(StyleCoreErrorController ${CMAKE_SOURCE_DIR}/core/controllers/ErrorController.php)
45-
add_midas_style_test(StyleCoreFeedController ${CMAKE_SOURCE_DIR}/core/controllers/FeedController.php)
46-
add_midas_style_test(StyleCoreFolderController ${CMAKE_SOURCE_DIR}/core/controllers/FolderController.php)
47-
add_midas_style_test(StyleCoreImportController ${CMAKE_SOURCE_DIR}/core/controllers/ImportController.php)
48-
add_midas_style_test(StyleCoreIndexController ${CMAKE_SOURCE_DIR}/core/controllers/IndexController.php)
49-
add_midas_style_test(StyleCoreInstallController ${CMAKE_SOURCE_DIR}/core/controllers/InstallController.php)
50-
add_midas_style_test(StyleCoreItemController ${CMAKE_SOURCE_DIR}/core/controllers/ItemController.php)
51-
add_midas_style_test(StyleCoreLicensesController ${CMAKE_SOURCE_DIR}/core/controllers/LicensesController.php)
52-
add_midas_style_test(StyleCoreSearchController ${CMAKE_SOURCE_DIR}/core/controllers/SearchController.php)
53-
add_midas_style_test(StyleCoreShareController ${CMAKE_SOURCE_DIR}/core/controllers/ShareController.php)
54-
add_midas_style_test(StyleCoreUploadController ${CMAKE_SOURCE_DIR}/core/controllers/UploadController.php)
55-
add_midas_style_test(StyleCoreUserController ${CMAKE_SOURCE_DIR}/core/controllers/UserController.php)

‎core/tests/models/CMakeLists.txt‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,3 @@
1919

2020
add_subdirectory(base)
2121
add_subdirectory(dao)
22-
23-
add_midas_style_test(StyleCoreMIDASDatabaseInterface ${CMAKE_SOURCE_DIR}/core/models/MIDASDatabaseInterface.php)
24-
add_midas_style_test(StyleCoreMIDASDatabasePdo ${CMAKE_SOURCE_DIR}/core/models/MIDASDatabasePdo.php)
25-
add_midas_style_test(StyleCoreMIDASModel ${CMAKE_SOURCE_DIR}/core/models/MIDASModel.php)
26-
add_midas_style_test(StyleCoreMIDASUpgrade ${CMAKE_SOURCE_DIR}/core/models/MIDASUpgrade.php)
27-
add_midas_style_test(StyleCoreModelsAppDao ${CMAKE_SOURCE_DIR}/core/models/AppDao.php)
28-
add_midas_style_test(StyleCoreModelsAppModel ${CMAKE_SOURCE_DIR}/core/models/AppModel.php)
29-
add_midas_style_test(StyleCoreModelsBase ${CMAKE_SOURCE_DIR}/core/models/base/)
30-
add_midas_style_test(StyleCoreModelsDao ${CMAKE_SOURCE_DIR}/core/models/dao/)
31-
add_midas_style_test(StyleCoreModelsPdo ${CMAKE_SOURCE_DIR}/core/models/pdo/)
32-
add_midas_style_test(StyleCoreProductionDbProfiler ${CMAKE_SOURCE_DIR}/core/models/profiler/ProductionDbProfiler.php)

‎modules/CMakeLists.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@
1717
# limitations under the License.
1818
#=============================================================================
1919

20+
add_midas_style_test(StyleGlobalModule ${CMAKE_SOURCE_DIR}/modules/GlobalModule.php)
21+
2022
file(GLOB sub-dir "${CMAKE_SOURCE_DIR}/modules/*")
2123

2224
foreach(dir ${sub-dir})
23-
if(IS_DIRECTORY "${dir}/tests")
25+
if(IS_DIRECTORY ${dir}/tests)
2426
add_subdirectory(${dir}/tests)
2527
endif()
2628
endforeach()

‎modules/api/tests/CMakeLists.txt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
set(module_name api)
2121
to_titlecase(${module_name} module_name_titlecase)
2222

23-
add_subdirectory(controllers)
23+
# add_midas_style_test(Style${module_name_titlecase} ${CMAKE_SOURCE_DIR}/modules/${module_name})
2424

25-
add_midas_style_test(Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php)
26-
add_midas_style_test(Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers)
27-
add_midas_style_test(Style${module_name_titlecase}EnabledNotification ${CMAKE_SOURCE_DIR}/modules/${module_name}/library/APIEnabledNotification.php)
28-
add_midas_style_test(Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php)
29-
add_midas_style_test(Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/controllers)
25+
add_subdirectory(controllers)

‎modules/archive/tests/CMakeLists.txt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
set(module_name archive)
2121
to_titlecase(${module_name} module_name_titlecase)
2222

23-
add_subdirectory(controllers)
23+
add_midas_style_test(Style${module_name_titlecase} ${CMAKE_SOURCE_DIR}/modules/${module_name})
2424

25-
add_midas_style_test(Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php)
26-
add_midas_style_test(Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers)
27-
add_midas_style_test(Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php)
28-
add_midas_style_test(Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/controllers)
25+
add_subdirectory(controllers)

‎modules/batchmake/tests/CMakeLists.txt‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,11 @@
2020
set(module_name batchmake)
2121
to_titlecase(${module_name} module_name_titlecase)
2222

23+
add_midas_style_test(Style${module_name_titlecase} ${CMAKE_SOURCE_DIR}/modules/${module_name})
24+
2325
option(MIDAS_RUN_BATCHMAKE_TESTS "Run BatchMake tests? Specific configuration is required, see modules/batchmake/tests/README")
2426

2527
if(MIDAS_RUN_BATCHMAKE_TESTS)
2628
add_subdirectory(controllers)
2729
add_subdirectory(models)
2830
endif()
29-
30-
add_midas_style_test(Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php)
31-
add_midas_style_test(Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant)
32-
add_midas_style_test(Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers)
33-
add_midas_style_test(Style${module_name_titlecase}Library ${CMAKE_SOURCE_DIR}/modules/${module_name}/library)
34-
add_midas_style_test(Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models)
35-
add_midas_style_test(Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php)
36-
add_midas_style_test(Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/controllers)
37-
add_midas_style_test(Style${module_name_titlecase}TestsLibrary ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/library)
38-
add_midas_style_test(Style${module_name_titlecase}TestsModels ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/models)

‎modules/cleanup/tests/CMakeLists.txt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
set(module_name cleanup)
2121
to_titlecase(${module_name} module_name_titlecase)
2222

23-
add_subdirectory(controllers)
23+
add_midas_style_test(Style${module_name_titlecase} ${CMAKE_SOURCE_DIR}/modules/${module_name})
2424

25-
add_midas_style_test(Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php)
26-
add_midas_style_test(Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers)
27-
add_midas_style_test(Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models)
28-
add_midas_style_test(Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php)
29-
add_midas_style_test(Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/controllers)
25+
add_subdirectory(controllers)

‎modules/comments/tests/CMakeLists.txt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,4 @@
2020
set(module_name comments)
2121
to_titlecase(${module_name} module_name_titlecase)
2222

23-
add_midas_style_test(Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php)
24-
add_midas_style_test(Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers)
25-
add_midas_style_test(Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models)
26-
add_midas_style_test(Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php)
23+
add_midas_style_test(Style${module_name_titlecase} ${CMAKE_SOURCE_DIR}/modules/${module_name})

‎modules/communityagreement/tests/CMakeLists.txt‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,7 @@
2020
set(module_name communityagreement)
2121
to_titlecase(${module_name} module_name_titlecase)
2222

23+
add_midas_style_test(Style${module_name_titlecase} ${CMAKE_SOURCE_DIR}/modules/${module_name})
24+
2325
add_subdirectory(controllers)
2426
add_subdirectory(models)
25-
26-
add_midas_style_test(Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php)
27-
add_midas_style_test(Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant)
28-
add_midas_style_test(Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers)
29-
add_midas_style_test(Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models)
30-
add_midas_style_test(Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php)
31-
add_midas_style_test(Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/controllers)
32-
add_midas_style_test(Style${module_name_titlecase}TestsModels ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/models)

0 commit comments

Comments
 (0)