Skip to content

[WIP] [Tests-Only] phpunit 8 #37286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
phil-davis wants to merge 7 commits into from
Closed

[WIP] [Tests-Only] phpunit 8 #37286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0fb2332
Bump phpunit/phpunit from 7.5.20 to 8.5.4
dependabot-preview[bot] Apr 20, 2020
8bcedf3
Remove acceptance testing
phil-davis Apr 21, 2020
a37bf24
Provide a default constructor for OC\Files\Storage\Common
phil-davis Apr 25, 2020
d0e5940
Ignore /tests/.phpunit.result.cache
phil-davis Apr 25, 2020
ab4b403
Adjust getting protected object properties in unit tests
phil-davis Apr 25, 2020
c88d363
Run all PHP and databases unit test combinations
phil-davis Apr 25, 2020
eb6f32f
Use assertStringContainsString in files_external unit tests
phil-davis Apr 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
190 changes: 4 additions & 186 deletions .drone.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,14 @@ config = {
'allDatabases' : {
'phpVersions': [
'7.2',
]
},
'reducedDatabases' : {
'phpVersions': [
'7.3',
'7.4',
],
'databases': [
'sqlite',
'mariadb:10.2',
],
'coverage': False
]
},
'external-samba-windows' : {
'phpVersions': [
'7.2',
'7.3',
'7.4',
],
'databases': [
Expand All @@ -62,6 +54,7 @@ config = {
'external-other' : {
'phpVersions': [
'7.2',
'7.3',
'7.4',
],
'databases': [
Expand All @@ -76,182 +69,7 @@ config = {
},
},

'acceptance': {
'api': {
'suites': [
'apiAuth',
'apiAuthOcs',
'apiAuthWebDav',
'apiCapabilities',
'apiComments',
'apiFavorites',
'apiMain',
'apiProvisioning-v1',
'apiProvisioning-v2',
'apiProvisioningGroups-v1',
'apiProvisioningGroups-v2',
'apiShareCreateSpecial1',
'apiShareCreateSpecial2',
'apiSharees',
'apiShareManagement',
'apiShareManagementBasic',
'apiShareOperations',
'apiSharePublicLink1',
'apiSharePublicLink2',
'apiShareReshare1',
'apiShareReshare2',
'apiShareUpdate',
'apiTags',
'apiTranslation',
'apiTrashbin',
'apiVersions',
'apiWebdavLocks',
'apiWebdavLocks2',
'apiWebdavMove1',
'apiWebdavMove2',
'apiWebdavOperations',
'apiWebdavPreviews',
'apiWebdavProperties',
'apiWebdavUpload1',
'apiWebdavUpload2',
],
},
'apiOnOracle': {
'suites': [
'apiVersions',
],
'filterTags': '@skip&&@issue-37026',
'databases': ['oracle'],
},
'apiNotifications': {
'suites': [
'apiSharingNotifications',
],
'extraApps': {
'notifications': 'composer install'
},
},
'apiFederation': {
'suites': [
'apiFederation',
],
'federatedServerNeeded': True,
'federatedServerVersions': ['daily-master-qa', 'latest', '10.3.2']
},
'cli': {
'suites': [
'cliBackground',
'cliLocalStorage',
'cliMain',
'cliProvisioning',
'cliTrashbin',
],
'emailNeeded': True,
},
'cliAppManagement': {
'suites': [
'cliAppManagement',
],
'testingRemoteSystem': False
},
'cliExternalStorage': {
'suites': [
'cliExternalStorage',
],
'federatedServerNeeded': True,
'federatedServerVersions': ['daily-master-qa', 'latest', '10.3.2']
},
'webUI': {
'suites': {
'webUIAddUsers': '',
'webUIAdminSettings': '',
'webUIComments': '',
'webUICreateDelete': '',
'webUIFavorites': '',
'webUIFiles': '',
'webUILogin': '',
'webUIManageQuota': '',
'webUIManageUsersGroups': 'webUIManageUsersGrps',
'webUIMoveFilesFolders': 'webUIMoveFilesFolder',
'webUIPersonalSettings': 'webUIPersonalSetting',
'webUIRenameFiles': '',
'webUIRenameFolders': '',
'webUIRestrictSharing': '',
'webUISettingsMenu': '',
'webUISharingAcceptShares': 'webUISharingAcceptSh',
'webUISharingAutocompletion1': 'webUISharingAutocomp1',
'webUISharingAutocompletion2': 'webUISharingAutocomp2',
'webUISharingInternalGroups1': 'webUISharingIntGroup1',
'webUISharingInternalGroups2': 'webUISharingIntGroup2',
'webUISharingInternalUsers1': 'webUISharingIntUsers1',
'webUISharingInternalUsers2': 'webUISharingIntUsers2',
'webUISharingPublic1': '',
'webUISharingPublic2': '',
'webUITags': '',
'webUITrashbin': '',
'webUIUpload': '',
'webUIWebdavLockProtection': 'webUIWebdavLockProt',
'webUIWebdavLocks': '',
},
'emailNeeded': True,
'useHttps': False,
},
'webUINotifications': {
'suites': {
'webUISharingNotifications': 'webUISharingNotify',
},
'emailNeeded': True,
'useHttps': False,
'extraApps': {
'notifications': 'composer install'
},
},
'webUIFederation': {
'suites': {
'webUISharingExternal1': 'webUISharingExt1',
'webUISharingExternal2': 'webUISharingExt2',
},
'federatedServerNeeded': True,
'federatedServerVersions': ['daily-master-qa', 'latest', '10.3.2']
},
'webUIFirefox': {
'suites': {
'webUIFirefoxSmoketest': 'webUIFfSmoke',
},
'browsers': [
'firefox'
],
'emailNeeded': True,
'useHttps': False,
'filterTags': '@smokeTest&&~@notifications-app-required',
'runAllSuites': True,
'numberOfParts': 3,
},
'webUIProxy': {
'suites': {
'webUIProxySmoketest': 'webUIProxySmoke',
},
'browsers': [
'chrome'
],
'emailNeeded': True,
'proxyNeeded': True,
'useHttps': False,
'filterTags': '@smokeTest&&~@notifications-app-required',
'runAllSuites': True,
'numberOfParts': 3,
},
'apiProxy': {
'suites': {
'apiProxySmoketest': 'apiProxySmoke',
},
'proxyNeeded': True,
'useHttps': False,
'filterTags': '@smokeTest&&~@notifications-app-required',
'runAllSuites': True,
'numberOfParts': 5,
},
}
'acceptance': False
}

def main(ctx):
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ vendor-bin/**/composer.lock

# Tests - auto-generated files
/data-autotest
/tests/.phpunit.result.cache
/tests/coverage*
/tests/karma-coverage
/tests/autoconfig*
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/tests/Command/ListCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public function testShortView($options, $expectedResult, $mountOptions) {
for ($i = 0; $i < $countResults; $i++) {
$this->assertEquals($expectedResult[$i]['mount_id'], $results[$i]['mount_id']);
$this->assertEquals($expectedResult[$i]['mount_point'], $results[$i]['mount_point']);
$this->assertContains($results[$i]['auth'], 'UserSession', true);
$this->assertStringContainsString($results[$i]['auth'], 'UserSession', true);
$this->assertEquals($expectedResult[$i]['type'], $results[$i]['type']);
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/tests/Panels/AdminTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@ public function testGetPanel() {
$this->backendService->expects($this->once())->method('getBackends')->willReturn([]);
$this->backendService->expects($this->once())->method('getAvailableBackends')->willReturn([]);
$templateHtml = $this->panel->getPanel()->fetchPage();
$this->assertContains('<h2 class="app-name">External Storage</h2>', $templateHtml);
$this->assertStringContainsString('<h2 class="app-name">External Storage</h2>', $templateHtml);
}
}
2 changes: 1 addition & 1 deletion apps/files_external/tests/Panels/PersonalTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@ public function testGetPanel() {
$this->backendService->expects($this->once())->method('getBackends')->willReturn([]);
$this->backendService->expects($this->once())->method('getAvailableBackends')->willReturn([]);
$templateHtml = $this->panel->getPanel()->fetchPage();
$this->assertContains('<h2 class="app-name">External Storage</h2>', $templateHtml);
$this->assertStringContainsString('<h2 class="app-name">External Storage</h2>', $templateHtml);
}
}
13 changes: 10 additions & 3 deletions apps/files_trashbin/tests/ExpirationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,16 @@ public function testParseRetentionObligation($configValue, $expectedMinAge, $exp
);

$expiration = new Expiration($mockedConfig, $mockedTimeFactory);
$this->assertAttributeEquals($expectedMinAge, 'minAge', $expiration);
$this->assertAttributeEquals($expectedMaxAge, 'maxAge', $expiration);
$this->assertAttributeEquals($expectedCanPurgeToSaveSpace, 'canPurgeToSaveSpace', $expiration);
$expirationInternals = (array) $expiration;
$expectedKey = "\0OCA\\Files_Trashbin\\Expiration\0minAge";
$this->assertArrayHasKey($expectedKey, $expirationInternals);
$this->assertEquals($expectedMinAge, $expirationInternals[$expectedKey]);
$expectedKey = "\0OCA\\Files_Trashbin\\Expiration\0maxAge";
$this->assertArrayHasKey($expectedKey, $expirationInternals);
$this->assertEquals($expectedMaxAge, $expirationInternals[$expectedKey]);
$expectedKey = "\0OCA\\Files_Trashbin\\Expiration\0canPurgeToSaveSpace";
$this->assertArrayHasKey($expectedKey, $expirationInternals);
$this->assertEquals($expectedCanPurgeToSaveSpace, $expirationInternals[$expectedKey]);
}

public function timestampTestData() {
Expand Down
13 changes: 10 additions & 3 deletions apps/files_versions/tests/ExpirationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,16 @@ public function testParseRetentionObligation($configValue, $expectedMinAge, $exp
);

$expiration = new Expiration($mockedConfig, $mockedTimeFactory);
$this->assertAttributeEquals($expectedMinAge, 'minAge', $expiration);
$this->assertAttributeEquals($expectedMaxAge, 'maxAge', $expiration);
$this->assertAttributeEquals($expectedCanPurgeToSaveSpace, 'canPurgeToSaveSpace', $expiration);
$expirationInternals = (array) $expiration;
$expectedKey = "\0OCA\\Files_Versions\\Expiration\0minAge";
$this->assertArrayHasKey($expectedKey, $expirationInternals);
$this->assertEquals($expectedMinAge, $expirationInternals[$expectedKey]);
$expectedKey = "\0OCA\\Files_Versions\\Expiration\0maxAge";
$this->assertArrayHasKey($expectedKey, $expirationInternals);
$this->assertEquals($expectedMaxAge, $expirationInternals[$expectedKey]);
$expectedKey = "\0OCA\\Files_Versions\\Expiration\0canPurgeToSaveSpace";
$this->assertArrayHasKey($expectedKey, $expirationInternals);
$this->assertEquals($expectedCanPurgeToSaveSpace, $expirationInternals[$expectedKey]);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"bamarni/composer-bin-plugin": "^1.4",
"jakub-onderka/php-console-highlighter": "^0.4",
"mikey179/vfsstream": "^1.6",
"phpunit/phpunit": "^7.5",
"phpunit/phpunit": "^8.5",
"roave/security-advisories": "dev-master"
},
"require": {
Expand Down
Loading