Fix warnings in Java code in tests-common

compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java

@@ -296,7 +296,7 @@ public class KotlinTestUtils {
 
             String expectedText = StringUtilsKt.trimTrailingWhitespacesAndAddNewlineAtEOF(StringUtil.convertLineSeparators(expected.trim()));
 
-            if (!Comparing.equal(sanitizer.invoke(expectedText), sanitizer.invoke(actualText))) {
+            if (!Objects.equals(sanitizer.invoke(expectedText), sanitizer.invoke(actualText))) {
                 throw new FileComparisonFailure(message + ": " + expectedFile.getName(),
                                                 expected, actual, expectedFile.getAbsolutePath());
             }

compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java

@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.test.testFramework;
 
-import com.intellij.core.CoreASTFactory;
 import com.intellij.ide.util.AppPropertiesComponentImpl;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.lang.*;
@@ -26,11 +25,8 @@ import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.EditorFactory;
-import com.intellij.openapi.extensions.ExtensionPointName;
-import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.fileEditor.impl.LoadTextUtil;
-import com.intellij.openapi.fileTypes.FileTypeFactory;
 import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.fileTypes.FileTypeRegistry;
 import com.intellij.openapi.options.SchemeManagerFactory;
@@ -94,7 +90,6 @@ public abstract class KtParsingTestCase extends KtPlatformLiteFixture {
         initApplication();
         ComponentAdapter component = getApplication().getPicoContainer().getComponentAdapter(ProgressManager.class.getName());
 
-        Extensions.registerAreaClass("IDEA_PROJECT", null);
         myProject = new MockProjectEx(getTestRootDisposable());
         myPsiManager = new MockPsiManager(myProject);
         myFileFactory = new PsiFileFactoryImpl(myPsiManager);
@@ -110,7 +105,7 @@ public abstract class KtParsingTestCase extends KtPlatformLiteFixture {
 
         registerApplicationService(PropertiesComponent.class, new AppPropertiesComponentImpl());
         registerApplicationService(PsiBuilderFactory.class, new PsiBuilderFactoryImpl());
-        registerApplicationService(DefaultASTFactory.class, new CoreASTFactory());
+        registerApplicationService(DefaultASTFactory.class, new DefaultASTFactoryImpl());
         registerApplicationService(SchemeManagerFactory.class, new MockSchemeManagerFactory());
         registerApplicationService(FileTypeManager.class, mockFileTypeManager);
         registerApplicationService(FileDocumentManager.class, mockFileDocumentManager);
@@ -123,14 +118,10 @@ public abstract class KtParsingTestCase extends KtPlatformLiteFixture {
         registerComponentInstance(appContainer, FileDocumentManager.class, mockFileDocumentManager);
         registerComponentInstance(appContainer, PsiDocumentManager.class, new MockPsiDocumentManager());
 
-
-        myProject.registerService(CachedValuesManager.class, new CachedValuesManagerImpl(myProject, new PsiCachedValuesFactory(myPsiManager)));
         myProject.registerService(PsiManager.class, myPsiManager);
+        myProject.registerService(CachedValuesManager.class, new CachedValuesManagerImpl(myProject, new PsiCachedValuesFactory(myProject)));
         myProject.registerService(TreeAspect.class, new TreeAspect());
 
-        this.registerExtensionPoint(FileTypeFactory.FILE_TYPE_FACTORY_EP, FileTypeFactory.class);
-        registerExtensionPoint(MetaLanguage.EP_NAME, MetaLanguage.class);
-
         for (ParserDefinition definition : myDefinitions) {
             addExplicitExtension(LanguageParserDefinitions.INSTANCE, definition.getFileNodeType().getLanguage(), definition);
         }
@@ -162,17 +153,6 @@ public abstract class KtParsingTestCase extends KtPlatformLiteFixture {
         });
     }
 
-    @Override
-    protected <T> void registerExtensionPoint(final ExtensionPointName<T> extensionPointName, Class<T> aClass) {
-        super.registerExtensionPoint(extensionPointName, aClass);
-        Disposer.register(myProject, new Disposable() {
-            @Override
-            public void dispose() {
-                Extensions.getRootArea().unregisterExtensionPoint(extensionPointName.getName());
-            }
-        });
-    }
-
     protected <T> void registerApplicationService(final Class<T> aClass, T object) {
         getApplication().registerService(aClass, object);
         Disposer.register(myProject, new Disposable() {

compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java

@@ -17,34 +17,21 @@
 package org.jetbrains.kotlin.test.testFramework;
 
 import com.intellij.core.CoreEncodingProjectManager;
-import com.intellij.mock.MockApplicationEx;
+import com.intellij.mock.MockApplication;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.extensions.ExtensionPoint;
-import com.intellij.openapi.extensions.ExtensionPointName;
-import com.intellij.openapi.extensions.Extensions;
-import com.intellij.openapi.extensions.ExtensionsArea;
 import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.vfs.encoding.EncodingManager;
 import org.picocontainer.MutablePicoContainer;
 
-import java.lang.reflect.Modifier;
-
 public abstract class KtPlatformLiteFixture extends KtUsefulTestCase {
     protected MockProjectEx myProject;
 
-    @Override
+    public static MockApplication getApplication() {
-    protected void setUp() throws Exception {
+        return (MockApplication) ApplicationManager.getApplication();
-        super.setUp();
-        // FIXME: There is no `Extensions.cleanRootArea` in 193
-        // Extensions.cleanRootArea(getTestRootDisposable());
-    }
-
-    public static MockApplicationEx getApplication() {
-        return (MockApplicationEx)ApplicationManager.getApplication();
     }
 
     public void initApplication() {
-        MockApplicationEx instance = new MockApplicationEx(getTestRootDisposable());
+        MockApplication instance = new MockApplication(getTestRootDisposable());
         ApplicationManager.setApplication(instance, FileTypeManager::getInstance, getTestRootDisposable());
         getApplication().registerService(EncodingManager.class, CoreEncodingProjectManager.class);
     }
@@ -56,21 +43,6 @@ public abstract class KtPlatformLiteFixture extends KtUsefulTestCase {
         myProject = null;
     }
 
-    protected <T> void registerExtensionPoint(ExtensionPointName<T> extensionPointName, Class<T> aClass) {
-        registerExtensionPoint(Extensions.getRootArea(), extensionPointName, aClass);
-    }
-
-    private static <T> void registerExtensionPoint(
-            ExtensionsArea area, ExtensionPointName<T> extensionPointName,
-            Class<? extends T> aClass
-    ) {
-        String name = extensionPointName.getName();
-        if (!area.hasExtensionPoint(name)) {
-            ExtensionPoint.Kind kind = aClass.isInterface() || (aClass.getModifiers() & Modifier.ABSTRACT) != 0 ? ExtensionPoint.Kind.INTERFACE : ExtensionPoint.Kind.BEAN_CLASS;
-            area.registerExtensionPoint(name, aClass.getName(), kind);
-        }
-    }
-
     @SuppressWarnings("unchecked")
     public static <T> T registerComponentInstance(MutablePicoContainer container, Class<T> key, T implementation) {
         Object old = container.getComponentInstance(key);

compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java

@@ -19,15 +19,14 @@ package org.jetbrains.kotlin.test.testFramework;
 import com.intellij.codeInsight.CodeInsightSettings;
 import com.intellij.concurrency.IdeaForkJoinWorkerThreadFactory;
 import com.intellij.diagnostic.PerformanceWatcher;
+import com.intellij.ide.highlighter.JavaFileType;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.application.impl.ApplicationInfoImpl;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.JDOMUtil;
@@ -348,7 +347,7 @@ public abstract class KtUsefulTestCase extends TestCase {
                     }
                 })
                 .append(() -> {
-                    currentCodeStyleSettings.getIndentOptions(StdFileTypes.JAVA);
+                    currentCodeStyleSettings.getIndentOptions(JavaFileType.INSTANCE);
                     try {
                         checkCodeStyleSettingsEqual(oldCodeStyleSettings, currentCodeStyleSettings);
                     }
@@ -912,7 +911,7 @@ public abstract class KtUsefulTestCase extends TestCase {
         }
         String expected = StringUtil.convertLineSeparators(trimBeforeComparing ? fileText.trim() : fileText);
         String actual = StringUtil.convertLineSeparators(trimBeforeComparing ? actualText.trim() : actualText);
-        if (!Comparing.equal(expected, actual)) {
+        if (!Objects.equals(expected, actual)) {
             throw new FileComparisonFailure(messageProducer == null ? null : messageProducer.get(), expected, actual, filePath);
         }
     }