MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Andrey Lisin
2018-12-28 15:31:25 +03:00
parent cfe630ab66 62815ee0a1
commit 3897e3d4f4
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-tests/testSrc/com/intellij/ui/FinderRecursivePanelListModelMergeTest.java
+4 -5
View File
@@ -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;
}
platform/platform-tests/testSrc/com/intellij/ui/LafManagerTest.java
+5 -5
View File
@@ -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";
platform/platform-tests/testSrc/com/intellij/ui/PlatformIconsAPITest.java
+2 -2
View File
@@ -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
platform/platform-tests/testSrc/com/intellij/ui/SortedListModelTest.java
+1 -1
View File
@@ -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() {