From bdd4ddb9f975f6f5088bca597fd800ad1c728fd9 Mon Sep 17 00:00:00 2001 From: Alex Pott <alex.a.pott@googlemail.com> Date: Tue, 2 Apr 2019 09:56:20 +0100 Subject: [PATCH] Issue #3042869 by claudiu.cristea, Lendude: Convert UpdateDeleteFileIfStaleTest into a Kernel test --- .../UpdateDeleteFileIfStaleTest.php | 47 ------------------- .../Kernel/UpdateDeleteFileIfStaleTest.php | 45 ++++++++++++++++++ 2 files changed, 45 insertions(+), 47 deletions(-) delete mode 100644 core/modules/update/tests/src/Functional/UpdateDeleteFileIfStaleTest.php create mode 100644 core/modules/update/tests/src/Kernel/UpdateDeleteFileIfStaleTest.php diff --git a/core/modules/update/tests/src/Functional/UpdateDeleteFileIfStaleTest.php b/core/modules/update/tests/src/Functional/UpdateDeleteFileIfStaleTest.php deleted file mode 100644 index f7d875faacbf..000000000000 --- a/core/modules/update/tests/src/Functional/UpdateDeleteFileIfStaleTest.php +++ /dev/null @@ -1,47 +0,0 @@ -<?php - -namespace Drupal\Tests\update\Functional; - -/** - * Tests the update_delete_file_if_stale() function. - * - * @group update - */ -class UpdateDeleteFileIfStaleTest extends UpdateTestBase { - - /** - * Modules to enable. - * - * @var array - */ - public static $modules = ['update']; - - /** - * {@inheritdoc} - */ - protected function setUp() { - parent::setUp(); - } - - /** - * Tests the deletion of stale files. - */ - public function testUpdateDeleteFileIfStale() { - $file_name = \Drupal::service('file_system')->saveData($this->randomMachineName(), 'public://'); - $this->assertNotNull($file_name); - - // During testing the file change and the stale checking occurs in the same - // request, so the beginning of request will be before the file changes and - // REQUEST_TIME - $filectime is negative. Set the maximum age to a number - // even smaller than that. - $this->config('system.file') - ->set('temporary_maximum_age', -100000) - ->save(); - - $file_path = \Drupal::service('file_system')->realpath($file_name); - update_delete_file_if_stale($file_path); - - $this->assertFalse(is_file($file_path)); - } - -} diff --git a/core/modules/update/tests/src/Kernel/UpdateDeleteFileIfStaleTest.php b/core/modules/update/tests/src/Kernel/UpdateDeleteFileIfStaleTest.php new file mode 100644 index 000000000000..ac9352a01aaa --- /dev/null +++ b/core/modules/update/tests/src/Kernel/UpdateDeleteFileIfStaleTest.php @@ -0,0 +1,45 @@ +<?php + +namespace Drupal\Tests\update\Kernel; + +use Drupal\KernelTests\KernelTestBase; + +/** + * Tests the update_delete_file_if_stale() function. + * + * @group update + */ +class UpdateDeleteFileIfStaleTest extends KernelTestBase { + + /** + * {@inheritdoc} + */ + protected static $modules = [ + 'system', + 'update', + ]; + + /** + * Tests the deletion of stale files. + */ + public function testUpdateDeleteFileIfStale() { + $file_system = $this->container->get('file_system'); + + $file_name = $file_system->saveData($this->randomMachineName(), 'public://'); + $this->assertNotNull($file_name); + + // During testing the file change and the stale checking occurs in the same + // request, so the beginning of request will be before the file changes and + // REQUEST_TIME - $filectime is negative or zero. Set the maximum age to a + // number even smaller than that. + $this->config('system.file') + ->set('temporary_maximum_age', -100000) + ->save(); + + $file_path = $file_system->realpath($file_name); + update_delete_file_if_stale($file_path); + + $this->assertFileNotExists($file_path); + } + +} -- GitLab