open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix unit tests

Browse Source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/29256/head
Joas Schilling 4 years ago
parent facb50ebcc
commit f24e8212c3
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
2 changed files with 67 additions and 41 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 40
      tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
  2. 68
      tests/lib/App/AppStore/Fetcher/FetcherBase.php

40
tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
Unescape View File

@ -1868,9 +1868,7 @@ EJL3BaQAQaASSsvFrcozYxrQG4VzEg==
public function testGetWithFilter() {
$this->config->method('getSystemValue')
->willReturnCallback(function ($key, $default) {
if ($key === 'appstoreenabled') {
return true;
} elseif ($key === 'version') {
if ($key === 'version') {
return '11.0.0.2';
} elseif ($key === 'appstoreurl' && $default === 'https://apps.nextcloud.com/api/v1') {
return 'https://custom.appsstore.endpoint/api/v1';
@ -1878,6 +1876,10 @@ EJL3BaQAQaASSsvFrcozYxrQG4VzEg==
return $default;
}
});
$this->config
->method('getSystemValueBool')
->with('appstoreenabled', true)
->willReturn(true);
$file = $this->createMock(ISimpleFile::class);
$folder = $this->createMock(ISimpleFolder::class);
@ -1951,13 +1953,15 @@ EJL3BaQAQaASSsvFrcozYxrQG4VzEg==
$this->config
->method('getSystemValue')
->willReturnCallback(function ($var, $default) {
if ($var === 'appstoreenabled') {
return false;
} elseif ($var === 'version') {
if ($var === 'version') {
return '11.0.0.2';
}
return $default;
});
$this->config
->method('getSystemValueBool')
->with('appstoreenabled', true)
->willReturn(false);
$this->appData
->expects($this->never())
->method('getFolder');
@ -1977,6 +1981,10 @@ EJL3BaQAQaASSsvFrcozYxrQG4VzEg==
}
return $default;
});
$this->config
->method('getSystemValueBool')
->with('appstoreenabled', true)
->willReturn(true);
$this->appData
->expects($this->never())
->method('getFolder');
@ -1987,9 +1995,7 @@ EJL3BaQAQaASSsvFrcozYxrQG4VzEg==
public function testSetVersion() {
$this->config->method('getSystemValue')
->willReturnCallback(function ($key, $default) {
if ($key === 'appstoreenabled') {
return true;
} elseif ($key === 'version') {
if ($key === 'version') {
return '10.0.7.2';
} elseif ($key === 'appstoreurl' && $default === 'https://apps.nextcloud.com/api/v1') {
return 'https://custom.appsstore.endpoint/api/v1';
@ -1997,6 +2003,10 @@ EJL3BaQAQaASSsvFrcozYxrQG4VzEg==
return $default;
}
});
$this->config
->method('getSystemValueBool')
->with('appstoreenabled', true)
->willReturn(true);
$file = $this->createMock(ISimpleFile::class);
$folder = $this->createMock(ISimpleFolder::class);
@ -2070,9 +2080,7 @@ EJL3BaQAQaASSsvFrcozYxrQG4VzEg==
public function testGetAppsAllowlist() {
$this->config->method('getSystemValue')
->willReturnCallback(function ($key, $default) {
if ($key === 'appstoreenabled') {
return true;
} elseif ($key === 'version') {
if ($key === 'version') {
return '11.0.0.2';
} elseif ($key === 'appstoreurl' && $default === 'https://apps.nextcloud.com/api/v1') {
return 'https://custom.appsstore.endpoint/api/v1';
@ -2082,7 +2090,11 @@ EJL3BaQAQaASSsvFrcozYxrQG4VzEg==
return $default;
}
});
$this->config
->method('getSystemValueBool')
->with('appstoreenabled', true)
->willReturn(true);
$file = $this->createMock(ISimpleFile::class);
$folder = $this->createMock(ISimpleFolder::class);
$folder
@ -2122,7 +2134,7 @@ EJL3BaQAQaASSsvFrcozYxrQG4VzEg==
->expects($this->once())
->method('getTime')
->willReturn(1234);
$this->registry
->expects($this->exactly(2))
->method('delegateHasValidSubscription')

68
tests/lib/App/AppStore/Fetcher/FetcherBase.php
Unescape View File

@ -77,7 +77,7 @@ abstract class FetcherBase extends TestCase {
public function testGetWithAlreadyExistingFileAndUpToDateTimestampAndVersion() {
$this->config
->expects($this->at(0))
->method('getSystemValue')
->method('getSystemValueBool')
->with('appstoreenabled', true)
->willReturn(true);
$this->config
@ -126,9 +126,7 @@ abstract class FetcherBase extends TestCase {
$this->config
->method('getSystemValue')
->willReturnCallback(function ($var, $default) {
if ($var === 'appstoreenabled') {
return true;
} elseif ($var === 'has_internet_connection') {
if ($var === 'has_internet_connection') {
return true;
} elseif ($var === 'appstoreurl') {
return 'https://apps.nextcloud.com/api/v1';
@ -137,6 +135,10 @@ abstract class FetcherBase extends TestCase {
}
return $default;
});
$this->config
->method('getSystemValueBool')
->with('appstoreenabled', $this->anything())
->willReturn(true);
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
@ -202,14 +204,16 @@ abstract class FetcherBase extends TestCase {
public function testGetWithAlreadyExistingFileAndOutdatedTimestamp() {
$this->config->method('getSystemValue')
->willReturnCallback(function ($key, $default) {
if ($key === 'appstoreenabled') {
return true;
} elseif ($key === 'version') {
if ($key === 'version') {
return '11.0.0.2';
} else {
return $default;
}
});
$this->config
->method('getSystemValueBool')
->with('appstoreenabled', true)
->willReturn(true);
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
@ -279,9 +283,7 @@ abstract class FetcherBase extends TestCase {
$this->config
->method('getSystemValue')
->willReturnCallback(function ($var, $default) {
if ($var === 'appstoreenabled') {
return true;
} elseif ($var === 'has_internet_connection') {
if ($var === 'has_internet_connection') {
return true;
} elseif ($var === 'appstoreurl') {
return 'https://apps.nextcloud.com/api/v1';
@ -290,6 +292,10 @@ abstract class FetcherBase extends TestCase {
}
return $default;
});
$this->config
->method('getSystemValueBool')
->with('appstoreenabled', true)
->willReturn(true);
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
@ -355,9 +361,7 @@ abstract class FetcherBase extends TestCase {
$this->config
->method('getSystemValue')
->willReturnCallback(function ($var, $default) {
if ($var === 'appstoreenabled') {
return true;
} elseif ($var === 'has_internet_connection') {
if ($var === 'has_internet_connection') {
return true;
} elseif ($var === 'appstoreurl') {
return 'https://apps.nextcloud.com/api/v1';
@ -366,6 +370,10 @@ abstract class FetcherBase extends TestCase {
}
return $default;
});
$this->config
->method('getSystemValueBool')
->with('appstoreenabled', true)
->willReturn(true);
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
@ -429,12 +437,12 @@ abstract class FetcherBase extends TestCase {
public function testGetWithExceptionInClient() {
$this->config->method('getSystemValue')
->willReturnCallback(function ($key, $default) {
if ($key === 'appstoreenabled') {
return true;
} else {
return $default;
}
return $default;
});
$this->config
->method('getSystemValueBool')
->with('appstoreenabled', true)
->willReturn(true);
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
@ -469,14 +477,16 @@ abstract class FetcherBase extends TestCase {
public function testGetMatchingETag() {
$this->config->method('getSystemValue')
->willReturnCallback(function ($key, $default) {
if ($key === 'appstoreenabled') {
return true;
} elseif ($key === 'version') {
if ($key === 'version') {
return '11.0.0.2';
} else {
return $default;
}
});
$this->config
->method('getSystemValueBool')
->with('appstoreenabled', true)
->willReturn(true);
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
@ -550,14 +560,16 @@ abstract class FetcherBase extends TestCase {
public function testGetNoMatchingETag() {
$this->config->method('getSystemValue')
->willReturnCallback(function ($key, $default) {
if ($key === 'appstoreenabled') {
return true;
} elseif ($key === 'version') {
if ($key === 'version') {
return '11.0.0.2';
} else {
return $default;
}
});
$this->config
->method('getSystemValueBool')
->with('appstoreenabled', true)
->willReturn(true);
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
@ -637,14 +649,16 @@ abstract class FetcherBase extends TestCase {
public function testFetchAfterUpgradeNoETag() {
$this->config->method('getSystemValue')
->willReturnCallback(function ($key, $default) {
if ($key === 'appstoreenabled') {
return true;
} elseif ($key === 'version') {
if ($key === 'version') {
return '11.0.0.3';
} else {
return $default;
}
});
$this->config
->method('getSystemValueBool')
->with('appstoreenabled', true)
->willReturn(true);
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);

Write Preview
Loading…
Cancel
Save