From 62815ee0a1debc5be1cb0843deb79bced11f5b47 Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Fri, 28 Dec 2018 15:24:19 +0300
Subject: [PATCH] use light project test cases in ui tests

---
 .../ui/FinderRecursivePanelListModelMergeTest.java     |  9 ++++-----
 .../testSrc/com/intellij/ui/LafManagerTest.java        | 10 +++++-----
 .../testSrc/com/intellij/ui/PlatformIconsAPITest.java  |  4 ++--
 .../testSrc/com/intellij/ui/SortedListModelTest.java   |  2 +-
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/platform/platform-tests/testSrc/com/intellij/ui/FinderRecursivePanelListModelMergeTest.java b/platform/platform-tests/testSrc/com/intellij/ui/FinderRecursivePanelListModelMergeTest.java
index 80af27148b06..dca2ef2ce99c 100644
--- a/platform/platform-tests/testSrc/com/intellij/ui/FinderRecursivePanelListModelMergeTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ui/FinderRecursivePanelListModelMergeTest.java
@@ -99,7 +99,7 @@ public class FinderRecursivePanelListModelMergeTest extends LightPlatformTestCas
       @Override
       public void valueChanged(ListSelectionEvent e) {
         if (panel.isMergeListItemsRunning()) return;
-        assertTrue("selection changed", false);
+        fail("selection changed");
       }
     };
     list.addListSelectionListener(selectionListener);
@@ -114,19 +114,18 @@ public class FinderRecursivePanelListModelMergeTest extends LightPlatformTestCas
     list.removeListSelectionListener(selectionListener);
   }
 
-
   @NotNull
-  private StringFinderRecursivePanel createStringPanel(String[] initialItems) {
+  private static StringFinderRecursivePanel createStringPanel(String[] initialItems) {
     StringFinderRecursivePanel panel = new StringFinderRecursivePanel(initialItems);
     panel.initPanel();
     return panel;
   }
 
-  private class StringFinderRecursivePanel extends FinderRecursivePanel<String> {
+  private static class StringFinderRecursivePanel extends FinderRecursivePanel<String> {
     private final String[] myInitialItems;
 
     StringFinderRecursivePanel(String[] initialItems) {
-      super(FinderRecursivePanelListModelMergeTest.this.getProject(), null);
+      super(LightPlatformTestCase.getProject(), null);
       myInitialItems = initialItems;
     }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/ui/LafManagerTest.java b/platform/platform-tests/testSrc/com/intellij/ui/LafManagerTest.java
index 1b4789b4d518..6b6fdde65da3 100644
--- a/platform/platform-tests/testSrc/com/intellij/ui/LafManagerTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ui/LafManagerTest.java
@@ -4,7 +4,7 @@ package com.intellij.ui;
 import com.intellij.ide.ui.UISettings;
 import com.intellij.ide.ui.UISettingsState;
 import com.intellij.ide.ui.laf.LafManagerImpl;
-import com.intellij.testFramework.PlatformTestCase;
+import com.intellij.testFramework.LightPlatformTestCase;
 
 import javax.swing.*;
 import java.awt.*;
@@ -12,12 +12,12 @@ import java.awt.*;
 /**
  * @author Konstantin Bulenkov
  */
-public class LafManagerTest extends PlatformTestCase {
+public class LafManagerTest extends LightPlatformTestCase {
   public void testCustomFont() {
     UISettingsState uiSettings = UISettings.getInstance().getState();
-    final String fontFace = uiSettings.getFontFace();
-    final int fontSize = UISettings.getInstance().getFontSize();
-    final LafManagerImpl lafManager = LafManagerImpl.getTestInstance();
+    String fontFace = uiSettings.getFontFace();
+    int fontSize = UISettings.getInstance().getFontSize();
+    LafManagerImpl lafManager = LafManagerImpl.getTestInstance();
 
     try {
       String newFontName = "Arial";
diff --git a/platform/platform-tests/testSrc/com/intellij/ui/PlatformIconsAPITest.java b/platform/platform-tests/testSrc/com/intellij/ui/PlatformIconsAPITest.java
index 28e277fb2122..8b9118c3cdf0 100644
--- a/platform/platform-tests/testSrc/com/intellij/ui/PlatformIconsAPITest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ui/PlatformIconsAPITest.java
@@ -2,7 +2,7 @@
 package com.intellij.ui;
 
 import com.intellij.icons.AllIcons;
-import com.intellij.testFramework.PlatformTestCase;
+import junit.framework.TestCase;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -11,7 +11,7 @@ import java.util.TreeSet;
 /**
  * @author Konstantin Bulenkov
  */
-public class PlatformIconsAPITest extends PlatformTestCase {
+public class PlatformIconsAPITest extends TestCase {
 
   public void testCurrentAPI() {
     //todo[kb, tav] Check that icons added to AllIcons are also added to PUBLIC_API_ICONS. Add svg icons
diff --git a/platform/platform-tests/testSrc/com/intellij/ui/SortedListModelTest.java b/platform/platform-tests/testSrc/com/intellij/ui/SortedListModelTest.java
index ff56eb715275..83392efce973 100644
--- a/platform/platform-tests/testSrc/com/intellij/ui/SortedListModelTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ui/SortedListModelTest.java
@@ -26,7 +26,7 @@ import java.util.Comparator;
 import java.util.Iterator;
 
 public class SortedListModelTest extends TestCase {
-  private final SortedListModel<String> myModel = new SortedListModel<>((o1, o2) -> o1.compareTo(o2));
+  private final SortedListModel<String> myModel = new SortedListModel<>(Comparator.naturalOrder());
   private final Assertion CHECK = new Assertion();
 
   public void testAdding() {