upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Merge pull request #24827 from nextcloud/bugfix/phpunit9

Browse source 
Run oci tests against phpunit9/php8
This commit is contained in:
kesselb 2021-09-28 08:36:24 +02:00 committed by GitHub
commit ee987d7430
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/oci.yml vendored
View file

@ -12,10 +12,9 @@ jobs:
runs-on: ubuntu-20.04
strategy:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: [ '7.4' ]
php-versions: [ '7.3', '7.4', '8.0' ]
databases: [ 'oci' ]
name: php${{ matrix.php-versions }}-${{ matrix.databases }}
@ -41,8 +40,8 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip
tools: phpunit:8.5.2
extensions: ctype,curl,dom,fileinfo,gd,iconv,imagick,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip
tools: phpunit:9
coverage: none
- name: Set up Nextcloud

81
tests/lib/Security/CredentialsManagerTest.php
View file

@ -24,92 +24,11 @@ declare(strict_types=1);
namespace Test\Security;
use OC\Security\CredentialsManager;
use OCP\DB\IResult;
use OCP\DB\QueryBuilder\IExpressionBuilder;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
use OCP\Security\ICrypto;
/**
* @group DB
*/
class CredentialsManagerTest extends \Test\TestCase {
/** @var ICrypto */
protected $crypto;
/** @var IDBConnection */
protected $dbConnection;
/** @var CredentialsManager */
protected $manager;
protected function setUp(): void {
parent::setUp();
$this->crypto = $this->createMock(ICrypto::class);
$this->dbConnection = $this->getMockBuilder(IDBConnection::class)
->disableOriginalConstructor()
->getMock();
$this->manager = new CredentialsManager($this->crypto, $this->dbConnection);
}
private function getQueryResult($row) {
$result = $this->createMock(IResult::class);
$result->expects($this->any())
->method('fetch')
->willReturn($row);
return $result;
}
public function testStore() {
$userId = 'abc';
$identifier = 'foo';
$credentials = 'bar';
$this->crypto->expects($this->once())
->method('encrypt')
->with(json_encode($credentials))
->willReturn('baz');
$this->dbConnection->expects($this->once())
->method('setValues')
->with(CredentialsManager::DB_TABLE,
['user' => $userId, 'identifier' => $identifier],
['credentials' => 'baz']
);
$this->manager->store($userId, $identifier, $credentials);
}
public function testRetrieve() {
$userId = 'abc';
$identifier = 'foo';
$this->crypto->expects($this->once())
->method('decrypt')
->with('baz')
->willReturn(json_encode('bar'));
$eb = $this->createMock(IExpressionBuilder::class);
$qb = $this->createMock(IQueryBuilder::class);
$qb->method('select')->willReturnSelf();
$qb->method('from')->willReturnSelf();
$qb->method('where')->willReturnSelf();
$qb->method('expr')->willReturn($eb);
$qb->expects($this->once())
->method('execute')
->willReturn($this->getQueryResult(['credentials' => 'baz']));
$this->dbConnection->expects($this->once())
->method('getQueryBuilder')
->willReturn($qb);
$this->manager->retrieve($userId, $identifier);
}
/**
* @dataProvider credentialsProvider
*/