From f0da420b1ff8820cee190583a9a5b2fb9391c0f0 Mon Sep 17 00:00:00 2001 From: Abduqodiri Qurbonzoda Date: Tue, 2 Aug 2022 00:48:59 +0300 Subject: [PATCH] Move Path.tryCreateSymbolicLinkTo to AbstractPathTest.kt --- libraries/stdlib/jdk7/test/AbstractPathTest.kt | 11 +++++++++++ libraries/stdlib/jdk7/test/FileVisitorBuilderTest.kt | 1 - libraries/stdlib/jdk7/test/PathTreeWalkTest.kt | 10 ---------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libraries/stdlib/jdk7/test/AbstractPathTest.kt b/libraries/stdlib/jdk7/test/AbstractPathTest.kt index fe9a96ccefa..4199d74e67a 100644 --- a/libraries/stdlib/jdk7/test/AbstractPathTest.kt +++ b/libraries/stdlib/jdk7/test/AbstractPathTest.kt @@ -8,6 +8,7 @@ package kotlin.jdk7.test import java.io.IOException import java.nio.file.* import java.nio.file.attribute.BasicFileAttributes +import kotlin.io.path.createSymbolicLinkPointingTo import kotlin.io.path.deleteIfExists import kotlin.io.path.exists import kotlin.test.* @@ -50,6 +51,16 @@ abstract class AbstractPathTest { } } + fun Path.tryCreateSymbolicLinkTo(original: Path): Path? { + return try { + this.createSymbolicLinkPointingTo(original) + } catch (e: Exception) { + // the underlying OS may not support symbolic links or may require a privilege + println("Creating a symbolic link failed with $e") + null + } + } + fun withRestrictedRead(vararg paths: Path, block: () -> Unit) { try { if (paths.all { it.toFile().setReadable(false) }) { diff --git a/libraries/stdlib/jdk7/test/FileVisitorBuilderTest.kt b/libraries/stdlib/jdk7/test/FileVisitorBuilderTest.kt index ccb4dd26b08..2218b21a049 100644 --- a/libraries/stdlib/jdk7/test/FileVisitorBuilderTest.kt +++ b/libraries/stdlib/jdk7/test/FileVisitorBuilderTest.kt @@ -15,7 +15,6 @@ import kotlin.jdk7.test.PathTreeWalkTest.Companion.createTestFiles import kotlin.jdk7.test.PathTreeWalkTest.Companion.referenceFilenames import kotlin.jdk7.test.PathTreeWalkTest.Companion.referenceFilesOnly import kotlin.jdk7.test.PathTreeWalkTest.Companion.testVisitedFiles -import kotlin.jdk7.test.PathTreeWalkTest.Companion.tryCreateSymbolicLinkTo import kotlin.test.* class FileVisitorBuilderTest : AbstractPathTest() { diff --git a/libraries/stdlib/jdk7/test/PathTreeWalkTest.kt b/libraries/stdlib/jdk7/test/PathTreeWalkTest.kt index 48dc47b1ae9..5bbee5ea8e6 100644 --- a/libraries/stdlib/jdk7/test/PathTreeWalkTest.kt +++ b/libraries/stdlib/jdk7/test/PathTreeWalkTest.kt @@ -28,16 +28,6 @@ class PathTreeWalkTest : AbstractPathTest() { return basedir } - fun Path.tryCreateSymbolicLinkTo(original: Path): Path? { - return try { - this.createSymbolicLinkPointingTo(original) - } catch (e: Exception) { - // the underlying OS may not support symbolic links or may require a privilege - println("Creating a symbolic link failed with $e") - null - } - } - fun testVisitedFiles(expected: List, walk: Sequence, basedir: Path, message: (() -> String)? = null) { val actual = walk.map { it.relativeToOrSelf(basedir).invariantSeparatorsPathString } assertEquals(expected.sorted(), actual.toList().sorted(), message?.invoke())