[tests] refactoring: reuse methods from IoTestUtil

GitOrigin-RevId: ef7f137e19912789c3a6078f3f8200539553d7cb
This commit is contained in:
Nikolay Chashnikov
2022-02-09 07:25:10 +00:00
committed by intellij-monorepo-bot
parent d3cdc84d7c
commit 8c7dc6ebbe
3 changed files with 9 additions and 25 deletions
@@ -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)
}
}
@@ -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");
@@ -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]