aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2013-06-28 13:38:44 -0700
committerMorris Jobke <morris.jobke@gmail.com>2013-06-28 13:38:44 -0700
commit67ed48d4c93b661942aa3a1f8269e7839896d06c (patch)
tree7e797acefae5471dca26c65c1ee0949f9317aaab
parent30a403e327cd02dcf6acddd98e6a0837281cea9f (diff)
parentde66861ef1a440837cc6161eaea21fd3e401570f (diff)
downloadnextcloud-server-67ed48d4c93b661942aa3a1f8269e7839896d06c.tar.gz
nextcloud-server-67ed48d4c93b661942aa3a1f8269e7839896d06c.zip
Merge pull request #3884 from owncloud/fixing-unittests-master
Fixing unittests master
-rw-r--r--tests/lib/backgroundjob/timedjob.php3
-rw-r--r--tests/lib/hooks/basicemitter.php18
-rw-r--r--tests/lib/session/session.php2
3 files changed, 23 insertions, 0 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/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() {