From 948778dd8a544b43ab7839fcac0c5a271055e979 Mon Sep 17 00:00:00 2001 From: "florian.azizian" <florian.azizian@maarch.org> Date: Fri, 7 Sep 2018 12:21:30 +0100 Subject: [PATCH] FEAT #7917 structure unitTests folder --- phpunit.xml | 56 +++++++++---------- .../app/action}/ActionControllerTest.php | 0 .../app/basket}/BasketControllerTest.php | 0 .../app/contact}/ContactControllerTest.php | 0 .../contact}/ContactGroupControllerTest.php | 0 .../contact}/ContactTypeControllerTest.php | 0 .../docserver}/DocserverControllerTest.php | 0 .../app/doctype}/DoctypeControllerTest.php | 0 .../app/entity}/EntityControllerTest.php | 0 .../entity}/ListTemplateControllerTest.php | 0 .../app/group}/GroupControllerTest.php | 0 .../app/history}/HistoryControllerTest.php | 0 .../NotificationControllerTest.php | 0 .../NotificationScheduleControllerTest.php | 0 .../parameter}/ParameterControllerTest.php | 0 .../app/priority}/PriorityControllerTest.php | 0 .../app/report}/ReportControllerTest.php | 0 .../app/resource}/ResControllerTest.php | 0 .../app/status}/StatusControllerTest.php | 0 .../app/template}/TemplateControllerTest.php | 0 .../app/user}/UserControllerTest.php | 0 .../VersionUpdateControllerTest.php | 0 .../core}/AutocompleteControllerTest.php | 0 .../core}/CoreControllerTest.php | 0 .../core}/PasswordControllerTest.php | 0 test/{ => unitTests}/define.php | 0 26 files changed, 28 insertions(+), 28 deletions(-) rename test/{ => unitTests/app/action}/ActionControllerTest.php (100%) rename test/{ => unitTests/app/basket}/BasketControllerTest.php (100%) rename test/{ => unitTests/app/contact}/ContactControllerTest.php (100%) rename test/{ => unitTests/app/contact}/ContactGroupControllerTest.php (100%) rename test/{ => unitTests/app/contact}/ContactTypeControllerTest.php (100%) rename test/{ => unitTests/app/docserver}/DocserverControllerTest.php (100%) rename test/{ => unitTests/app/doctype}/DoctypeControllerTest.php (100%) rename test/{ => unitTests/app/entity}/EntityControllerTest.php (100%) rename test/{ => unitTests/app/entity}/ListTemplateControllerTest.php (100%) rename test/{ => unitTests/app/group}/GroupControllerTest.php (100%) rename test/{ => unitTests/app/history}/HistoryControllerTest.php (100%) rename test/{ => unitTests/app/notification}/NotificationControllerTest.php (100%) rename test/{ => unitTests/app/notification}/NotificationScheduleControllerTest.php (100%) rename test/{ => unitTests/app/parameter}/ParameterControllerTest.php (100%) rename test/{ => unitTests/app/priority}/PriorityControllerTest.php (100%) rename test/{ => unitTests/app/report}/ReportControllerTest.php (100%) rename test/{ => unitTests/app/resource}/ResControllerTest.php (100%) rename test/{ => unitTests/app/status}/StatusControllerTest.php (100%) rename test/{ => unitTests/app/template}/TemplateControllerTest.php (100%) rename test/{ => unitTests/app/user}/UserControllerTest.php (100%) rename test/{ => unitTests/app/versionUpdate}/VersionUpdateControllerTest.php (100%) rename test/{ => unitTests/core}/AutocompleteControllerTest.php (100%) rename test/{ => unitTests/core}/CoreControllerTest.php (100%) rename test/{ => unitTests/core}/PasswordControllerTest.php (100%) rename test/{ => unitTests}/define.php (100%) diff --git a/phpunit.xml b/phpunit.xml index e21e6ff2d3d..edd581bb897 100755 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,33 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> -<phpunit colors="true" bootstrap="test/define.php"> +<phpunit colors="true" bootstrap="test/unitTests/define.php"> <testsuites> <testsuite name="Maarch Test Suite"> <!--directory>test</directory--> - <file>test/ActionControllerTest.php</file> - <file>test/AutocompleteControllerTest.php</file> - <file>test/BasketControllerTest.php</file> - <file>test/ContactControllerTest.php</file> - <file>test/ContactGroupControllerTest.php</file> - <file>test/ContactTypeControllerTest.php</file> - <file>test/CoreControllerTest.php</file> - <file>test/DocserverControllerTest.php</file> - <file>test/DoctypeControllerTest.php</file> - <file>test/EntityControllerTest.php</file> - <file>test/GroupControllerTest.php</file> - <file>test/ListTemplateControllerTest.php</file> - <file>test/NotificationControllerTest.php</file> - <file>test/NotificationScheduleControllerTest.php</file> - <file>test/ParameterControllerTest.php</file> - <file>test/PasswordControllerTest.php</file> - <file>test/PriorityControllerTest.php</file> - <file>test/ReportControllerTest.php</file> - <file>test/ResControllerTest.php</file> - <file>test/StatusControllerTest.php</file> - <file>test/UserControllerTest.php</file> - <file>test/VersionUpdateControllerTest.php</file> - <file>test/TemplateControllerTest.php</file> + <file>test/unitTests/app/action/ActionControllerTest.php</file> + <file>test/unitTests/core/AutocompleteControllerTest.php</file> + <file>test/unitTests/app/basket/BasketControllerTest.php</file> + <file>test/unitTests/app/contact/ContactControllerTest.php</file> + <file>test/unitTests/app/contact/ContactGroupControllerTest.php</file> + <file>test/unitTests/app/contact/ContactTypeControllerTest.php</file> + <file>test/unitTests/core/CoreControllerTest.php</file> + <file>test/unitTests/app/docserver/DocserverControllerTest.php</file> + <file>test/unitTests/app/doctype/DoctypeControllerTest.php</file> + <file>test/unitTests/app/entity/EntityControllerTest.php</file> + <file>test/unitTests/app/group/GroupControllerTest.php</file> + <file>test/unitTests/app/entity/ListTemplateControllerTest.php</file> + <file>test/unitTests/app/notification/NotificationControllerTest.php</file> + <file>test/unitTests/app/notification/NotificationScheduleControllerTest.php</file> + <file>test/unitTests/app/parameter/ParameterControllerTest.php</file> + <file>test/unitTests/core/PasswordControllerTest.php</file> + <file>test/unitTests/app/priority/PriorityControllerTest.php</file> + <file>test/unitTests/app/report/ReportControllerTest.php</file> + <file>test/unitTests/app/resource/ResControllerTest.php</file> + <file>test/unitTests/app/status/StatusControllerTest.php</file> + <file>test/unitTests/app/user/UserControllerTest.php</file> + <file>test/unitTests/app/versionUpdate/VersionUpdateControllerTest.php</file> + <file>test/unitTests/app/template/TemplateControllerTest.php</file> <!-- The last one should be history --> - <file>test/HistoryControllerTest.php</file> + <file>test/unitTests/app/history/HistoryControllerTest.php</file> </testsuite> </testsuites> <filter> @@ -37,8 +37,8 @@ </whitelist> </filter> <logging> - <log type="coverage-clover" target="test/build/tests-clover.xml"/> - <log type="junit" target="test/build/tests-phpunit.xml" logIncompleteSkipped="false"/> - <log type="coverage-html" target="test/build" lowUpperBound="35" highLowerBound="70"/> + <log type="coverage-clover" target="test/unitTests/build/tests-clover.xml"/> + <log type="junit" target="test/unitTests/build/tests-phpunit.xml" logIncompleteSkipped="false"/> + <log type="coverage-html" target="test/unitTests/build" lowUpperBound="35" highLowerBound="70"/> </logging> </phpunit> diff --git a/test/ActionControllerTest.php b/test/unitTests/app/action/ActionControllerTest.php similarity index 100% rename from test/ActionControllerTest.php rename to test/unitTests/app/action/ActionControllerTest.php diff --git a/test/BasketControllerTest.php b/test/unitTests/app/basket/BasketControllerTest.php similarity index 100% rename from test/BasketControllerTest.php rename to test/unitTests/app/basket/BasketControllerTest.php diff --git a/test/ContactControllerTest.php b/test/unitTests/app/contact/ContactControllerTest.php similarity index 100% rename from test/ContactControllerTest.php rename to test/unitTests/app/contact/ContactControllerTest.php diff --git a/test/ContactGroupControllerTest.php b/test/unitTests/app/contact/ContactGroupControllerTest.php similarity index 100% rename from test/ContactGroupControllerTest.php rename to test/unitTests/app/contact/ContactGroupControllerTest.php diff --git a/test/ContactTypeControllerTest.php b/test/unitTests/app/contact/ContactTypeControllerTest.php similarity index 100% rename from test/ContactTypeControllerTest.php rename to test/unitTests/app/contact/ContactTypeControllerTest.php diff --git a/test/DocserverControllerTest.php b/test/unitTests/app/docserver/DocserverControllerTest.php similarity index 100% rename from test/DocserverControllerTest.php rename to test/unitTests/app/docserver/DocserverControllerTest.php diff --git a/test/DoctypeControllerTest.php b/test/unitTests/app/doctype/DoctypeControllerTest.php similarity index 100% rename from test/DoctypeControllerTest.php rename to test/unitTests/app/doctype/DoctypeControllerTest.php diff --git a/test/EntityControllerTest.php b/test/unitTests/app/entity/EntityControllerTest.php similarity index 100% rename from test/EntityControllerTest.php rename to test/unitTests/app/entity/EntityControllerTest.php diff --git a/test/ListTemplateControllerTest.php b/test/unitTests/app/entity/ListTemplateControllerTest.php similarity index 100% rename from test/ListTemplateControllerTest.php rename to test/unitTests/app/entity/ListTemplateControllerTest.php diff --git a/test/GroupControllerTest.php b/test/unitTests/app/group/GroupControllerTest.php similarity index 100% rename from test/GroupControllerTest.php rename to test/unitTests/app/group/GroupControllerTest.php diff --git a/test/HistoryControllerTest.php b/test/unitTests/app/history/HistoryControllerTest.php similarity index 100% rename from test/HistoryControllerTest.php rename to test/unitTests/app/history/HistoryControllerTest.php diff --git a/test/NotificationControllerTest.php b/test/unitTests/app/notification/NotificationControllerTest.php similarity index 100% rename from test/NotificationControllerTest.php rename to test/unitTests/app/notification/NotificationControllerTest.php diff --git a/test/NotificationScheduleControllerTest.php b/test/unitTests/app/notification/NotificationScheduleControllerTest.php similarity index 100% rename from test/NotificationScheduleControllerTest.php rename to test/unitTests/app/notification/NotificationScheduleControllerTest.php diff --git a/test/ParameterControllerTest.php b/test/unitTests/app/parameter/ParameterControllerTest.php similarity index 100% rename from test/ParameterControllerTest.php rename to test/unitTests/app/parameter/ParameterControllerTest.php diff --git a/test/PriorityControllerTest.php b/test/unitTests/app/priority/PriorityControllerTest.php similarity index 100% rename from test/PriorityControllerTest.php rename to test/unitTests/app/priority/PriorityControllerTest.php diff --git a/test/ReportControllerTest.php b/test/unitTests/app/report/ReportControllerTest.php similarity index 100% rename from test/ReportControllerTest.php rename to test/unitTests/app/report/ReportControllerTest.php diff --git a/test/ResControllerTest.php b/test/unitTests/app/resource/ResControllerTest.php similarity index 100% rename from test/ResControllerTest.php rename to test/unitTests/app/resource/ResControllerTest.php diff --git a/test/StatusControllerTest.php b/test/unitTests/app/status/StatusControllerTest.php similarity index 100% rename from test/StatusControllerTest.php rename to test/unitTests/app/status/StatusControllerTest.php diff --git a/test/TemplateControllerTest.php b/test/unitTests/app/template/TemplateControllerTest.php similarity index 100% rename from test/TemplateControllerTest.php rename to test/unitTests/app/template/TemplateControllerTest.php diff --git a/test/UserControllerTest.php b/test/unitTests/app/user/UserControllerTest.php similarity index 100% rename from test/UserControllerTest.php rename to test/unitTests/app/user/UserControllerTest.php diff --git a/test/VersionUpdateControllerTest.php b/test/unitTests/app/versionUpdate/VersionUpdateControllerTest.php similarity index 100% rename from test/VersionUpdateControllerTest.php rename to test/unitTests/app/versionUpdate/VersionUpdateControllerTest.php diff --git a/test/AutocompleteControllerTest.php b/test/unitTests/core/AutocompleteControllerTest.php similarity index 100% rename from test/AutocompleteControllerTest.php rename to test/unitTests/core/AutocompleteControllerTest.php diff --git a/test/CoreControllerTest.php b/test/unitTests/core/CoreControllerTest.php similarity index 100% rename from test/CoreControllerTest.php rename to test/unitTests/core/CoreControllerTest.php diff --git a/test/PasswordControllerTest.php b/test/unitTests/core/PasswordControllerTest.php similarity index 100% rename from test/PasswordControllerTest.php rename to test/unitTests/core/PasswordControllerTest.php diff --git a/test/define.php b/test/unitTests/define.php similarity index 100% rename from test/define.php rename to test/unitTests/define.php -- GitLab