From 8b88f4aaf45f649e708ba33c932870eea2730d6b Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 15 Oct 2010 03:16:16 +0000
Subject: [PATCH] MINOR More identifiable file naming in FileTest (from
 r107270)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112559 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/filesystem/FileTest.php | 34 +++++++++++++++++-----------------
 tests/filesystem/FileTest.yml |  8 ++++----
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/tests/filesystem/FileTest.php b/tests/filesystem/FileTest.php
index fc32bd72d..1bbe97a98 100644
--- a/tests/filesystem/FileTest.php
+++ b/tests/filesystem/FileTest.php
@@ -37,49 +37,49 @@ class FileTest extends SapphireTest {
 	
 	function testLinkAndRelativeLink() {
 		$file = $this->objFromFixture('File', 'asdf');
-		$this->assertEquals(ASSETS_DIR . '/asdfjkl.txt', $file->RelativeLink());
-		$this->assertEquals(Director::baseURL() . ASSETS_DIR . '/asdfjkl.txt', $file->Link());
+		$this->assertEquals(ASSETS_DIR . '/FileTest.txt', $file->RelativeLink());
+		$this->assertEquals(Director::baseURL() . ASSETS_DIR . '/FileTest.txt', $file->Link());
 	}
 	
 	function testNameAndTitleGeneration() {
 		/* If objects are loaded into the system with just a Filename, then Name is generated but Title isn't */
 		$file = $this->objFromFixture('File', 'asdf');
-		$this->assertEquals('asdfjkl.txt', $file->Name);
+		$this->assertEquals('FileTest.txt', $file->Name);
 		$this->assertNull($file->Title);
 		
 		/* However, if Name is set instead of Filename, then Title is set */
 		$file = $this->objFromFixture('File', 'setfromname');
-		$this->assertEquals(ASSETS_DIR . '/asdfjkl.png', $file->Filename);
-		$this->assertEquals('asdfjkl', $file->Title);
+		$this->assertEquals(ASSETS_DIR . '/FileTest.png', $file->Filename);
+		$this->assertEquals('FileTest', $file->Title);
 	}
 	
 	function testChangingNameAndFilenameAndParentID() {
 		$file = $this->objFromFixture('File', 'asdf');
-
+	
 		/* If you alter the Name attribute of a file, then the filesystem is also affected */
-		$file->Name = 'asdfjkl2.txt';
+		$file->Name = 'FileTest2.txt';
 		clearstatcache();
-		$this->assertFileNotExists(ASSETS_PATH . "/asdfjkl.txt");
-		$this->assertFileExists(ASSETS_PATH . "/asdfjkl2.txt");
+		$this->assertFileNotExists(ASSETS_PATH . "/FileTest.txt");
+		$this->assertFileExists(ASSETS_PATH . "/FileTest2.txt");
 		/* The Filename field is also updated */
-		$this->assertEquals(ASSETS_DIR . '/asdfjkl2.txt', $file->Filename);
+		$this->assertEquals(ASSETS_DIR . '/FileTest2.txt', $file->Filename);
 
 		/* However, if you alter the Filename attribute, the the filesystem isn't affected.  Altering Filename directly isn't
 		recommended */
-		$file->Filename = ASSETS_DIR . '/asdfjkl3.txt';
+		$file->Filename = ASSETS_DIR . '/FileTest3.txt';
 		clearstatcache();
-		$this->assertFileExists(ASSETS_PATH . "/asdfjkl2.txt");
-		$this->assertFileNotExists(ASSETS_PATH . "/asdfjkl3.txt");
+		$this->assertFileExists(ASSETS_PATH . "/FileTest2.txt");
+		$this->assertFileNotExists(ASSETS_PATH . "/FileTest3.txt");
 		
-		$file->Filename = ASSETS_DIR . '/asdfjkl2.txt';
+		$file->Filename = ASSETS_DIR . '/FileTest2.txt';
 		$file->write();
 		
 		/* Instead, altering Name and ParentID is the recommended way of changing the name and location of a file */
 		$file->ParentID = $this->idFromFixture('Folder', 'subfolder');
 		clearstatcache();
-		$this->assertFileExists(ASSETS_PATH . "/subfolder/asdfjkl2.txt");
-		$this->assertFileNotExists(ASSETS_PATH . "/asdfjkl2.txt");
-		$this->assertEquals(ASSETS_DIR . '/subfolder/asdfjkl2.txt', $file->Filename);
+		$this->assertFileExists(ASSETS_PATH . "/subfolder/FileTest2.txt");
+		$this->assertFileNotExists(ASSETS_PATH . "/FileTest2.txt");
+		$this->assertEquals(ASSETS_DIR . '/subfolder/FileTest2.txt', $file->Filename);
 		$file->write();
 		
 	}
diff --git a/tests/filesystem/FileTest.yml b/tests/filesystem/FileTest.yml
index 7582fbd46..c78a22dcd 100644
--- a/tests/filesystem/FileTest.yml
+++ b/tests/filesystem/FileTest.yml
@@ -1,12 +1,12 @@
 File:
    asdf:
-      Filename: assets/asdfjkl.txt
+      Filename: assets/FileTest.txt
    gif:
-      Filename: assets/asdfjkl.gif
+      Filename: assets/FileTest.gif
    pdf:
-      Filename: assets/asdfjkl.pdf
+      Filename: assets/FileTest.pdf
    setfromname:
-      Name: asdfjkl.png
+      Name: FileTest.png
       ParentID: 0
 
 Folder: