mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix and update tests 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2017-05-02 08:59:53 +02:00
parent 095463d568
commit 762284ce93
No known key found for this signature in database
GPG Key ID: F941078878347C0C
1 changed files with 116 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

181
tests/lib/App/AppStore/Fetcher/FetcherBase.php
View File

@ -181,23 +181,16 @@ abstract class FetcherBase extends TestCase {
} }
public function testGetWithAlreadyExistingFileAndOutdatedTimestamp() { public function testGetWithAlreadyExistingFileAndOutdatedTimestamp() {
$this->config $this->config->method('getSystemValue')
->expects($this->at(0)) ->willReturnCallback(function($key, $default) {
->method('getSystemValue') if ($key === 'appstoreenabled') {
->with('appstoreenabled', true) return true;
->willReturn(true); } else if ($key === 'version') {
$this->config return '11.0.0.2';
->expects($this->at(1)) } else {
->method('getSystemValue') return $default;
->with('appstoreenabled', true) }
->willReturn(true); });
$this->config
->expects($this->at(2))
->method('getSystemValue')
->with(
$this->equalTo('version'),
$this->anything()
)->willReturn('11.0.0.2');
$folder = $this->createMock(ISimpleFolder::class); $folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class); $file = $this->createMock(ISimpleFile::class);
@ -421,16 +414,14 @@ abstract class FetcherBase extends TestCase {
} }
public function testGetWithExceptionInClient() { public function testGetWithExceptionInClient() {
$this->config $this->config->method('getSystemValue')
->expects($this->at(0)) ->willReturnCallback(function($key, $default) {
->method('getSystemValue') if ($key === 'appstoreenabled') {
->with('appstoreenabled', true) return true;
->willReturn(true); } else {
$this->config return $default;
->expects($this->at(1)) }
->method('getSystemValue') });
->with('appstoreenabled', true)
->willReturn(true);
$folder = $this->createMock(ISimpleFolder::class); $folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class); $file = $this->createMock(ISimpleFile::class);
@ -448,10 +439,6 @@ abstract class FetcherBase extends TestCase {
->expects($this->at(0)) ->expects($this->at(0))
->method('getContent') ->method('getContent')
->willReturn('{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}}}'); ->willReturn('{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}}}');
$this->timeFactory
->expects($this->at(0))
->method('getTime')
->willReturn(1501);
$client = $this->createMock(IClient::class); $client = $this->createMock(IClient::class);
$this->clientService $this->clientService
->expects($this->once()) ->expects($this->once())
@ -467,23 +454,16 @@ abstract class FetcherBase extends TestCase {
} }
public function testGetMatchingETag() { public function testGetMatchingETag() {
$this->config $this->config->method('getSystemValue')
->expects($this->at(0)) ->willReturnCallback(function($key, $default) {
->method('getSystemValue') if ($key === 'appstoreenabled') {
->with('appstoreenabled', true) return true;
->willReturn(true); } else if ($key === 'version') {
$this->config return '11.0.0.2';
->expects($this->at(1)) } else {
->method('getSystemValue') return $default;
->with('appstoreenabled', true) }
->willReturn(true); });
$this->config
->expects($this->at(2))
->method('getSystemValue')
->with(
$this->equalTo('version'),
$this->anything()
)->willReturn('11.0.0.2');
$folder = $this->createMock(ISimpleFolder::class); $folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class); $file = $this->createMock(ISimpleFile::class);
@ -554,23 +534,16 @@ abstract class FetcherBase extends TestCase {
} }
public function testGetNoMatchingETag() { public function testGetNoMatchingETag() {
$this->config $this->config->method('getSystemValue')
->expects($this->at(0)) ->willReturnCallback(function($key, $default) {
->method('getSystemValue') if ($key === 'appstoreenabled') {
->with('appstoreenabled', true) return true;
->willReturn(true); } else if ($key === 'version') {
$this->config return '11.0.0.2';
->expects($this->at(1)) } else {
->method('getSystemValue') return $default;
->with('appstoreenabled', true) }
->willReturn(true); });
$this->config
->expects($this->at(2))
->method('getSystemValue')
->with(
$this->equalTo('version'),
$this->anything()
)->willReturn('11.0.0.2');
$folder = $this->createMock(ISimpleFolder::class); $folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class); $file = $this->createMock(ISimpleFile::class);
@ -644,4 +617,82 @@ abstract class FetcherBase extends TestCase {
]; ];
$this->assertSame($expected, $this->fetcher->get()); $this->assertSame($expected, $this->fetcher->get());
} }
public function testFetchAfterUpgradeNoETag() {
$this->config->method('getSystemValue')
->willReturnCallback(function($key, $default) {
if ($key === 'appstoreenabled') {
return true;
} else if ($key === 'version') {
return '11.0.0.3';
} else {
return $default;
}
});
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
$this->appData
->expects($this->once())
->method('getFolder')
->with('/')
->willReturn($folder);
$folder
->expects($this->at(0))
->method('getFile')
->with($this->fileName)
->willReturn($file);
$file
->expects($this->at(0))
->method('getContent')
->willReturn('{"data":[{"id":"MyOldApp","abc":"def"}],"timestamp":1200,"ncversion":"11.0.0.2","ETag":"\"myETag\""}');
$client = $this->createMock(IClient::class);
$this->clientService
->expects($this->once())
->method('newClient')
->willReturn($client);
$response = $this->createMock(IResponse::class);
$client
->expects($this->once())
->method('get')
->with(
$this->equalTo($this->endpoint),
$this->equalTo([])
)
->willReturn($response);
$response->method('getStatusCode')
->willReturn(200);
$response
->expects($this->once())
->method('getBody')
->willReturn('[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}]');
$response->method('getHeader')
->with($this->equalTo('ETag'))
->willReturn('"newETag"');
$fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1501,"ncversion":"11.0.0.3","ETag":"\"newETag\""}';
$file
->expects($this->at(1))
->method('putContent')
->with($fileData);
$file
->expects($this->at(2))
->method('getContent')
->willReturn($fileData);
$this->timeFactory
->expects($this->once())
->method('getTime')
->willReturn(1501);
$expected = [
[
'id' => 'MyNewApp',
'foo' => 'foo',
],
[
'id' => 'bar',
],
];
$this->assertSame($expected, $this->fetcher->get());
}
} }