Skip to content

Commit

Permalink
fix(tests): Fix most obvious errors in ObjectStore tests
Browse files Browse the repository at this point in the history 
Some are still failing

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
  • Loading branch information
@come-nc @artonge
come-nc authored and artonge committed Oct 31, 2024
1 parent 1cc2353 commit 9059def
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 56 deletions.
2 changes: 2 additions & 0 deletions tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

namespace Test\Files\ObjectStore;

use OC\Files\ObjectStore\StorageObjectStore;
use OC\Files\Storage\Temporary;
use Test\Files\Storage\StoragesTest;

/**
Expand Down
2 changes: 2 additions & 0 deletions tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

namespace Test\Files\ObjectStore;

use OC\Files\ObjectStore\StorageObjectStore;
use OC\Files\Storage\Temporary;
use Test\Files\Storage\StoragesTest;

/**
Expand Down
112 changes: 56 additions & 56 deletions tests/lib/Files/Storage/StoragesTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,76 +33,76 @@ protected function tearDown(): void {
public function testMoveFileFromStorage() {
$source = 'source.txt';
$target = 'target.txt';
$storage2->file_put_contents($source, 'foo');
$this->storage2->file_put_contents($source, 'foo');

$storage1->moveFromStorage($storage2, $source, $target);
$this->storage1->moveFromStorage($this->storage2, $source, $target);

$this->assertTrue($storage1->file_exists($target), $target.' was not created');
$this->assertFalse($storage2->file_exists($source), $source.' still exists');
$this->assertEquals('foo', $storage1->file_get_contents($target));
$this->assertTrue($this->storage1->file_exists($target), $target.' was not created');
$this->assertFalse($this->storage2->file_exists($source), $source.' still exists');
$this->assertEquals('foo', $this->storage1->file_get_contents($target));
}

public function testMoveDirectoryFromStorage() {
$storage2->mkdir('source');
$storage2->file_put_contents('source/test1.txt', 'foo');
$storage2->file_put_contents('source/test2.txt', 'qwerty');
$storage2->mkdir('source/subfolder');
$storage2->file_put_contents('source/subfolder/test.txt', 'bar');

$storage1->moveFromStorage($storage2, 'source', 'target');

$this->assertTrue($storage1->file_exists('target'));
$this->assertTrue($storage1->file_exists('target/test1.txt'));
$this->assertTrue($storage1->file_exists('target/test2.txt'));
$this->assertTrue($storage1->file_exists('target/subfolder'));
$this->assertTrue($storage1->file_exists('target/subfolder/test.txt'));

$this->assertFalse($storage2->file_exists('source'));
$this->assertFalse($storage2->file_exists('source/test1.txt'));
$this->assertFalse($storage2->file_exists('source/test2.txt'));
$this->assertFalse($storage2->file_exists('source/subfolder'));
$this->assertFalse($storage2->file_exists('source/subfolder/test.txt'));

$this->assertEquals('foo', $storage1->file_get_contents('target/test1.txt'));
$this->assertEquals('qwerty', $storage1->file_get_contents('target/test2.txt'));
$this->assertEquals('bar', $storage1->file_get_contents('target/subfolder/test.txt'));
$this->storage2->mkdir('source');
$this->storage2->file_put_contents('source/test1.txt', 'foo');
$this->storage2->file_put_contents('source/test2.txt', 'qwerty');
$this->storage2->mkdir('source/subfolder');
$this->storage2->file_put_contents('source/subfolder/test.txt', 'bar');

$this->storage1->moveFromStorage($this->storage2, 'source', 'target');

$this->assertTrue($this->storage1->file_exists('target'));
$this->assertTrue($this->storage1->file_exists('target/test1.txt'));
$this->assertTrue($this->storage1->file_exists('target/test2.txt'));
$this->assertTrue($this->storage1->file_exists('target/subfolder'));
$this->assertTrue($this->storage1->file_exists('target/subfolder/test.txt'));

$this->assertFalse($this->storage2->file_exists('source'));
$this->assertFalse($this->storage2->file_exists('source/test1.txt'));
$this->assertFalse($this->storage2->file_exists('source/test2.txt'));
$this->assertFalse($this->storage2->file_exists('source/subfolder'));
$this->assertFalse($this->storage2->file_exists('source/subfolder/test.txt'));

$this->assertEquals('foo', $this->storage1->file_get_contents('target/test1.txt'));
$this->assertEquals('qwerty', $this->storage1->file_get_contents('target/test2.txt'));
$this->assertEquals('bar', $this->storage1->file_get_contents('target/subfolder/test.txt'));
}

public function testCopyFileFromStorage() {
$source = 'source.txt';
$target = 'target.txt';
$storage2->file_put_contents($source, 'foo');
$this->storage2->file_put_contents($source, 'foo');

$storage1->copyFromStorage($storage2, $source, $target);
$this->storage1->copyFromStorage($this->storage2, $source, $target);

$this->assertTrue($storage1->file_exists($target), $target.' was not created');
$this->assertTrue($storage2->file_exists($source), $source.' was deleted');
$this->assertEquals('foo', $storage1->file_get_contents($target));
$this->assertTrue($this->storage1->file_exists($target), $target.' was not created');
$this->assertTrue($this->storage2->file_exists($source), $source.' was deleted');
$this->assertEquals('foo', $this->storage1->file_get_contents($target));
}

public function testCopyDirectoryFromStorage() {
$storage2->mkdir('source');
$storage2->file_put_contents('source/test1.txt', 'foo');
$storage2->file_put_contents('source/test2.txt', 'qwerty');
$storage2->mkdir('source/subfolder');
$storage2->file_put_contents('source/subfolder/test.txt', 'bar');

$storage1->copyFromStorage($storage2, 'source', 'target');

$this->assertTrue($storage1->file_exists('target'));
$this->assertTrue($storage1->file_exists('target/test1.txt'));
$this->assertTrue($storage1->file_exists('target/test2.txt'));
$this->assertTrue($storage1->file_exists('target/subfolder'));
$this->assertTrue($storage1->file_exists('target/subfolder/test.txt'));

$this->assertTrue($storage2->file_exists('source'));
$this->assertTrue($storage2->file_exists('source/test1.txt'));
$this->assertTrue($storage2->file_exists('source/test2.txt'));
$this->assertTrue($storage2->file_exists('source/subfolder'));
$this->assertTrue($storage2->file_exists('source/subfolder/test.txt'));

$this->assertEquals('foo', $storage1->file_get_contents('target/test1.txt'));
$this->assertEquals('qwerty', $storage1->file_get_contents('target/test2.txt'));
$this->assertEquals('bar', $storage1->file_get_contents('target/subfolder/test.txt'));
$this->storage2->mkdir('source');
$this->storage2->file_put_contents('source/test1.txt', 'foo');
$this->storage2->file_put_contents('source/test2.txt', 'qwerty');
$this->storage2->mkdir('source/subfolder');
$this->storage2->file_put_contents('source/subfolder/test.txt', 'bar');

$this->storage1->copyFromStorage($this->storage2, 'source', 'target');

$this->assertTrue($this->storage1->file_exists('target'));
$this->assertTrue($this->storage1->file_exists('target/test1.txt'));
$this->assertTrue($this->storage1->file_exists('target/test2.txt'));
$this->assertTrue($this->storage1->file_exists('target/subfolder'));
$this->assertTrue($this->storage1->file_exists('target/subfolder/test.txt'));

$this->assertTrue($this->storage2->file_exists('source'));
$this->assertTrue($this->storage2->file_exists('source/test1.txt'));
$this->assertTrue($this->storage2->file_exists('source/test2.txt'));
$this->assertTrue($this->storage2->file_exists('source/subfolder'));
$this->assertTrue($this->storage2->file_exists('source/subfolder/test.txt'));

$this->assertEquals('foo', $this->storage1->file_get_contents('target/test1.txt'));
$this->assertEquals('qwerty', $this->storage1->file_get_contents('target/test2.txt'));
$this->assertEquals('bar', $this->storage1->file_get_contents('target/subfolder/test.txt'));
}
}

0 comments on commit 9059def

Please sign in to comment.