From 7db03388e5147f6e7cb036107f329138c6ed8a6a Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 4 Mar 2019 12:47:00 +0100 Subject: [PATCH] Cleanup (formatting) --- .../vfs/impl/local/CanonicalPathMapTest.java | 17 ++--------------- .../openapi/vfs/local/FileWatcherTest.kt | 3 +++ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/local/CanonicalPathMapTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/local/CanonicalPathMapTest.java index 65e420f10f80..4ed76e25fb0f 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/local/CanonicalPathMapTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/local/CanonicalPathMapTest.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-2019 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.impl.local; import com.intellij.openapi.util.Pair; @@ -141,6 +127,7 @@ public class CanonicalPathMapTest { @Test public void remappedSymLinkReportsOriginalWatchedPath() throws IOException { IoTestUtil.assumeSymLinkCreationIsSupported(); + // Tests the situation where the watch root is a symlink AND REMAPPED by the native file watcher. File realDir = myTempDir.newFolder("real"); File symLink = IoTestUtil.createSymLink(realDir.getPath(), myTempDir.getRoot() + "/link"); diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.kt b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.kt index de587b1406ad..49bfa2a0878d 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.kt @@ -226,6 +226,7 @@ class FileWatcherTest : BareTestFixtureTestCase() { // ensure that flat roots set via symbolic paths behave correctly and do not report dirty files returned from other recursive roots @Test fun testSymbolicLinkIntoFlatRoot() { IoTestUtil.assumeSymLinkCreationIsSupported() + val root = tempDir.newFolder("root") val cDir = tempDir.newFolder("root/A/B/C") val aLink = File(root, "aLink") @@ -262,6 +263,7 @@ class FileWatcherTest : BareTestFixtureTestCase() { @Test fun testSymbolicLinkWatchRoot() { IoTestUtil.assumeSymLinkCreationIsSupported() + val top = tempDir.newFolder("top") val file = tempDir.newFile("top/dir1/dir2/dir3/test.txt") val link = Files.createSymbolicLink(Paths.get(top.path, "link"), Paths.get("${top.path}/dir1/dir2")).toFile() @@ -276,6 +278,7 @@ class FileWatcherTest : BareTestFixtureTestCase() { @Test fun testSymbolicLinkAboveWatchRoot() { IoTestUtil.assumeSymLinkCreationIsSupported() + val top = tempDir.newFolder("top") val file = tempDir.newFile("top/dir1/dir2/dir3/test.txt") val link = Files.createSymbolicLink(Paths.get(top.path, "link"), Paths.get("${top.path}/dir1/dir2")).toFile()