From a2c9c409a8d76214a189a054e8996179a905ca91 Mon Sep 17 00:00:00 2001 From: Mateusz Uzdowski Date: Wed, 18 Apr 2012 14:46:54 +1200 Subject: [PATCH] BUGFIX: fixed asserts and file cleanup DataObject::get_one returns false if not found, so better check for object. Also, the directory would not be cleaned, so on the subsequent run the files could end up having suffixes. missed this one --- tests/forms/uploadfield/UploadFieldTest.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/forms/uploadfield/UploadFieldTest.php b/tests/forms/uploadfield/UploadFieldTest.php index 7df16d2ad..7a3750891 100644 --- a/tests/forms/uploadfield/UploadFieldTest.php +++ b/tests/forms/uploadfield/UploadFieldTest.php @@ -28,7 +28,7 @@ $this->assertFalse($response->isError()); $this->assertFileExists(ASSETS_PATH . "/UploadFieldTest/$tmpFileName"); $uploadedFile = DataObject::get_one('File', sprintf('"Name" = \'%s\'', $tmpFileName)); - $this->assertNotNull($uploadedFile); + $this->assertTrue(is_object($uploadedFile), 'The file object is created'); } function testUploadHasOneRelation() { @@ -48,7 +48,7 @@ $this->assertFalse($response->isError()); $this->assertFileExists(ASSETS_PATH . "/UploadFieldTest/$tmpFileName"); $uploadedFile = DataObject::get_one('File', sprintf('"Name" = \'%s\'', $tmpFileName)); - $this->assertNotNull($uploadedFile); + $this->assertTrue(is_object($uploadedFile), 'The file object is created'); $record = DataObject::get_by_id($record->class, $record->ID, false); $this->assertTrue($record->HasOneFile()->exists()); @@ -69,7 +69,7 @@ $this->assertFalse($response->isError()); $this->assertFileExists(ASSETS_PATH . "/UploadFieldTest/$tmpFileName"); $uploadedFile = DataObject::get_one('File', sprintf('"Name" = \'%s\'', $tmpFileName)); - $this->assertNotNull($uploadedFile); + $this->assertTrue(is_object($uploadedFile), 'The file object is created'); $record = DataObject::get_by_id($record->class, $record->ID, false); $this->assertEquals(3, $record->HasManyFiles()->Count()); @@ -91,7 +91,7 @@ $this->assertFalse($response->isError()); $this->assertFileExists(ASSETS_PATH . "/UploadFieldTest/$tmpFileName"); $uploadedFile = DataObject::get_one('File', sprintf('"Name" = \'%s\'', $tmpFileName)); - $this->assertNotNull($uploadedFile); + $this->assertTrue(is_object($uploadedFile), 'The file object is created'); $record = DataObject::get_by_id($record->class, $record->ID, false); $this->assertEquals($relationCount+1, $record->ManyManyFiles()->Count()); @@ -605,7 +605,7 @@ } // Remove left over folders and any files that may exist - if(file_exists('../assets/UploadFieldTest')) Filesystem::removeFolder('../assets/FileTest'); + if(file_exists('../assets/UploadFieldTest')) Filesystem::removeFolder('../assets/UploadFieldTest'); } }