Simplify checks for jarPath

Author: Goooler

src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/BasePluginTest.kt

@@ -25,7 +25,6 @@ import kotlin.io.path.createFile
 import kotlin.io.path.createTempDirectory
 import kotlin.io.path.deleteRecursively
 import kotlin.io.path.exists
-import kotlin.io.path.isRegularFile
 import kotlin.io.path.readText
 import kotlin.io.path.toPath
 import kotlin.io.path.writeText
@@ -122,16 +121,12 @@ abstract class BasePluginTest {
     """.trimIndent() + System.lineSeparator()
   }
 
-  fun jarPath(path: String): JarPath {
-    val realPath = projectRoot.resolve(path).also {
-      check(it.exists()) { "Path not found: $it" }
-      check(it.isRegularFile()) { "Path is not a regular file: $it" }
-    }
-    return JarPath(realPath)
+  fun jarPath(relative: String, parent: Path = projectRoot): JarPath {
+    return JarPath(parent.resolve(relative))
   }
 
-  fun path(path: String): Path {
-    return projectRoot.resolve(path).also {
+  fun path(relative: String, parent: Path = projectRoot): Path {
+    return parent.resolve(relative).also {
       if (it.exists()) return@also
       it.parent.createDirectories()
       // We should create text file only if it doesn't exist.

src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/PublishingTest.kt

@@ -222,7 +222,7 @@ class PublishingTest : BasePluginTest() {
   }
 
   private fun repoJarPath(path: String): JarPath {
-    return JarPath(repoPath(path))
+    return JarPath(remoteRepoPath.resolve(path))
   }
 
   private fun publish(): BuildResult = run("publish")

src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/BaseCachingTest.kt

@@ -2,6 +2,7 @@ package com.github.jengelman.gradle.plugins.shadow.caching
 
 import assertk.assertThat
 import com.github.jengelman.gradle.plugins.shadow.BasePluginTest
+import java.nio.file.NoSuchFileException
 import java.nio.file.Path
 import kotlin.io.path.ExperimentalPathApi
 import kotlin.io.path.appendText
@@ -43,11 +44,10 @@ abstract class BaseCachingTest : BasePluginTest() {
   ) {
     try {
       outputShadowJar.deleteExisting()
-    } catch (ignored: IllegalStateException) {
-      // ignore if the file does not exist
+    } catch (ignored: NoSuchFileException) {
     }
     alternateDir.deleteRecursively()
-    projectRoot.copyToRecursively(alternateDir, followLinks = false, overwrite = false)
+    projectRoot.copyToRecursively(target = alternateDir, followLinks = false)
     // check that shadowJar pulls from cache in the original directory
     assertShadowJarHasResult(firstOutcome)
     // check that shadowJar pulls from cache in a different directory
@@ -62,8 +62,7 @@ abstract class BaseCachingTest : BasePluginTest() {
   fun assertShadowJarExecutes() {
     try {
       outputShadowJar.deleteExisting()
-    } catch (ignored: IllegalStateException) {
-      // ignore if the file does not exist
+    } catch (ignored: NoSuchFileException) {
     }
     // task was executed and not pulled from cache
     assertShadowJarHasResult(SUCCESS)