summaryrefslogtreecommitdiffstats
path: root/tests/lib
diff options
context:
space:
mode:
authorGeorg Ehrke <developer@georgehrke.com>2013-09-27 11:01:47 +0200
committerGeorg Ehrke <developer@georgehrke.com>2013-09-27 11:01:47 +0200
commit1b13101096493c0c8f02826e373af761fd5cfac6 (patch)
tree1566c5cc0ae402e7cc3df0f16b79f2dcba2b58b5 /tests/lib
parentaa8a145ba8fe5a429698ac9c508704952a454358 (diff)
downloadnextcloud-server-1b13101096493c0c8f02826e373af761fd5cfac6.tar.gz
nextcloud-server-1b13101096493c0c8f02826e373af761fd5cfac6.zip
move fileView object initialization to testIsTransparent
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib/preview.php20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/lib/preview.php b/tests/lib/preview.php
index 5dc4a93acc5..98659a7e887 100644
--- a/tests/lib/preview.php
+++ b/tests/lib/preview.php
@@ -93,27 +93,27 @@ class Preview extends \PHPUnit_Framework_TestCase {
}
public function testTxtBlacklist() {
- $user = $this->initFS();
-
$txt = 'random text file';
$ics = file_get_contents(__DIR__ . '/../data/testcal.ics');
$vcf = file_get_contents(__DIR__ . '/../data/testcontact.vcf');
- $rootView = new \OC\Files\View('');
- $rootView->mkdir('/'.$user);
- $rootView->mkdir('/'.$user.'/files');
-
return array(
- array('txt', $txt, $user, $rootView, false),
- array('ics', $ics, $user, $rootView, true),
- array('vcf', $vcf, $user, $rootView, true),
+ array('txt', $txt, false),
+ array('ics', $ics, true),
+ array('vcf', $vcf, true),
);
}
/**
* @dataProvider testTxtBlacklist
*/
- public function testIsTransparent($test, $data, $user, $rootView, $expectedResult) {
+ public function testIsTransparent($test, $data, $expectedResult) {
+ $user = $this->initFS();
+
+ $rootView = new \OC\Files\View('');
+ $rootView->mkdir('/'.$user);
+ $rootView->mkdir('/'.$user.'/files');
+
$x = 32;
$y = 32;