From fe07fb49329180beb6cf6bd8e96b944ee0c8b474 Mon Sep 17 00:00:00 2001 From: Wojciech Lopata Date: Wed, 30 Jan 2013 16:03:37 +0100 Subject: [PATCH] Create 'refreshPath' utility function in LocalFileSystemUtils class. --- .../refactoring/rename/RenameInJavaTest.java | 8 ++--- .../rename/RenameInKotlinTest.java | 15 +++----- .../jet/testing/LocalFileSystemUtils.java | 34 +++++++++++++++++++ 3 files changed, 40 insertions(+), 17 deletions(-) create mode 100644 idea/tests/org/jetbrains/jet/testing/LocalFileSystemUtils.java diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameInJavaTest.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameInJavaTest.java index 1eda200222f..94a8f798df7 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameInJavaTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameInJavaTest.java @@ -26,6 +26,7 @@ import com.intellij.refactoring.MultiFileTestCase; import com.intellij.refactoring.rename.RenameProcessor; import org.jetbrains.annotations.NonNls; import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.jet.testing.LocalFileSystemUtils; public class RenameInJavaTest extends MultiFileTestCase { @@ -33,12 +34,7 @@ public class RenameInJavaTest extends MultiFileTestCase { protected void setUp() throws Exception { super.setUp(); - String path = getTestDataPath() + getTestRoot(); - VirtualFile virtualFile = LocalFileSystem.getInstance().refreshAndFindFileByPath(path); - if (virtualFile != null) { - virtualFile.getChildren(); - virtualFile.refresh(false, true); - } + LocalFileSystemUtils.refreshPath(getTestDataPath() + getTestRoot()); } public void testRenameJavaClass() throws Exception { diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameInKotlinTest.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameInKotlinTest.java index 32213183a76..65d44352e9b 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameInKotlinTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameInKotlinTest.java @@ -39,6 +39,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.TypeProjection; import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade; +import org.jetbrains.jet.testing.LocalFileSystemUtils; import java.io.File; import java.util.Collections; @@ -47,17 +48,9 @@ public class RenameInKotlinTest extends MultiFileTestCase { @Override protected void setUp() throws Exception { super.setUp(); - refreshPath(getTestDataPath() + getTestRoot()); - refreshPath(getTestDataPath() + getTestRoot() + getTestName(true) + File.separator + "before"); - refreshPath(getTestDataPath() + getTestRoot() + getTestName(true) + File.separator + "after"); - } - - public static void refreshPath(String path) { - VirtualFile virtualFile = LocalFileSystem.getInstance().refreshAndFindFileByPath(path); - if (virtualFile != null) { - virtualFile.getChildren(); - virtualFile.refresh(false, true); - } + LocalFileSystemUtils.refreshPath(getTestDataPath() + getTestRoot()); + LocalFileSystemUtils.refreshPath(getTestDataPath() + getTestRoot() + getTestName(true) + File.separator + "before"); + LocalFileSystemUtils.refreshPath(getTestDataPath() + getTestRoot() + getTestName(true) + File.separator + "after"); } public void testRenameKotlinClass() throws Exception { diff --git a/idea/tests/org/jetbrains/jet/testing/LocalFileSystemUtils.java b/idea/tests/org/jetbrains/jet/testing/LocalFileSystemUtils.java new file mode 100644 index 00000000000..17717dc323c --- /dev/null +++ b/idea/tests/org/jetbrains/jet/testing/LocalFileSystemUtils.java @@ -0,0 +1,34 @@ +/* + * Copyright 2010-2013 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. + */ + +package org.jetbrains.jet.testing; + +import com.intellij.openapi.vfs.LocalFileSystem; +import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.annotations.NotNull; + +public class LocalFileSystemUtils { + private LocalFileSystemUtils(){ + } + + public static void refreshPath(@NotNull String path) { + VirtualFile virtualFile = LocalFileSystem.getInstance().refreshAndFindFileByPath(path); + if (virtualFile != null) { + virtualFile.getChildren(); + virtualFile.refresh(false, true); + } + } +}