[Pkg-owncloud-commits] [owncloud] 53/85: Fix unit tests

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch 6.0
in repository owncloud.

commit 3ea94a793026de56f6a05db2fecc17f1bbe88ef9
Author: Robin Appelman <icewind at owncloud.com>
Date:   Wed Jun 4 10:01:50 2014 +0200

    Fix unit tests
---
 tests/lib/files/cache/changepropagator.php | 12 ++++++------
 tests/lib/files/cache/scanner.php          |  5 +----
 tests/lib/files/utils/scanner.php          | 14 ++++++++++----
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/tests/lib/files/cache/changepropagator.php b/tests/lib/files/cache/changepropagator.php
index 9beff27..88b79d6 100644
--- a/tests/lib/files/cache/changepropagator.php
+++ b/tests/lib/files/cache/changepropagator.php
@@ -61,12 +61,12 @@ class ChangePropagator extends \PHPUnit_Framework_TestCase {
 		$newInfo2 = $this->view->getFileInfo('/foo');
 		$newInfo3 = $this->view->getFileInfo('/foo/bar');
 
-		$this->assertEquals($newInfo1->getMTime(), $time);
-		$this->assertEquals($newInfo2->getMTime(), $time);
-		$this->assertEquals($newInfo3->getMTime(), $time);
+		$this->assertEquals($newInfo1['mtime'], $time);
+		$this->assertEquals($newInfo2['mtime'], $time);
+		$this->assertEquals($newInfo3['mtime'], $time);
 
-		$this->assertNotEquals($oldInfo1->getEtag(), $newInfo1->getEtag());
-		$this->assertNotEquals($oldInfo2->getEtag(), $newInfo2->getEtag());
-		$this->assertNotEquals($oldInfo3->getEtag(), $newInfo3->getEtag());
+		$this->assertNotEquals($oldInfo1['etag'], $newInfo1['etag']);
+		$this->assertNotEquals($oldInfo2['etag'], $newInfo2['etag']);
+		$this->assertNotEquals($oldInfo3['etag'], $newInfo3['etag']);
 	}
 }
diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php
index 3f5604b..92d75aa 100644
--- a/tests/lib/files/cache/scanner.php
+++ b/tests/lib/files/cache/scanner.php
@@ -227,10 +227,7 @@ class Scanner extends \PHPUnit_Framework_TestCase {
 
 		// verify cache content
 		$newData0 = $this->cache->get('folder/bar.txt');
-		$newData1 = $this->cache->get('folder');
-		$newData2 = $this->cache->get('');
+		$this->assertInternalType('string', $newData0['etag']);
 		$this->assertNotEmpty($newData0['etag']);
-		$this->assertNotEquals($data1['etag'], $newData1['etag']);
-		$this->assertNotEquals($data2['etag'], $newData2['etag']);
 	}
 }
diff --git a/tests/lib/files/utils/scanner.php b/tests/lib/files/utils/scanner.php
index 267fc63..159a2a4 100644
--- a/tests/lib/files/utils/scanner.php
+++ b/tests/lib/files/utils/scanner.php
@@ -105,8 +105,12 @@ class Scanner extends \PHPUnit_Framework_TestCase {
 
 		$scanner->scan('');
 
-		$this->assertEquals(array('/foo', '/foo/foo.txt', '/foo/folder', '/foo/folder/bar.txt'), $propagator->getChanges());
-		$this->assertEquals(array('/', '/foo', '/foo/folder'), $propagator->getAllParents());
+		$changes = $propagator->getChanges();
+		$parents = $propagator->getAllParents();
+		sort($changes);
+		sort($parents);
+		$this->assertEquals(array('/foo', '/foo/folder', '/foo/folder/bar.txt', '/foo/foo.txt'), $changes);
+		$this->assertEquals(array('/', '/foo', '/foo/folder'), $parents);
 
 		$cache->put('foo.txt', array('mtime' => time() - 50));
 
@@ -116,8 +120,10 @@ class Scanner extends \PHPUnit_Framework_TestCase {
 
 		$scanner->scan('');
 
-		$this->assertEquals(array('/foo/foo.txt'), $propagator->getChanges());
-		$this->assertEquals(array('/', '/foo'), $propagator->getAllParents());
+		$changes = $propagator->getChanges();
+		$parents = $propagator->getAllParents();
+		$this->assertEquals(array('/foo/foo.txt'), $changes);
+		$this->assertEquals(array('/', '/foo'), $parents);
 
 		$scanner->setPropagator($originalPropagator);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git