From 3b12b8a7b04f3cf80257e2a2c0e950c0b5704602 Mon Sep 17 00:00:00 2001 From: LukaszKontowski Date: Tue, 25 Oct 2022 22:20:05 +0200 Subject: [PATCH 1/3] Fix DownloadedIntelliJ.cleanup() logic for macOs --- .../virtuslab/ideprobe/ide/intellij/InstalledIntelliJ.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/driver/sources/src/main/scala/org/virtuslab/ideprobe/ide/intellij/InstalledIntelliJ.scala b/core/driver/sources/src/main/scala/org/virtuslab/ideprobe/ide/intellij/InstalledIntelliJ.scala index 0b1687fd..7d65afb7 100644 --- a/core/driver/sources/src/main/scala/org/virtuslab/ideprobe/ide/intellij/InstalledIntelliJ.scala +++ b/core/driver/sources/src/main/scala/org/virtuslab/ideprobe/ide/intellij/InstalledIntelliJ.scala @@ -227,7 +227,10 @@ final class DownloadedIntelliJ( probePaths.logExport.foreach { path => paths.logs.copyDir(path.resolve(getPathWithVersionNumber(root)).resolve("logs")) } - root.delete() + if (OS.Current == OS.Mac && root.name == "Contents") + root.getParent.delete() + else + root.delete() } /* From be1978e79eafadf23d2c9d1c23a7f7d4bf298e78 Mon Sep 17 00:00:00 2001 From: LukaszKontowski Date: Tue, 25 Oct 2022 22:20:56 +0200 Subject: [PATCH 2/3] Fix SingleRunFixtureTest.removesDirectoriesEvenAfterFailureToRunIntelliJ() logic for macOs --- .../ideprobe/dependencies/SingleRunFixtureTest.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/driver/sources/src/test/scala/org/virtuslab/ideprobe/dependencies/SingleRunFixtureTest.scala b/core/driver/sources/src/test/scala/org/virtuslab/ideprobe/dependencies/SingleRunFixtureTest.scala index d419a709..6d7c29ee 100644 --- a/core/driver/sources/src/test/scala/org/virtuslab/ideprobe/dependencies/SingleRunFixtureTest.scala +++ b/core/driver/sources/src/test/scala/org/virtuslab/ideprobe/dependencies/SingleRunFixtureTest.scala @@ -1,5 +1,7 @@ package org.virtuslab.ideprobe.dependencies +import org.virtuslab.ideprobe.OS + import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths @@ -19,7 +21,6 @@ import org.virtuslab.ideprobe.Config import org.virtuslab.ideprobe.Extensions._ import org.virtuslab.ideprobe.IdeProbeFixture import org.virtuslab.ideprobe.IntelliJFixture -import org.virtuslab.ideprobe.OS import org.virtuslab.ideprobe.Shell import org.virtuslab.ideprobe.SingleRunIntelliJ @@ -56,8 +57,9 @@ final class SingleRunFixtureTest extends IdeProbeFixture with WorkspaceFixture w @Test def removesDirectoriesEvenAfterFailureToRunIntelliJ(): Unit = { + val intellijLauncher = if (OS.Current == OS.Mac) "idea" else "idea.sh" val intelliJFixture = IntelliJFixture().withAfterIntelliJInstall((_, intellij) => - Files.delete(intellij.paths.root.resolve("bin").resolve("idea.sh")) // To prevent the IDE from launching. + Files.delete(intellij.paths.root.resolve("bin").resolve(intellijLauncher)) // To prevent the IDE from launching. ) val instancesDir = intelliJFixture.intelliJProvider.paths.instances From 8671447f1b2c4ef1bd9eecfe51c9996ab2a60db6 Mon Sep 17 00:00:00 2001 From: LukaszKontowski Date: Tue, 25 Oct 2022 22:31:06 +0200 Subject: [PATCH 3/3] fix formatting and code style --- .../virtuslab/ideprobe/dependencies/SingleRunFixtureTest.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/driver/sources/src/test/scala/org/virtuslab/ideprobe/dependencies/SingleRunFixtureTest.scala b/core/driver/sources/src/test/scala/org/virtuslab/ideprobe/dependencies/SingleRunFixtureTest.scala index 6d7c29ee..bb85a3cc 100644 --- a/core/driver/sources/src/test/scala/org/virtuslab/ideprobe/dependencies/SingleRunFixtureTest.scala +++ b/core/driver/sources/src/test/scala/org/virtuslab/ideprobe/dependencies/SingleRunFixtureTest.scala @@ -1,7 +1,5 @@ package org.virtuslab.ideprobe.dependencies -import org.virtuslab.ideprobe.OS - import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths @@ -21,6 +19,7 @@ import org.virtuslab.ideprobe.Config import org.virtuslab.ideprobe.Extensions._ import org.virtuslab.ideprobe.IdeProbeFixture import org.virtuslab.ideprobe.IntelliJFixture +import org.virtuslab.ideprobe.OS import org.virtuslab.ideprobe.Shell import org.virtuslab.ideprobe.SingleRunIntelliJ