diff --git a/java/java-tests/testData/vfs/relativePath/subDir/subSubDir/empty.txt b/java/java-tests/testData/vfs/relativePath/subDir/subSubDir/empty.txt deleted file mode 100644 index 013ed0d36bb7..000000000000 --- a/java/java-tests/testData/vfs/relativePath/subDir/subSubDir/empty.txt +++ /dev/null @@ -1 +0,0 @@ -Empty file \ No newline at end of file diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java index de46eece638b..190e96c19158 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.vfs; import com.intellij.openapi.application.ApplicationManager; @@ -90,17 +76,6 @@ public class VfsUtilTest extends BareTestFixtureTestCase { assertEquals(vDir, VfsUtilCore.findRelativeFile("vfs", vDir.getParent())); } - @Test - public void testRelativePath() { - File testDataDir = new File(PathManagerEx.getTestDataPath(), "vfs/relativePath/subDir/subSubDir"); - VirtualFile vDir = LocalFileSystem.getInstance().findFileByIoFile(testDataDir); - assertNotNull(vDir); - VirtualFile vSubDir = vDir.getParent(), vTestRoot = vSubDir.getParent(); - assertEquals("subDir", VfsUtilCore.getRelativePath(vSubDir, vTestRoot, '/')); - assertEquals("subDir/subSubDir", VfsUtilCore.getRelativePath(vDir, vTestRoot, '/')); - assertEquals("", VfsUtilCore.getRelativePath(vTestRoot, vTestRoot, '/')); - } - @Test public void testFindChildWithTrailingSpace() throws IOException { File tempDir = myTempDir.newFolder();