From 8c7dc6ebbeb71dba78dd5259c94e817ea02b8efd Mon Sep 17 00:00:00 2001
From: Nikolay Chashnikov <Nikolay.Chashnikov@jetbrains.com>
Date: Tue, 8 Feb 2022 13:43:35 +0300
Subject: [PATCH] [tests] refactoring: reuse methods from IoTestUtil

GitOrigin-RevId: ef7f137e19912789c3a6078f3f8200539553d7cb
---
 .../local/LocalTargetEnvironmentTest.kt       | 21 +++----------------
 .../com/intellij/history/core/PathsTest.java  |  7 +++----
 .../idea/maven/utils/MavenWslUtilTestCase.kt  |  6 +++---
 3 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/platform/execution-impl/testSources/com/intellij/execution/target/local/LocalTargetEnvironmentTest.kt b/platform/execution-impl/testSources/com/intellij/execution/target/local/LocalTargetEnvironmentTest.kt
index 9f9dc15b47bc..d0d12077ef13 100644
--- a/platform/execution-impl/testSources/com/intellij/execution/target/local/LocalTargetEnvironmentTest.kt
+++ b/platform/execution-impl/testSources/com/intellij/execution/target/local/LocalTargetEnvironmentTest.kt
@@ -3,10 +3,8 @@ package com.intellij.execution.target.local
 
 import com.intellij.execution.target.TargetedCommandLineBuilder
 import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.util.SystemInfo
+import com.intellij.openapi.util.io.IoTestUtil
 import org.junit.Assert
-import org.junit.Assume
-import org.junit.AssumptionViolatedException
 import org.junit.Test
 
 class LocalTargetEnvironmentTest {
@@ -14,7 +12,7 @@ class LocalTargetEnvironmentTest {
 
   @Test
   fun `create general command line on Windows`() {
-    assumeWindows()
+    IoTestUtil.assumeWindows()
 
     val exePath = "C:\\Path\\To\\Some Executable.exe"
 
@@ -51,7 +49,7 @@ class LocalTargetEnvironmentTest {
 
   @Test
   fun `create general command line on UNIX`() {
-    assumeUnix()
+    IoTestUtil.assumeUnix()
 
     val exePath = "/path/to/some executable"
 
@@ -86,17 +84,4 @@ class LocalTargetEnvironmentTest {
       generalCommandLine.getCommandLineList(null)
     )
   }
-
-  @Throws(AssumptionViolatedException::class)
-  fun assumeWindows() {
-    Assume.assumeTrue("Need Windows, can't run on " + SystemInfo.OS_NAME,
-                      SystemInfo.isWindows)
-  }
-
-  @Throws(AssumptionViolatedException::class)
-  fun assumeUnix() {
-    Assume.assumeTrue("Need Unix, can't run on " + SystemInfo.OS_NAME,
-                      SystemInfo.isUnix)
-  }
-
 }
\ No newline at end of file
diff --git a/platform/platform-tests/testSrc/com/intellij/history/core/PathsTest.java b/platform/platform-tests/testSrc/com/intellij/history/core/PathsTest.java
index 763b94893291..e11132f642ac 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/core/PathsTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/core/PathsTest.java
@@ -16,9 +16,8 @@
 
 package com.intellij.history.core;
 
-import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.util.io.IoTestUtil;
 import com.intellij.util.containers.ContainerUtil;
-import org.junit.Assume;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -102,7 +101,7 @@ public class PathsTest extends LocalHistoryTestCase {
 
   @Test
   public void testWindowsPathsSplitting() {
-    Assume.assumeTrue(SystemInfo.isWindows);
+    IoTestUtil.assumeWindows();
     testPathSplit("relative/folder/file.txt", "relative", "folder", "file.txt");
     testPathSplit("C:/Users/user/folder/file.txt", "C:", "Users", "user", "folder", "file.txt");
     testPathSplit("//wsl$/Distro/home/user/folder/file.txt", "//wsl$/Distro", "home", "user", "folder", "file.txt");
@@ -113,7 +112,7 @@ public class PathsTest extends LocalHistoryTestCase {
 
   @Test
   public void testUnixPathsSplitting() {
-    Assume.assumeTrue(SystemInfo.isUnix);
+    IoTestUtil.assumeUnix();
     testPathSplit("relative/folder/file.txt", "relative", "folder", "file.txt");
     testPathSplit("/home/user/folder/file.txt", "/", "home", "user", "folder", "file.txt");
     testPathSplit("/home/user/folder", "/", "home", "user", "folder");
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/utils/MavenWslUtilTestCase.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/utils/MavenWslUtilTestCase.kt
index 621d0c05eb4a..a500e77443d2 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/utils/MavenWslUtilTestCase.kt
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/utils/MavenWslUtilTestCase.kt
@@ -3,11 +3,11 @@ package org.jetbrains.idea.maven.utils
 
 import com.intellij.execution.wsl.WSLDistribution
 import com.intellij.execution.wsl.WslDistributionManager
-import com.intellij.openapi.util.SystemInfo
+import com.intellij.maven.testFramework.MavenTestCase
 import com.intellij.openapi.util.io.FileUtil
+import com.intellij.openapi.util.io.IoTestUtil
 import com.intellij.testFramework.RunAll
 import junit.framework.TestCase
-import com.intellij.maven.testFramework.MavenTestCase
 import org.jetbrains.idea.maven.utils.MavenWslUtil.getWindowsFile
 import org.jetbrains.idea.maven.utils.MavenWslUtil.getWslFile
 import org.jetbrains.idea.maven.utils.MavenWslUtil.resolveLocalRepository
@@ -27,7 +27,7 @@ class MavenWslUtilTestCase : MavenTestCase() {
   @Throws(Exception::class)
   public override fun setUp() {
     super.setUp()
-    Assume.assumeTrue("Windows only", SystemInfo.isWindows)
+    IoTestUtil.assumeWindows()
     Assume.assumeFalse("WSL should be installed", WslDistributionManager.getInstance().installedDistributions.isEmpty())
     myDistribution = WslDistributionManager.getInstance().installedDistributions[0]