summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/backgroundjob/timedjob.php3
-rw-r--r--tests/lib/db.php8
-rw-r--r--tests/lib/files/stream/staticstream.php68
-rw-r--r--tests/lib/hooks/basicemitter.php18
-rw-r--r--tests/lib/session/session.php2
-rw-r--r--tests/lib/streamwrappers.php12
-rw-r--r--tests/phpunit.xml.dist (renamed from tests/phpunit.xml)3
7 files changed, 95 insertions, 19 deletions
diff --git a/tests/lib/backgroundjob/timedjob.php b/tests/lib/backgroundjob/timedjob.php
index 0af933afef8..f3c3eb4d0dd 100644
--- a/tests/lib/backgroundjob/timedjob.php
+++ b/tests/lib/backgroundjob/timedjob.php
@@ -41,6 +41,7 @@ class TimedJob extends \PHPUnit_Framework_TestCase {
$this->fail("job should have run");
} catch (JobRun $e) {
}
+ $this->assertTrue(true);
}
public function testShouldNotRunWithinInterval() {
@@ -50,6 +51,7 @@ class TimedJob extends \PHPUnit_Framework_TestCase {
} catch (JobRun $e) {
$this->fail("job should not have run");
}
+ $this->assertTrue(true);
}
public function testShouldNotTwice() {
@@ -64,5 +66,6 @@ class TimedJob extends \PHPUnit_Framework_TestCase {
$this->fail("job should not have run the second time");
}
}
+ $this->assertTrue(true);
}
}
diff --git a/tests/lib/db.php b/tests/lib/db.php
index afbdb413c3d..0ba7d5d4b06 100644
--- a/tests/lib/db.php
+++ b/tests/lib/db.php
@@ -40,7 +40,7 @@ class Test_DB extends PHPUnit_Framework_TestCase {
$this->assertFalse((bool)$row); //PDO returns false, MDB2 returns null
$query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (?,?)');
$result = $query->execute(array('fullname test', 'uri_1'));
- $this->assertTrue((bool)$result);
+ $this->assertEquals('1', $result);
$query = OC_DB::prepare('SELECT `fullname`,`uri` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?');
$result = $query->execute(array('uri_1'));
$this->assertTrue((bool)$result);
@@ -57,7 +57,7 @@ class Test_DB extends PHPUnit_Framework_TestCase {
public function testNOW() {
$query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (NOW(),?)');
$result = $query->execute(array('uri_2'));
- $this->assertTrue((bool)$result);
+ $this->assertEquals('1', $result);
$query = OC_DB::prepare('SELECT `fullname`,`uri` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?');
$result = $query->execute(array('uri_2'));
$this->assertTrue((bool)$result);
@@ -66,7 +66,7 @@ class Test_DB extends PHPUnit_Framework_TestCase {
public function testUNIX_TIMESTAMP() {
$query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (UNIX_TIMESTAMP(),?)');
$result = $query->execute(array('uri_3'));
- $this->assertTrue((bool)$result);
+ $this->assertEquals('1', $result);
$query = OC_DB::prepare('SELECT `fullname`,`uri` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?');
$result = $query->execute(array('uri_3'));
$this->assertTrue((bool)$result);
@@ -105,7 +105,7 @@ class Test_DB extends PHPUnit_Framework_TestCase {
// Normal test to have same known data inserted.
$query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`, `uri`, `carddata`) VALUES (?, ?, ?)');
$result = $query->execute(array($fullname, $uri, $carddata));
- $this->assertTrue((bool)$result);
+ $this->assertEquals('1', $result);
$query = OC_DB::prepare('SELECT `fullname`, `uri`, `carddata` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?');
$result = $query->execute(array($uri));
$this->assertTrue((bool)$result);
diff --git a/tests/lib/files/stream/staticstream.php b/tests/lib/files/stream/staticstream.php
new file mode 100644
index 00000000000..d55086196a0
--- /dev/null
+++ b/tests/lib/files/stream/staticstream.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Stream;
+
+class StaticStream extends \PHPUnit_Framework_TestCase {
+
+ private $sourceFile;
+ private $sourceText;
+
+ public function __construct() {
+ $this->sourceFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
+ $this->sourceText = file_get_contents($this->sourceFile);
+ }
+
+ public function tearDown() {
+ \OC\Files\Stream\StaticStream::clear();
+ }
+
+ public function testContent() {
+ file_put_contents('static://foo', $this->sourceText);
+ $this->assertEquals($this->sourceText, file_get_contents('static://foo'));
+ }
+
+ public function testMultipleFiles() {
+ file_put_contents('static://foo', $this->sourceText);
+ file_put_contents('static://bar', strrev($this->sourceText));
+ $this->assertEquals($this->sourceText, file_get_contents('static://foo'));
+ $this->assertEquals(strrev($this->sourceText), file_get_contents('static://bar'));
+ }
+
+ public function testOverwrite() {
+ file_put_contents('static://foo', $this->sourceText);
+ file_put_contents('static://foo', 'qwerty');
+ $this->assertEquals('qwerty', file_get_contents('static://foo'));
+ }
+
+ public function testIsFile() {
+ $this->assertFalse(is_file('static://foo'));
+ file_put_contents('static://foo', $this->sourceText);
+ $this->assertTrue(is_file('static://foo'));
+ }
+
+ public function testIsDir() {
+ $this->assertFalse(is_dir('static://foo'));
+ file_put_contents('static://foo', $this->sourceText);
+ $this->assertFalse(is_dir('static://foo'));
+ }
+
+ public function testFileType() {
+ file_put_contents('static://foo', $this->sourceText);
+ $this->assertEquals('file', filetype('static://foo'));
+ }
+
+ public function testUnlink() {
+ $this->assertFalse(file_exists('static://foo'));
+ file_put_contents('static://foo', $this->sourceText);
+ $this->assertTrue(file_exists('static://foo'));
+ unlink('static://foo');
+ clearstatcache();
+ $this->assertFalse(file_exists('static://foo'));
+ }
+}
diff --git a/tests/lib/hooks/basicemitter.php b/tests/lib/hooks/basicemitter.php
index f48dc53c563..0eae730d030 100644
--- a/tests/lib/hooks/basicemitter.php
+++ b/tests/lib/hooks/basicemitter.php
@@ -155,6 +155,8 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
$this->emitter->listen('Test', 'test', $listener);
$this->emitter->removeListener('Test', 'test', $listener);
$this->emitter->emitEvent('Test', 'test');
+
+ $this->assertTrue(true);
}
public function testRemoveWildcardListener() {
@@ -168,6 +170,8 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
$this->emitter->listen('Test', 'test', $listener2);
$this->emitter->removeListener('Test', 'test');
$this->emitter->emitEvent('Test', 'test');
+
+ $this->assertTrue(true);
}
public function testRemoveWildcardMethod() {
@@ -179,6 +183,8 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
$this->emitter->removeListener('Test', null, $listener);
$this->emitter->emitEvent('Test', 'test');
$this->emitter->emitEvent('Test', 'foo');
+
+ $this->assertTrue(true);
}
public function testRemoveWildcardScope() {
@@ -190,6 +196,8 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
$this->emitter->removeListener(null, 'test', $listener);
$this->emitter->emitEvent('Test', 'test');
$this->emitter->emitEvent('Bar', 'test');
+
+ $this->assertTrue(true);
}
public function testRemoveWildcardScopeAndMethod() {
@@ -203,6 +211,8 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
$this->emitter->emitEvent('Test', 'test');
$this->emitter->emitEvent('Test', 'foo');
$this->emitter->emitEvent('Bar', 'foo');
+
+ $this->assertTrue(true);
}
/**
@@ -219,6 +229,8 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
$this->emitter->listen('Test', 'test', $listener2);
$this->emitter->removeListener('Test', 'test', $listener1);
$this->emitter->emitEvent('Test', 'test');
+
+ $this->assertTrue(true);
}
/**
@@ -232,6 +244,8 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
$this->emitter->listen('Test', 'foo', $listener);
$this->emitter->removeListener('Test', 'foo', $listener);
$this->emitter->emitEvent('Test', 'test');
+
+ $this->assertTrue(true);
}
/**
@@ -245,6 +259,8 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
$this->emitter->listen('Bar', 'test', $listener);
$this->emitter->removeListener('Bar', 'test', $listener);
$this->emitter->emitEvent('Test', 'test');
+
+ $this->assertTrue(true);
}
/**
@@ -257,5 +273,7 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
$this->emitter->listen('Test', 'test', $listener);
$this->emitter->removeListener('Bar', 'test', $listener);
$this->emitter->emitEvent('Test', 'test');
+
+ $this->assertTrue(true);
}
}
diff --git a/tests/lib/session/session.php b/tests/lib/session/session.php
index 72dee44e7cb..9ce11274c84 100644
--- a/tests/lib/session/session.php
+++ b/tests/lib/session/session.php
@@ -44,7 +44,9 @@ abstract class Session extends \PHPUnit_Framework_TestCase {
}
public function testRemoveNonExisting() {
+ $this->assertFalse($this->instance->exists('foo'));
$this->instance->remove('foo');
+ $this->assertFalse($this->instance->exists('foo'));
}
public function testNotExistsAfterClear() {
diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php
index c7e51ccfa48..d15b712139d 100644
--- a/tests/lib/streamwrappers.php
+++ b/tests/lib/streamwrappers.php
@@ -33,18 +33,6 @@ class Test_StreamWrappers extends PHPUnit_Framework_TestCase {
$this->assertEquals(count($items), count($result));
}
- public function testStaticStream() {
- $sourceFile = OC::$SERVERROOT . '/tests/data/lorem.txt';
- $staticFile = 'static://test';
- $this->assertFalse(file_exists($staticFile));
- file_put_contents($staticFile, file_get_contents($sourceFile));
- $this->assertTrue(file_exists($staticFile));
- $this->assertEquals(file_get_contents($sourceFile), file_get_contents($staticFile));
- unlink($staticFile);
- clearstatcache();
- $this->assertFalse(file_exists($staticFile));
- }
-
public function testCloseStream() {
//ensure all basic stream stuff works
$sourceFile = OC::$SERVERROOT . '/tests/data/lorem.txt';
diff --git a/tests/phpunit.xml b/tests/phpunit.xml.dist
index 510c38a3c8b..25dfc64cfeb 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml.dist
@@ -15,7 +15,4 @@
</exclude>
</whitelist>
</filter>
- <listeners>
- <listener class="PHPUnit_Util_Log_JSON"></listener>
- </listeners>
</phpunit>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-06 11:12:18 +0000