remove static:// stream wrapper

Signed-off-by: Robin Appelman <robin@icewind.nl>

4 files changed, 22 insertions, 76 deletions

diff --git a/tests/lib/DB/DBSchemaTest.php b/tests/lib/DB/DBSchemaTest.php
index ba17546a34a..8eb7fcf81b4 100644
--- a/tests/lib/DB/DBSchemaTest.php
+++ b/tests/lib/DB/DBSchemaTest.php
@@ -10,6 +10,7 @@ namespace Test\DB;
 
 use Doctrine\DBAL\Platforms\SqlitePlatform;
 use OC_DB;
+use OCP\ITempManager;
 use OCP\Security\ISecureRandom;
 use Test\TestCase;
 
@@ -19,14 +20,20 @@ use Test\TestCase;
  * @group DB
  */
 class DBSchemaTest extends TestCase {
-	protected $schema_file = 'static://test_db_scheme';
-	protected $schema_file2 = 'static://test_db_scheme2';
+	protected $schema_file;
+	protected $schema_file2;
 	protected $table1;
 	protected $table2;
+	/** @var ITempManager */
+	protected $tempManager;
 
 	protected function setUp() {
 		parent::setUp();
 
+		$this->tempManager = \OC::$server->getTempManager();
+		$this->schema_file = $this->tempManager->getTemporaryFile();
+		$this->schema_file2 = $this->tempManager->getTemporaryFile();
+
 		$dbfile = \OC::$SERVERROOT.'/tests/data/db_structure.xml';
 		$dbfile2 = \OC::$SERVERROOT.'/tests/data/db_structure2.xml';
 
@@ -73,7 +80,7 @@ class DBSchemaTest extends TestCase {
 	}
 
 	public function doTestSchemaDumping() {
-		$outfile = 'static://db_out.xml';
+		$outfile = $this->tempManager->getTemporaryFile();
 		OC_DB::getDbStructure($outfile);
 		$content = file_get_contents($outfile);
 		$this->assertContains($this->table1, $content);
diff --git a/tests/lib/DB/LegacyDBTest.php b/tests/lib/DB/LegacyDBTest.php
index f3de570c52d..3cf40228225 100644
--- a/tests/lib/DB/LegacyDBTest.php
+++ b/tests/lib/DB/LegacyDBTest.php
@@ -18,9 +18,14 @@ use OC_DB;
 class LegacyDBTest extends \Test\TestCase {
 	protected $backupGlobals = FALSE;
 
-	protected static $schema_file = 'static://test_db_scheme';
+	protected static $schema_file;
 	protected $test_prefix;
 
+	public static function setUpBeforeClass() {
+		self::$schema_file = \OC::$server->getTempManager()->getTemporaryFile();
+	}
+
+
 	/**
 	 * @var string
 	 */
diff --git a/tests/lib/DB/SchemaDiffTest.php b/tests/lib/DB/SchemaDiffTest.php
index b7bb3c2a9cb..88c9abeb431 100644
--- a/tests/lib/DB/SchemaDiffTest.php
+++ b/tests/lib/DB/SchemaDiffTest.php
@@ -47,9 +47,13 @@ class SchemaDiffTest extends TestCase {
 	/** @var string */
 	private $testPrefix;
 
+	private $schemaFile;
+
 	protected function setUp() {
 		parent::setUp();
 
+		$this->schemaFile = \OC::$server->getTempManager()->getTemporaryFile();
+
 		$this->config = \OC::$server->getConfig();
 		$this->connection = \OC::$server->getDatabaseConnection();
 		$this->manager = new MDB2SchemaManager($this->connection);
@@ -57,7 +61,7 @@ class SchemaDiffTest extends TestCase {
 	}
 
 	protected function tearDown() {
-		$this->manager->removeDBStructure('static://test_db_scheme');
+		$this->manager->removeDBStructure($this->schemaFile);
 		parent::tearDown();
 	}
 
@@ -68,7 +72,7 @@ class SchemaDiffTest extends TestCase {
 	public function testZeroChangeOnSchemaMigrations($xml) {
 
 		$xml = str_replace( '*dbprefix*', $this->testPrefix, $xml );
-		$schemaFile = 'static://test_db_scheme';
+		$schemaFile = $this->schemaFile;
 		file_put_contents($schemaFile, $xml);
 
 		// apply schema
diff --git a/tests/lib/Files/Stream/StaticStreamTest.php b/tests/lib/Files/Stream/StaticStreamTest.php
deleted file mode 100644
index 309291a3a5b..00000000000
--- a/tests/lib/Files/Stream/StaticStreamTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace Test\Files\Stream;
-
-class StaticStreamTest extends \Test\TestCase {
-
-	private $sourceFile;
-	private $sourceText;
-
-	protected function setUp() {
-		parent::setUp();
-		$this->sourceFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
-		$this->sourceText = file_get_contents($this->sourceFile);
-	}
-
-	protected function tearDown() {
-		\OC\Files\Stream\StaticStream::clear();
-		parent::tearDown();
-	}
-
-	public function testContent() {
-		file_put_contents('static://foo', $this->sourceText);
-		$this->assertEquals($this->sourceText, file_get_contents('static://foo'));
-	}
-
-	public function testMultipleFiles() {
-		file_put_contents('static://foo', $this->sourceText);
-		file_put_contents('static://bar', strrev($this->sourceText));
-		$this->assertEquals($this->sourceText, file_get_contents('static://foo'));
-		$this->assertEquals(strrev($this->sourceText), file_get_contents('static://bar'));
-	}
-
-	public function testOverwrite() {
-		file_put_contents('static://foo', $this->sourceText);
-		file_put_contents('static://foo', 'qwerty');
-		$this->assertEquals('qwerty', file_get_contents('static://foo'));
-	}
-
-	public function testIsFile() {
-		$this->assertFalse(is_file('static://foo'));
-		file_put_contents('static://foo', $this->sourceText);
-		$this->assertTrue(is_file('static://foo'));
-	}
-
-	public function testIsDir() {
-		$this->assertFalse(is_dir('static://foo'));
-		file_put_contents('static://foo', $this->sourceText);
-		$this->assertFalse(is_dir('static://foo'));
-	}
-
-	public function testFileType() {
-		file_put_contents('static://foo', $this->sourceText);
-		$this->assertEquals('file', filetype('static://foo'));
-	}
-
-	public function testUnlink() {
-		$this->assertFalse(file_exists('static://foo'));
-		file_put_contents('static://foo', $this->sourceText);
-		$this->assertTrue(file_exists('static://foo'));
-		unlink('static://foo');
-		clearstatcache();
-		$this->assertFalse(file_exists('static://foo'));
-	}
-}