From 81fb79a2b3366963ff47472b311df5ebaf2203c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mor=C3=A1vek?= Date: Tue, 3 Jan 2023 21:52:54 +0100 Subject: [PATCH] tests: eliminate usage of uniqid() --- tests/FileUploadControl/FileUploadControlValidationTest.phpt | 3 ++- .../Storage/FileSystemStorageManagerTest.phpt | 5 +++-- tests/FileUploadControl/Storage/FileSystemStorageTest.phpt | 3 ++- .../Storage/Metadata/FileSystemMetadataJournalTest.phpt | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/FileUploadControl/FileUploadControlValidationTest.phpt b/tests/FileUploadControl/FileUploadControlValidationTest.phpt index 72d3b1f..60a8ea7 100644 --- a/tests/FileUploadControl/FileUploadControlValidationTest.phpt +++ b/tests/FileUploadControl/FileUploadControlValidationTest.phpt @@ -19,6 +19,7 @@ use Nette\Http\UrlScript; use Nette\Utils\FileSystem; use Nette\Utils\Helpers; use Nette\Utils\Json; +use Nette\Utils\Random; use Tester\Assert; require_once __DIR__ . '/../bootstrap.php'; @@ -136,7 +137,7 @@ class FileUploadControlValidationTest extends TestCase $control = $this->createFileUploadControl(); $control->addRule(Form::IMAGE, 'only PNG is allowed'); - $file = Environment::getTempDir() . '/' . uniqid(); + $file = Environment::getTempDir() . '/' . Random::generate(); FileSystem::write($file, $this->readChunk(__DIR__ . '/Fixtures/image.png', 64)); $files = ['fileUpload' => ['upload' => [ diff --git a/tests/FileUploadControl/Storage/FileSystemStorageManagerTest.phpt b/tests/FileUploadControl/Storage/FileSystemStorageManagerTest.phpt index b89efcf..a082417 100644 --- a/tests/FileUploadControl/Storage/FileSystemStorageManagerTest.phpt +++ b/tests/FileUploadControl/Storage/FileSystemStorageManagerTest.phpt @@ -13,6 +13,7 @@ use Nepada\FileUploadControl\Utils\NetteFinder; use Nepada\FileUploadControl\Utils\NetteRandomProvider; use NepadaTests\Environment; use NepadaTests\TestCase; +use Nette\Utils\Random; use Tester\Assert; require_once __DIR__ . '/../../bootstrap.php'; @@ -37,7 +38,7 @@ class FileSystemStorageManagerTest extends TestCase public function testGarbageCollection(): void { - $directory = Environment::getTempDir() . '/' . uniqid(); + $directory = Environment::getTempDir() . '/' . Random::generate(); $ttl = 2; $oldNamespace = $this->createStorageManager($directory, $ttl)->createNewNamespace(); @@ -66,7 +67,7 @@ class FileSystemStorageManagerTest extends TestCase private function createStorageManager(?string $directory = null, int $ttl = FileSystemStorageManager::DEFAULT_TTL): FileSystemStorageManager { - $directory ??= Environment::getTempDir() . '/' . uniqid(); + $directory ??= Environment::getTempDir() . '/' . Random::generate(); $fileSystem = new NetteFileSystem(); $finder = new NetteFinder(); $dateTimeProvider = new DefaultDateTimeProvider(); diff --git a/tests/FileUploadControl/Storage/FileSystemStorageTest.phpt b/tests/FileUploadControl/Storage/FileSystemStorageTest.phpt index e366f8d..df1c501 100644 --- a/tests/FileUploadControl/Storage/FileSystemStorageTest.phpt +++ b/tests/FileUploadControl/Storage/FileSystemStorageTest.phpt @@ -15,6 +15,7 @@ use NepadaTests\FileUploadControl\FileUploadFactory; use NepadaTests\FileUploadControl\Storage\Metadata\InMemoryMetadataJournal; use NepadaTests\TestCase; use Nette; +use Nette\Utils\Random; use Tester\Assert; require_once __DIR__ . '/../../bootstrap.php'; @@ -186,7 +187,7 @@ class FileSystemStorageTest extends TestCase */ private function createStorage(array $journalData = []): FileSystemStorage { - $directory = Environment::getTempDir() . '/' . uniqid(); + $directory = Environment::getTempDir() . '/' . Random::generate(); Nette\Utils\FileSystem::createDir($directory); $journal = new InMemoryMetadataJournal($journalData); diff --git a/tests/FileUploadControl/Storage/Metadata/FileSystemMetadataJournalTest.phpt b/tests/FileUploadControl/Storage/Metadata/FileSystemMetadataJournalTest.phpt index 22cd946..dea3cd7 100644 --- a/tests/FileUploadControl/Storage/Metadata/FileSystemMetadataJournalTest.phpt +++ b/tests/FileUploadControl/Storage/Metadata/FileSystemMetadataJournalTest.phpt @@ -13,6 +13,7 @@ use Nepada\FileUploadControl\Utils\NetteFinder; use NepadaTests\Environment; use NepadaTests\TestCase; use Nette; +use Nette\Utils\Random; use Tester\Assert; require_once __DIR__ . '/../../../bootstrap.php'; @@ -86,7 +87,7 @@ class FileSystemMetadataJournalTest extends TestCase private function createJournal(): FileSystemMetadataJournal { - $directory = Environment::getTempDir() . '/' . uniqid(); + $directory = Environment::getTempDir() . '/' . Random::generate(); Nette\Utils\FileSystem::createDir($directory); return new FileSystemMetadataJournal(new NetteFileSystem(), new NetteFinder(), $directory);