Browse Source

remove duplicate test class

tags/v7.0.0alpha2
Robin Appelman 10 years ago
parent
commit
4113042c8f
2 changed files with 17 additions and 23 deletions
  1. 0
    23
      tests/lib/files/etagtest.php
  2. 17
    0
      tests/lib/files/view.php

+ 0
- 23
tests/lib/files/etagtest.php View File

@@ -11,12 +11,6 @@ namespace Test\Files;
use OC\Files\Filesystem;
use OCP\Share;

class TemporaryNoTouch extends \OC\Files\Storage\Temporary {
public function touch($path, $mtime = null) {
return false;
}
}

class EtagTest extends \PHPUnit_Framework_TestCase {
private $datadir;

@@ -74,23 +68,6 @@ class EtagTest extends \PHPUnit_Framework_TestCase {
$this->assertEquals($originalEtags, $this->getEtags($files));
}

public function testTouchNotSupported() {
$storage = new TemporaryNoTouch(array());
$scanner = $storage->getScanner();
Filesystem::mount($storage, array(), '/test/');
$past = time() - 100;
$storage->file_put_contents('test', 'foobar');
$scanner->scan('');
$view = new \OC\Files\View('');
$info = $view->getFileInfo('/test/test');

$view->touch('/test/test', $past);
$scanner->scanFile('test', \OC\Files\Cache\Scanner::REUSE_ETAG);

$info2 = $view->getFileInfo('/test/test');
$this->assertEquals($info['etag'], $info2['etag']);
}

private function getEtags($files) {
$etags = array();
foreach ($files as $file) {

+ 17
- 0
tests/lib/files/view.php View File

@@ -545,4 +545,21 @@ class View extends \PHPUnit_Framework_TestCase {
$this->assertContains($item['name'], $names);
}
}

public function testTouchNotSupported() {
$storage = new TemporaryNoTouch(array());
$scanner = $storage->getScanner();
\OC\Files\Filesystem::mount($storage, array(), '/test/');
$past = time() - 100;
$storage->file_put_contents('test', 'foobar');
$scanner->scan('');
$view = new \OC\Files\View('');
$info = $view->getFileInfo('/test/test');

$view->touch('/test/test', $past);
$scanner->scanFile('test', \OC\Files\Cache\Scanner::REUSE_ETAG);

$info2 = $view->getFileInfo('/test/test');
$this->assertEquals($info['etag'], $info2['etag']);
}
}

Loading…
Cancel
Save