Revert "adding unit tests"

This reverts commit 8d327c94a844804d0e7af057866e552bd5aafd17.

diff --git a/lib/private/connector/sabre/filesplugin.php b/lib/private/connector/sabre/filesplugin.php
index 1b4b0674a578010a20e9f07b37f3a44a1a72ff79..e03cac9c537772fa6033a6ce13b8ef982d8175b4 100644 (file)
--- a/lib/private/connector/sabre/filesplugin.php
+++ b/lib/private/connector/sabre/filesplugin.php
@@ -184,8 +184,11 @@ class FilesPlugin extends \Sabre\DAV\ServerPlugin {
        /**
         * @param \OC\Connector\Sabre\Node $node
         */
-       public function getETag($node) {
-               if (isset($_SERVER['HTTP_OC_CHUNKED']) && !isset($_SERVER['X-CHUNKING_COMPLETE'])) {
+       private function getETag($node) {
+               if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
+                       if (isset($_SERVER['X-CHUNKING_COMPLETE'])) {
+                               return $node->getETag();
+                       }
                        return null;
                }
                return $node->getETag();

diff --git a/tests/lib/connector/sabre/filesplugin.php b/tests/lib/connector/sabre/filesplugin.php
index e10d67a3255016de5fa25c27b1046b3b7bb64939..54d43d66dda4a6055c961c1ee3bbe3571f01f1a6 100644 (file)
--- a/tests/lib/connector/sabre/filesplugin.php
+++ b/tests/lib/connector/sabre/filesplugin.php
@@ -171,35 +171,4 @@ class FilesPlugin extends \Test\TestCase {
                $this->assertEquals(200, $result[self::GETETAG_PROPERTYNAME]);
        }
 
-       /**
-        * @dataProvider providesETagTestData
-        * @param $expectedETag
-        * @param $isChunked
-        * @param $isChunkComplete
-        */
-       public function testETag($expectedETag, $isChunked, $isChunkComplete) {
-               if (!is_null($isChunked)) {
-                       $_SERVER['HTTP_OC_CHUNKED'] = $isChunked;
-               }
-               if (!is_null($isChunkComplete)) {
-                       $_SERVER['X-CHUNKING_COMPLETE'] = $isChunkComplete;
-               }
-               $node = $this->createTestNode('\OC\Connector\Sabre\File');
-
-               $etag = $this->plugin->getETag($node);
-
-               $this->assertEquals($expectedETag, $etag);
-       }
-
-       public function providesETagTestData() {
-               return [
-                       // non-chunked tests
-                       ['"abc"', null, null],
-                       ['"abc"', null, false],
-
-                       // chunked tests
-                       [null, true, null],
-                       ['"abc"', true, true],
-               ];
-       }
 }