summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/files_encryption/tests/stream.php7
-rw-r--r--apps/files_sharing/tests/cache.php18
-rw-r--r--tests/lib/archive/tar.php2
-rw-r--r--tests/lib/files/storage/local.php4
-rw-r--r--tests/lib/files/view.php2
-rw-r--r--tests/lib/helper.php4
-rw-r--r--tests/lib/image.php10
7 files changed, 37 insertions, 10 deletions
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index 2b57f11c680..c3f777df859 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -134,6 +134,13 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
$handle = $view->fopen($filename, 'r');
+
+ if (\OC_Util::runningOnWindows()) {
+ fclose($handle);
+ $view->unlink($filename);
+ $this->markTestSkipped('[Windows] stream_set_blocking() does not work as expected on Windows.');
+ }
+
// set stream options
$this->assertTrue(stream_set_blocking($handle, 1));
diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php
index 2c9790ce66d..0e96f5a4e09 100644
--- a/apps/files_sharing/tests/cache.php
+++ b/apps/files_sharing/tests/cache.php
@@ -30,6 +30,18 @@ class Test_Files_Sharing_Cache extends TestCase {
*/
public $user2View;
+ /** @var \OC\Files\Cache\Cache */
+ protected $ownerCache;
+
+ /** @var \OC\Files\Cache\Cache */
+ protected $sharedCache;
+
+ /** @var \OC\Files\Storage\Storage */
+ protected $ownerStorage;
+
+ /** @var \OC\Files\Storage\Storage */
+ protected $sharedStorage;
+
function setUp() {
parent::setUp();
@@ -54,7 +66,7 @@ class Test_Files_Sharing_Cache extends TestCase {
$this->view->file_put_contents('container/shareddir/subdir/another too.txt', $textData);
$this->view->file_put_contents('container/shareddir/subdir/not a text file.xml', '<xml></xml>');
- list($this->ownerStorage, $internalPath) = $this->view->resolvePath('');
+ list($this->ownerStorage,) = $this->view->resolvePath('');
$this->ownerCache = $this->ownerStorage->getCache();
$this->ownerStorage->getScanner()->scan('');
@@ -72,7 +84,7 @@ class Test_Files_Sharing_Cache extends TestCase {
// retrieve the shared storage
$secondView = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2);
- list($this->sharedStorage, $internalPath) = $secondView->resolvePath('files/shareddir');
+ list($this->sharedStorage,) = $secondView->resolvePath('files/shareddir');
$this->sharedCache = $this->sharedStorage->getCache();
}
@@ -354,7 +366,7 @@ class Test_Files_Sharing_Cache extends TestCase {
self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
\OC\Files\Filesystem::mkdir('foo');
\OC\Files\Filesystem::mkdir('foo/bar');
- \OC\Files\Filesystem::touch('foo/bar/test.txt', 'bar');
+ \OC\Files\Filesystem::touch('foo/bar/test.txt');
$folderInfo = \OC\Files\Filesystem::getFileInfo('foo');
$fileInfo = \OC\Files\Filesystem::getFileInfo('foo/bar/test.txt');
\OCP\Share::shareItem('folder', $folderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, \OCP\PERMISSION_ALL);
diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php
index 5b9089b32e1..99f7fb30e2b 100644
--- a/tests/lib/archive/tar.php
+++ b/tests/lib/archive/tar.php
@@ -9,7 +9,7 @@
class Test_Archive_TAR extends Test_Archive {
public function setUp() {
if (OC_Util::runningOnWindows()) {
- $this->markTestSkipped('tar archives are not supported on windows');
+ $this->markTestSkipped('[Windows] tar archives are not supported on Windows');
}
parent::setUp();
}
diff --git a/tests/lib/files/storage/local.php b/tests/lib/files/storage/local.php
index 37462941d0c..490086c62f2 100644
--- a/tests/lib/files/storage/local.php
+++ b/tests/lib/files/storage/local.php
@@ -39,7 +39,7 @@ class Local extends Storage {
public function testStableEtag() {
if (\OC_Util::runningOnWindows()) {
- $this->markTestSkipped('On Windows platform we have no stable etag generation - yet');
+ $this->markTestSkipped('[Windows] On Windows platform we have no stable etag generation - yet');
}
$this->instance->file_put_contents('test.txt', 'foobar');
@@ -50,7 +50,7 @@ class Local extends Storage {
public function testEtagChange() {
if (\OC_Util::runningOnWindows()) {
- $this->markTestSkipped('On Windows platform we have no stable etag generation - yet');
+ $this->markTestSkipped('[Windows] On Windows platform we have no stable etag generation - yet');
}
$this->instance->file_put_contents('test.txt', 'foo');
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 5f030f29fa7..931f5acd95a 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -598,7 +598,7 @@ class View extends \PHPUnit_Framework_TestCase {
$folderName = 'abcdefghijklmnopqrstuvwxyz012345678901234567890123456789';
$tmpdirLength = strlen(\OC_Helper::tmpFolder());
if (\OC_Util::runningOnWindows()) {
- $this->markTestSkipped();
+ $this->markTestSkipped('[Windows] ');
$depth = ((260 - $tmpdirLength) / 57);
}elseif(\OC_Util::runningOnMac()){
$depth = ((1024 - $tmpdirLength) / 57);
diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index 520a3e0e669..57c72c11987 100644
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -115,6 +115,10 @@ class Test_Helper extends PHPUnit_Framework_TestCase {
}
function testGetStringMimeType() {
+ if (\OC_Util::runningOnWindows()) {
+ $this->markTestSkipped('[Windows] Strings have mimetype application/octet-stream on Windows');
+ }
+
$result = OC_Helper::getStringMimeType("/data/data.tar.gz");
$expected = 'text/plain; charset=us-ascii';
$this->assertEquals($result, $expected);
diff --git a/tests/lib/image.php b/tests/lib/image.php
index 795bc464159..a683c3d2c8b 100644
--- a/tests/lib/image.php
+++ b/tests/lib/image.php
@@ -62,14 +62,18 @@ class Test_Image extends PHPUnit_Framework_TestCase {
$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
$this->assertEquals('image/png', $img->mimeType());
+ $img = new \OC_Image(null);
+ $this->assertEquals('', $img->mimeType());
+
+ if (\OC_Util::runningOnWindows()) {
+ $this->markTestSkipped('[Windows] Images created with imagecreate() are pngs on windows');
+ }
+
$img = new \OC_Image(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
$this->assertEquals('image/jpeg', $img->mimeType());
$img = new \OC_Image(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
$this->assertEquals('image/gif', $img->mimeType());
-
- $img = new \OC_Image(null);
- $this->assertEquals('', $img->mimeType());
}
public function testWidth() {
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-10 18:02:37 +0000