From 20f796bd671aed489d12988034a24b5089207bd6 Mon Sep 17 00:00:00 2001 From: Mikhail Golubev Date: Mon, 1 Sep 2014 15:09:04 +0400 Subject: [PATCH] PY-12409 Restore modified code style settings in test --- .../python/refactoring/PyInlineLocalTest.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/python/testSrc/com/jetbrains/python/refactoring/PyInlineLocalTest.java b/python/testSrc/com/jetbrains/python/refactoring/PyInlineLocalTest.java index 9a764b94169d..cf6ad38e075d 100644 --- a/python/testSrc/com/jetbrains/python/refactoring/PyInlineLocalTest.java +++ b/python/testSrc/com/jetbrains/python/refactoring/PyInlineLocalTest.java @@ -20,6 +20,7 @@ import com.intellij.openapi.util.Comparing; import com.intellij.psi.PsiElement; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; +import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.jetbrains.python.PythonLanguage; import com.jetbrains.python.fixtures.PyTestCase; import com.jetbrains.python.refactoring.inline.PyInlineLocalHandler; @@ -97,8 +98,19 @@ public class PyInlineLocalTest extends PyTestCase { // PY-12409 public void testResultExceedsRightMargin() { final CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(myFixture.getProject()); - settings.WRAP_LONG_LINES = true; + final CommonCodeStyleSettings commonSettings = settings.getCommonSettings(PythonLanguage.getInstance()); + + final int oldRightMargin = settings.getRightMargin(PythonLanguage.getInstance()); + final boolean oldWrapLongLines = commonSettings.WRAP_LONG_LINES; + settings.setRightMargin(PythonLanguage.getInstance(), 80); - doTest(); + commonSettings.WRAP_LONG_LINES = true; + try { + doTest(); + } + finally { + commonSettings.WRAP_LONG_LINES = oldWrapLongLines; + settings.setRightMargin(PythonLanguage.getInstance(), oldRightMargin); + } } }