move new tests into the correct test method

diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php
index 8f6a8771ba816cf15af7da41957bb84a9f91759a..771fad8c61babc51500a0c0711c5da2dcdcceba5 100644 (file)
--- a/tests/lib/files/storage/storage.php
+++ b/tests/lib/files/storage/storage.php
@@ -154,6 +154,16 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
                //empty the file
                $this->instance->file_put_contents('/lorem.txt', '');
                $this->assertEquals('', $this->instance->file_get_contents('/lorem.txt'), 'file not emptied');
+
+               // check if it's working inside directories as well
+               $this->instance->mkdir('/folder');
+               $this->instance->file_put_contents('/folder/lorem.txt', $sourceText);
+               $this->assertFalse($this->instance->is_dir('/folder/lorem.txt'));
+               $this->assertEquals($sourceText, $this->instance->file_get_contents('/folder/lorem.txt'), 'data returned from file_get_contents is not equal to the source data');
+               $this->instance->file_put_contents('/folder/lorem.txt', '');
+               $this->assertEquals('', $this->instance->file_get_contents('/folder/lorem.txt'), 'file not emptied');
+               $this->instance->rmdir('/folder');
+               $this->assertFalse($this->instance->file_exists('/folder/lorem.txt'));
        }
 
        /**
@@ -187,16 +197,6 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
                $this->assertTrue($this->instance->file_exists('/target2.txt'));
                $this->assertFalse($this->instance->file_exists('/source.txt'));
                $this->assertEquals(file_get_contents($textFile), $this->instance->file_get_contents('/target.txt'));
-
-               // check if it's working inside directories as well
-               $this->instance->mkdir('/folder');
-               $this->instance->file_put_contents('/folder/lorem.txt', $sourceText);
-               $this->assertFalse($this->instance->is_dir('/folder/lorem.txt'));
-               $this->assertEquals($sourceText, $this->instance->file_get_contents('/folder/lorem.txt'), 'data returned from file_get_contents is not equal to the source data');
-               $this->instance->file_put_contents('/folder/lorem.txt', '');
-               $this->assertEquals('', $this->instance->file_get_contents('/folder/lorem.txt'), 'file not emptied');
-               $this->instance->rmdir('/folder');
-               $this->assertFalse($this->instance->file_exists('/folder/lorem.txt'));
        }
 
        public function testLocal() {