Pierre Goiffon
22162aa55f
Merge remote-tracking branch 'origin/support/3.0' into develop
2023-01-11 18:09:49 +01:00
Pierre Goiffon
b9ed00d53f
N°4660 Fix iTopConfigParserTest setting permissions of iTop config file
...
Alternative method to restore config file
chmod cannot be used with +w
In \Config::WriteToFile we are using fopen with mode=w, so using the same
In consequence we are not modifying anymore the iTop config file permissions \o/
2023-01-11 16:04:21 +01:00
Molkobain
29e0df9bbc
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# test/sources/application/Helper/WebResourcesHelperTest.php
# tests/php-unit-tests/ItopTestCase.php
# tests/php-unit-tests/composer.lock
# tests/php-unit-tests/unitary-tests/.make/release/DatamodelsXmlFilesTest.php
# tests/php-unit-tests/unitary-tests/application/UI/Base/Layout/NavigationMenuTest.php
# tests/php-unit-tests/unitary-tests/application/query/QueryTest.php
# tests/php-unit-tests/unitary-tests/core/DBSearchTest.php
# tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/BulkChangeExtKeyTest.inc.php
# tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/CRUD/DBObjectTest.php
# tests/php-unit-tests/unitary-tests/service/EventTest.php
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_3.1.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_3.1.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.input.xml
# tests/php-unit-tests/unitary-tests/sources/Application/Helper/WebResourcesHelperTest.php
# tests/php-unit-tests/unitary-tests/sources/Router/RouterTest.php
# tests/php-unit-tests/unitary-tests/sources/application/Helper/WebResourcesHelperTest.php
# tests/php-unit-tests/unitary-tests/webservices/ImportTest.inc.php
# tests/php-unit-tests/unitary-tests/webservices/RestTest.php
2023-01-11 15:55:08 +01:00
Molkobain
c4508ea80c
N°4660 - Fix data synchro unit test failure due to another test not restoring correct user permissions on conf file
2023-01-11 14:26:23 +01:00
Molkobain
16390c9b00
N°5857 - PHPUnit: Replace usage of deprecated assetContains with assertStringContainsString
2023-01-11 13:26:54 +01:00
Molkobain
1271a895d1
N°5857 - PHPUnit: Replace usage of deprecated assetContains with assertStringContainsString
2023-01-11 11:59:01 +01:00
Eric Espie
030f1e2463
✅ Fix Status test
2023-01-11 10:28:32 +01:00
Pierre Goiffon
5729d6a9cd
🎨 ✅ StatusIncTest : fix phpdoc, replace @expectedException
2023-01-11 10:02:59 +01:00
Molkobain
a5efef900c
N°5608 - Harmonize namespaces and merge duplicated test files
2023-01-10 23:02:54 +01:00
Molkobain
c851a10982
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2023-01-10 22:49:13 +01:00
Molkobain
845adf43c6
N°5608 - Harmonize namespaces and merge duplicated test files
2023-01-10 22:36:35 +01:00
Molkobain
5916e4ea39
N°5608 - Ensure both old & new tests structure are ran for extensions for backward compatibility
2023-01-10 22:03:40 +01:00
Molkobain
7f37de777e
N°5608 - Fix unit tests following restructuring Part III
...
* Missed a usage of "use_legacy_search" conf param on the last commit
* Fix log tests which didn't moved correctly from Git PoV 😕
2023-01-10 21:11:10 +01:00
Molkobain
bcf880f327
N°5608 - Fix unit tests following restructuring Part II
...
"use_legacy_search" conf param was removed some time ago
2023-01-10 19:23:54 +01:00
Molkobain
6aa9aa2831
N°5608 - Fix unit tests following restructuring Part I
2023-01-10 18:15:53 +01:00
Molkobain
d177ee4a7f
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# tests/manual-visual-tests/Backoffice/RenderAllUiBlocks.php
# tests/php-unit-tests/ItopDataTestCase.php
# tests/php-unit-tests/ItopTestCase.php
# tests/php-unit-tests/integration-tests/dictionaries-test/fr.dictionary.itop.core.KO.wrong_php
# tests/php-unit-tests/integration-tests/dictionaries-test/fr.dictionary.itop.core.OK.php
# tests/php-unit-tests/integration-tests/iTopModulesPhpVersionChecklistTest.php
# tests/php-unit-tests/integration-tests/iTopXmlVersionChecklistTest.php
# tests/php-unit-tests/phpunit.xml.dist
# tests/php-unit-tests/unitary-tests/application/SCSSCompilationTest.php
# tests/php-unit-tests/unitary-tests/application/Session/SessionTest.php
# tests/php-unit-tests/unitary-tests/application/ThemeHandlerTest.php
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/DO_NOT_CHANGE.css-variables.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/DO_NOT_CHANGE.light-grey.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/README.md
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/_included_file3.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/cross_reference1.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/cross_reference2.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/feature1/_feature1.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/included_file1.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/included_scss/included_file2.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/included_scss/included_file4.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/multi_imports.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/shortcut.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/shortcut2.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/simple_import.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/simple_import2.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/typography.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/ui-lightness/DO_NOT_CHANGE.jqueryui.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-icons_1c94c4_256x240.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-icons_222222_256x240.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-icons_E87C1E_256x240.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-icons_F26522_256x240.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-icons_ffffff_256x240.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/ac-background.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/actions_right.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/bg.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/breadcrumb-separator.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/calendar.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/delete.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/desc.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/error.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/eye-closed-555.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/eye-closed-fff.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/eye-open-555.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/eye-open-fff.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/full-screen.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/green-header.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/green-square.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/indicator.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/info-mini.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/minus.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/ok.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/orange-header.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/plus.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/red-header.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/truncated.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/tv-collapsable-last.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/tv-collapsable.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/tv-expandable-last.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/tv-expandable.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/tv-item-last.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/tv-item.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main.css
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_imagemodified.css
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_importmodified.css
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_stylesheet.css
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_testcompilethemes.css
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_varchanged.css
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/theme-parameters.json
# tests/php-unit-tests/unitary-tests/application/theme-handler/getimages/expected-getimages.json
# tests/php-unit-tests/unitary-tests/application/theme-handler/getimages/test-getimages.scss
# tests/php-unit-tests/unitary-tests/core/ActionEmailTest.php
# tests/php-unit-tests/unitary-tests/core/AttributeDefTest.inc.php
# tests/php-unit-tests/unitary-tests/core/AttributeURLDefaultPattern.php
# tests/php-unit-tests/unitary-tests/core/AttributeURLTest.php
# tests/php-unit-tests/unitary-tests/core/BulkChangeTest.inc.php
# tests/php-unit-tests/unitary-tests/core/CSVParserTest.php
# tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
# tests/php-unit-tests/unitary-tests/core/DBSearchAddConditionPointingTo.php
# tests/php-unit-tests/unitary-tests/core/ExpressionEvaluateTest.php
# tests/php-unit-tests/unitary-tests/core/GetSelectFilterTest.php
# tests/php-unit-tests/unitary-tests/core/InlineImageTest.php
# tests/php-unit-tests/unitary-tests/core/Log/ExceptionLogTest.php
# tests/php-unit-tests/unitary-tests/core/Log/ExceptionLogTest/Exceptions.php
# tests/php-unit-tests/unitary-tests/core/Log/LogAPITest.php
# tests/php-unit-tests/unitary-tests/core/Log/LogFileNameBuilderTest.php
# tests/php-unit-tests/unitary-tests/core/LogAPITest.php
# tests/php-unit-tests/unitary-tests/core/LogFileNameBuilderTest.php
# tests/php-unit-tests/unitary-tests/core/MetaModelTest.php
# tests/php-unit-tests/unitary-tests/core/OQLTest.php
# tests/php-unit-tests/unitary-tests/core/UniquenessConstraintTest.php
# tests/php-unit-tests/unitary-tests/core/XMLDataLoaderTest.php
# tests/php-unit-tests/unitary-tests/core/dictApcuTest.php
# tests/php-unit-tests/unitary-tests/core/dictTest.php
# tests/php-unit-tests/unitary-tests/core/ormCaseLogTest.php
# tests/php-unit-tests/unitary-tests/core/ormPasswordTest.php
# tests/php-unit-tests/unitary-tests/core/ormStyleTest.php
# tests/php-unit-tests/unitary-tests/setup/MFCompilerTest.php
# tests/php-unit-tests/unitary-tests/setup/SubMFCompiler.php
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/1.7_to_1.6.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/1.7_to_1.6.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.6_to_1.7_2.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.6_to_1.7_2.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6_2.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6_2.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_3.0.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_3.0.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/Bug_4569.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/Bug_4569.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_deleted_to_deleted.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_deleted_to_deleted.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_deleted_to_in-definition.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_deleted_to_in-definition.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_deleted_to_not-in-definition.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_deleted_to_not-in-definition.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_in-definition_to_deleted.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_in-definition_to_deleted.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_in-definition_to_in-definition.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_in-definition_to_in-definition.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_in-definition_to_not-in-definition.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_in-definition_to_not-in-definition.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_not-in-definition_to_deleted.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_not-in-definition_to_deleted.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_not-in-definition_to_in-definition.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_not-in-definition_to_in-definition.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_not-in-definition_to_not-in-definition.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_not-in-definition_to_not-in-definition.input.xml
# tests/php-unit-tests/unitary-tests/setup/ressources/datamodels/datamodel-branding.xml
# tests/php-unit-tests/unitary-tests/sources/application/Helper/WebResourcesHelperTest.php
# tests/php-unit-tests/unitary-tests/sources/application/status/StatusIncTest.php
# tests/php-unit-tests/unitary-tests/sources/application/status/status.php
# tests/php-unit-tests/unitary-tests/synchro/DataSynchroTest.php
2023-01-10 15:27:44 +01:00
Molkobain
fbc0a898ae
N°5608 - Move test files to corresponding directories after branch rebase
2023-01-10 12:11:12 +01:00
Molkobain
36f8e58e25
N°5608 - Use new ItopTestCase::RequireOnceXXX in unit tests
2023-01-10 12:11:12 +01:00
Molkobain
6a7dbb06b0
N°5608 - Add methods to require_once an iTop or a unit test file to avoid crashes when tests dir is moved
2023-01-10 12:11:12 +01:00
Molkobain
5721a324c1
Tests: Always display test status for better feedback
2023-01-06 22:30:09 +01:00
Molkobain
7de6c72154
Tests: Rename provider method name to match convention
2023-01-06 22:30:09 +01:00
Molkobain
c0cee02351
N°5608 - Factorize all core modules tests to a single test suite
2023-01-06 22:30:09 +01:00
Molkobain
bb674fb873
N°5608 - Move/rename "status" unit tests to match their counterpart location/name
2023-01-06 22:30:09 +01:00
Molkobain
6136eadd31
N°5608 - Fix some broken require paths since move/rename
2023-01-06 22:30:08 +01:00
Molkobain
87cb73c038
N°5608 - Rename "test" folder to "tests" to better match conventions
2023-01-06 22:30:08 +01:00
Molkobain
1d7e4e1a42
N°5608 - Move unit tests to a dedicated folder and start reorganizing to match iTop folder structure
2023-01-06 22:30:06 +01:00
