From bc958b19d917b243f0300295bca54bed3a181da8 Mon Sep 17 00:00:00 2001 From: Alexander Koshevoy Date: Wed, 20 Apr 2016 15:12:30 +0300 Subject: [PATCH] Migrate to JUnit4 --- .../util/PathMappingSettingsTest.java | 51 ++++++++----------- 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/platform/util/testSrc/com/intellij/util/PathMappingSettingsTest.java b/platform/util/testSrc/com/intellij/util/PathMappingSettingsTest.java index 2f35d6775c0f..1e86fd3ac56a 100644 --- a/platform/util/testSrc/com/intellij/util/PathMappingSettingsTest.java +++ b/platform/util/testSrc/com/intellij/util/PathMappingSettingsTest.java @@ -1,53 +1,42 @@ package com.intellij.util; import com.intellij.openapi.util.SystemInfo; -import junit.framework.Assert; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author traff */ -public class PathMappingSettingsTest extends TestCase { +public class PathMappingSettingsTest { public static final String LOCAL_PATH_TO_FILE = "C:\\PythonSources\\src\\runner\\run.py"; public static final String REMOTE_PATH_TO_FILE = "/home/testPrj/runner/run.py"; - public void testTrailingSlashes() { - PathMappingSettings mappingSettings = create(); + private PathMappingSettings myMappingSettings; - mappingSettings.addMapping("C:\\PythonSources\\src\\", "/home/testPrj"); - - Assert.assertEquals("C:/PythonSources/src/runner/run.py", mappingSettings.convertToLocal(REMOTE_PATH_TO_FILE)); - Assert.assertEquals("/home/testPrj/runner/run.py", mappingSettings.convertToRemote(LOCAL_PATH_TO_FILE)); + @Before + public void setUp() throws Exception { + myMappingSettings = new PathMappingSettings(); } - public void testCaseNormalizingOnWin() { - PathMappingSettings mappingSettings = create(); + @Test + public void testTrailingSlashes() { + myMappingSettings.addMapping("C:\\PythonSources\\src\\", "/home/testPrj"); - mappingSettings.addMapping("c:/pythonsources/src", "/home/testPrj/"); + Assert.assertEquals("C:/PythonSources/src/runner/run.py", myMappingSettings.convertToLocal(REMOTE_PATH_TO_FILE)); + Assert.assertEquals("/home/testPrj/runner/run.py", myMappingSettings.convertToRemote(LOCAL_PATH_TO_FILE)); + } + + @Test + public void testCaseNormalizingOnWin() { + myMappingSettings.addMapping("c:/pythonsources/src", "/home/testPrj/"); if (SystemInfo.isWindows) { - Assert.assertEquals(REMOTE_PATH_TO_FILE, mappingSettings.convertToRemote(LOCAL_PATH_TO_FILE)); + Assert.assertEquals(REMOTE_PATH_TO_FILE, myMappingSettings.convertToRemote(LOCAL_PATH_TO_FILE)); } else { - Assert.assertEquals(LOCAL_PATH_TO_FILE, mappingSettings.convertToRemote(LOCAL_PATH_TO_FILE)); //don't convert + Assert.assertEquals(LOCAL_PATH_TO_FILE, myMappingSettings.convertToRemote(LOCAL_PATH_TO_FILE)); //don't convert } } - - public void testOverlappingPaths() { - PathMappingSettings mappingSettings = create(); - mappingSettings.addMapping("V:/site-packages", "/usr/lib/python2.6/site-packages"); - mappingSettings.addMapping("V:/site-packages64", "/usr/lib64/python2.6/site-packages"); - mappingSettings.addMapping("V:/bfms/django_root", "/opt/bfms"); - mappingSettings.addMapping("V:/bfms", "/opt/bfms_trunk"); - - Assert.assertEquals("/usr/lib64/python2.6/site-packages/django", mappingSettings.convertToRemote("V:\\site-packages64\\django")); - Assert.assertEquals("V:/site-packages64/django", mappingSettings.convertToLocal("/usr/lib64/python2.6/site-packages/django")); - Assert.assertEquals("/opt/bfms/myapp", mappingSettings.convertToRemote("V:/bfms/django_root/myapp")); - Assert.assertEquals("V:/bfms/django_root/myapp", mappingSettings.convertToLocal("/opt/bfms/myapp")); - } - - private static PathMappingSettings create() { - return new PathMappingSettings(); - } }