From e54784efcc1cc8cf81d1a8c3d6b48e8ce1a12e56 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 20 Aug 2013 16:30:02 +0400 Subject: [PATCH] Convert line separators when checking test results --- .../inline/AbstractInlineTest.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/AbstractInlineTest.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/AbstractInlineTest.java index 91419956cb3..1d20afc23e2 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/AbstractInlineTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/AbstractInlineTest.java @@ -1,8 +1,25 @@ +/* + * Copyright 2010-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.jetbrains.jet.plugin.refactoring.inline; import com.intellij.codeInsight.TargetElementUtilBase; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.testFramework.LightProjectDescriptor; @@ -42,7 +59,7 @@ public abstract class AbstractInlineTest extends LightCodeInsightFixtureTestCase assertTrue(afterFileExists); assertEmpty(expectedErrors); - myFixture.checkResult(FileUtil.loadFile(afterFile)); + myFixture.checkResult(FileUtil.loadFile(afterFile, true)); } catch (CommonRefactoringUtil.RefactoringErrorHintException e) { assertFalse(afterFileExists); assertEquals(1, expectedErrors.size());