From 8bdad92eff34989772c15a6f881e9cc68cef4272 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 25 Aug 2014 18:59:43 +0400 Subject: [PATCH] Minor, fix warnings and inspections in JetTestUtils --- .../tests/org/jetbrains/jet/JetTestUtils.java | 58 +++++-------------- .../tests/org/jetbrains/jet/test/Tmpdir.java | 8 ++- 2 files changed, 21 insertions(+), 45 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index a88422f98cd..0ad77ecfb19 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -35,6 +35,7 @@ import com.intellij.psi.PsiFileFactory; import com.intellij.psi.impl.PsiFileFactoryImpl; import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.testFramework.LightVirtualFile; +import com.intellij.util.ArrayUtil; import com.intellij.util.Function; import com.intellij.util.Processor; import com.intellij.util.containers.ContainerUtil; @@ -51,17 +52,17 @@ import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.diagnostics.Severity; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.resolve.*; -import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; +import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.jet.lang.resolve.BindingTrace; +import org.jetbrains.jet.lang.resolve.Diagnostics; +import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil; import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; -import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.plugin.JetLanguage; @@ -112,8 +113,6 @@ public class JetTestUtils { public static final Pattern DIRECTIVE_PATTERN = Pattern.compile("^//\\s*!(\\w+)(:\\s*(.*)$)?", Pattern.MULTILINE); public static final BindingTrace DUMMY_TRACE = new BindingTrace() { - - @NotNull @Override public BindingContext getBindingContext() { @@ -154,8 +153,9 @@ public class JetTestUtils { } @Override + @SuppressWarnings("unchecked") public V get(ReadOnlySlice slice, K key) { - if (slice == BindingContext.PROCESSED) return (V)Boolean.FALSE; + if (slice == BindingContext.PROCESSED) return (V) Boolean.FALSE; return SlicedMap.DO_NOTHING.get(slice, key); } @@ -234,7 +234,7 @@ public class JetTestUtils { }; @SuppressWarnings("unchecked") - private static final Class[] NO_INNER_CLASSES = new Class[0]; + private static final Class[] NO_INNER_CLASSES = ArrayUtil.EMPTY_CLASS_ARRAY; private JetTestUtils() { } @@ -354,20 +354,13 @@ public class JetTestUtils { filesToDelete.add(file); } - public static void rmrf(File file) { - if (file == null) { - return; - } - if (!FileUtil.delete(file)) { - throw new RuntimeException("failed to delete " + file); - } - } - @NotNull public static JetFile createFile(@NotNull @NonNls String name, @NotNull String text, @NotNull Project project) { LightVirtualFile virtualFile = new LightVirtualFile(name, JetLanguage.INSTANCE, text); virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET); - return (JetFile) ((PsiFileFactoryImpl) PsiFileFactory.getInstance(project)).trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false); + PsiFileFactoryImpl factory = (PsiFileFactoryImpl) PsiFileFactory.getInstance(project); + //noinspection ConstantConditions + return (JetFile) factory.trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false); } public static String doLoadFile(String myFullDataPath, String name) throws IOException { @@ -732,9 +725,7 @@ public class JetTestUtils { if (path != null) { String relativePath = FileUtil.nameToCompare(path); if (!filePaths.contains(relativePath)) { - Assert.fail("Test data file missing from the generated test class: " + - file + - pleaseReRunGenerator()); + Assert.fail("Test data file missing from the generated test class: " + file + pleaseReRunGenerator()); } } } @@ -790,9 +781,7 @@ public class JetTestUtils { return; } } - Assert.fail("Test data directory missing from the generated test class: " + - testDataDir + - pleaseReRunGenerator()); + Assert.fail("Test data directory missing from the generated test class: " + testDataDir + pleaseReRunGenerator()); } private static String pleaseReRunGenerator() { @@ -814,10 +803,7 @@ public class JetTestUtils { } @NotNull - public static List loadToJetFiles( - @NotNull JetCoreEnvironment environment, - @NotNull List files - ) throws IOException { + public static List loadToJetFiles(@NotNull JetCoreEnvironment environment, @NotNull List files) throws IOException { List jetFiles = Lists.newArrayList(); for (File file : files) { jetFiles.add(loadJetFile(environment.getProject(), file)); @@ -830,25 +816,11 @@ public class JetTestUtils { return createEmptyModule(""); } + @NotNull public static ModuleDescriptorImpl createEmptyModule(@NotNull String name) { return new ModuleDescriptorImpl(Name.special(name), Collections.emptyList(), PlatformToKotlinClassMap.EMPTY); } - @NotNull - public static MutablePackageFragmentDescriptor createTestPackageFragment(@NotNull Name testPackageName) { - return createTestPackageFragment(testPackageName, ""); - } - - @NotNull - public static MutablePackageFragmentDescriptor createTestPackageFragment(@NotNull Name testPackageName, @NotNull String moduleName) { - ModuleDescriptorImpl module = TopDownAnalyzerFacadeForJVM.createJavaModule(moduleName); - MutablePackageFragmentProvider provider = new MutablePackageFragmentProvider(module); - module.initialize(provider); - module.addDependencyOnModule(module); - module.seal(); - return provider.getOrCreateFragment(FqName.topLevel(testPackageName)); - } - @NotNull public static File replaceExtension(@NotNull File file, @Nullable String newExtension) { return new File(file.getParentFile(), FileUtil.getNameWithoutExtension(file) + (newExtension == null ? "" : "." + newExtension)); diff --git a/compiler/tests/org/jetbrains/jet/test/Tmpdir.java b/compiler/tests/org/jetbrains/jet/test/Tmpdir.java index cd8269e5df5..1e23ae3b39c 100644 --- a/compiler/tests/org/jetbrains/jet/test/Tmpdir.java +++ b/compiler/tests/org/jetbrains/jet/test/Tmpdir.java @@ -19,7 +19,6 @@ package org.jetbrains.jet.test; import com.google.common.io.Files; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.utils.UtilsPackage; import org.junit.rules.TestWatcher; import org.junit.runner.Description; @@ -43,7 +42,12 @@ public class Tmpdir extends TestWatcher { @Override protected void succeeded(Description description) { - JetTestUtils.rmrf(tmpDir); + if (tmpDir == null) { + return; + } + if (!FileUtil.delete(tmpDir)) { + throw new RuntimeException("failed to delete " + tmpDir); + } } @Override