diff options
| author | Sebastian Krupinski <165827823+SebastianKrupinski@users.noreply.github.com> | 2024-09-16 09:06:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-16 09:06:40 -0400 |
| commit | 23e56a5abed4acc1279d8908b7fc98b2e72c7b22 (patch) | |
| tree | ca0a18a547e893da611c07d27b01a5edd7486681 /apps/dav/tests | |
| parent | d18c6af26c2257e1aa8e4df9f87224424f90942f (diff) | |
| parent | 440d8ea4b30111f65bc01274d50ad28f87091b78 (diff) | |
| download | nextcloud-server-backport/45098/stable29.tar.gz nextcloud-server-backport/45098/stable29.zip | |
Merge branch 'stable29' into backport/45098/stable29backport/45098/stable29
Diffstat (limited to 'apps/dav/tests')
| -rw-r--r-- | apps/dav/tests/travis/caldavtest/tests/CalDAV/sync-report.xml | 2 | ||||
| -rw-r--r-- | apps/dav/tests/unit/DAV/ErrorPagePluginTest.php (renamed from apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php) | 8 | ||||
| -rw-r--r-- | apps/dav/tests/unit/Upload/AssemblyStreamTest.php | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/apps/dav/tests/travis/caldavtest/tests/CalDAV/sync-report.xml b/apps/dav/tests/travis/caldavtest/tests/CalDAV/sync-report.xml index cf4fcde251f..388d9df8413 100644 --- a/apps/dav/tests/travis/caldavtest/tests/CalDAV/sync-report.xml +++ b/apps/dav/tests/travis/caldavtest/tests/CalDAV/sync-report.xml @@ -2712,7 +2712,7 @@ <callback>prepostcondition</callback> <arg> <name>error</name> - <value>{DAV:}valid-sync-token</value> + <value>{http://sabredav.org/ns}exception</value> </arg> <arg> <name>ignoreextras</name> diff --git a/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php b/apps/dav/tests/unit/DAV/ErrorPagePluginTest.php index b6ec05afd78..3c87574e8d2 100644 --- a/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php +++ b/apps/dav/tests/unit/DAV/ErrorPagePluginTest.php @@ -23,11 +23,11 @@ */ namespace OCA\DAV\Tests\unit\DAV; -use OCA\DAV\Files\BrowserErrorPagePlugin; +use OCA\DAV\Files\ErrorPagePlugin; use Sabre\DAV\Exception\NotFound; use Sabre\HTTP\Response; -class BrowserErrorPagePluginTest extends \Test\TestCase { +class ErrorPagePluginTest extends \Test\TestCase { /** * @dataProvider providesExceptions @@ -35,8 +35,8 @@ class BrowserErrorPagePluginTest extends \Test\TestCase { * @param $exception */ public function test($expectedCode, $exception): void { - /** @var BrowserErrorPagePlugin | \PHPUnit\Framework\MockObject\MockObject $plugin */ - $plugin = $this->getMockBuilder(BrowserErrorPagePlugin::class)->setMethods(['sendResponse', 'generateBody'])->getMock(); + /** @var ErrorPagePlugin | \PHPUnit\Framework\MockObject\MockObject $plugin */ + $plugin = $this->getMockBuilder(ErrorPagePlugin::class)->disableOriginalConstructor()->setMethods(['sendResponse', 'generateBody'])->getMock(); $plugin->expects($this->once())->method('generateBody')->willReturn(':boom:'); $plugin->expects($this->once())->method('sendResponse'); /** @var \Sabre\DAV\Server | \PHPUnit\Framework\MockObject\MockObject $server */ diff --git a/apps/dav/tests/unit/Upload/AssemblyStreamTest.php b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php index d39aec0915e..662c4896a9e 100644 --- a/apps/dav/tests/unit/Upload/AssemblyStreamTest.php +++ b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php @@ -78,9 +78,9 @@ class AssemblyStreamTest extends \Test\TestCase { $tonofnodes = []; $tonofdata = ""; for ($i = 0; $i < 101; $i++) { - $thisdata = rand(0, 100); // variable length and content + $thisdata = random_int(0, 100); // variable length and content $tonofdata .= $thisdata; - array_push($tonofnodes, $this->buildNode($i, $thisdata)); + $tonofnodes[] = $this->buildNode((string)$i, (string)$thisdata); } return[ |