From a09cd50ea2aa333f40bd45abbc320f1b8d1fcc9f Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Fri, 8 Jun 2018 12:50:04 +0300
Subject: [PATCH] restore uiSettings after LafManager test

---
 .../com/intellij/ui/LafManagerTest.java        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/platform/platform-tests/testSrc/com/intellij/ui/LafManagerTest.java b/platform/platform-tests/testSrc/com/intellij/ui/LafManagerTest.java
index 54bdb1a26383..53d256f03275 100644
--- a/platform/platform-tests/testSrc/com/intellij/ui/LafManagerTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ui/LafManagerTest.java
@@ -3,7 +3,6 @@ package com.intellij.ui;
 
 import com.intellij.ide.ui.UISettings;
 import com.intellij.ide.ui.laf.LafManagerImpl;
-import com.intellij.ide.ui.laf.darcula.DarculaLookAndFeelInfo;
 import com.intellij.testFramework.PlatformTestCase;
 
 import javax.swing.*;
@@ -15,25 +14,26 @@ import java.awt.*;
 public class LafManagerTest extends PlatformTestCase {
 
   public void testCustomFont() {
-    String fontFace = UISettings.getInstance().getFontFace();
-    int fontSize = UISettings.getInstance().getFontSize();
+    final String fontFace = UISettings.getInstance().getFontFace();
+    final int fontSize = UISettings.getInstance().getFontSize();
+    final LafManagerImpl lafManager = LafManagerImpl.getTestInstance();
+    final UISettings uiSettings = UISettings.getInstance();
 
     try {
-      UISettings instance = UISettings.getInstance();
       String newFontName = "Arial";
       int newFontSize = 17;
-      instance.setFontFace(newFontName);
-      instance.setFontSize(newFontSize);
-      instance.setOverrideLafFonts(true);
-      LafManagerImpl lafManager = LafManagerImpl.getTestInstance();
-      lafManager.setCurrentLookAndFeel(new DarculaLookAndFeelInfo());
+      uiSettings.setFontFace(newFontName);
+      uiSettings.setFontSize(newFontSize);
+      uiSettings.setOverrideLafFonts(true);
       lafManager.updateUI();
       Font font = UIManager.getFont("Label.font");
       assertEquals("Font name is not changed", newFontName, font.getName());
       assertEquals("Font size is not changed", newFontSize, font.getSize());
     } finally {
+      uiSettings.setOverrideLafFonts(false);
       UISettings.getInstance().setFontFace(fontFace);
       UISettings.getInstance().setFontSize(fontSize);
+      lafManager.updateUI();
     }
   }
 }