Convert line separators when checking test results
This commit is contained in:
@@ -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;
|
package org.jetbrains.jet.plugin.refactoring.inline;
|
||||||
|
|
||||||
import com.intellij.codeInsight.TargetElementUtilBase;
|
import com.intellij.codeInsight.TargetElementUtilBase;
|
||||||
import com.intellij.openapi.application.ApplicationManager;
|
import com.intellij.openapi.application.ApplicationManager;
|
||||||
import com.intellij.openapi.util.io.FileUtil;
|
import com.intellij.openapi.util.io.FileUtil;
|
||||||
|
import com.intellij.openapi.util.text.StringUtil;
|
||||||
import com.intellij.psi.PsiElement;
|
import com.intellij.psi.PsiElement;
|
||||||
import com.intellij.refactoring.util.CommonRefactoringUtil;
|
import com.intellij.refactoring.util.CommonRefactoringUtil;
|
||||||
import com.intellij.testFramework.LightProjectDescriptor;
|
import com.intellij.testFramework.LightProjectDescriptor;
|
||||||
@@ -42,7 +59,7 @@ public abstract class AbstractInlineTest extends LightCodeInsightFixtureTestCase
|
|||||||
|
|
||||||
assertTrue(afterFileExists);
|
assertTrue(afterFileExists);
|
||||||
assertEmpty(expectedErrors);
|
assertEmpty(expectedErrors);
|
||||||
myFixture.checkResult(FileUtil.loadFile(afterFile));
|
myFixture.checkResult(FileUtil.loadFile(afterFile, true));
|
||||||
} catch (CommonRefactoringUtil.RefactoringErrorHintException e) {
|
} catch (CommonRefactoringUtil.RefactoringErrorHintException e) {
|
||||||
assertFalse(afterFileExists);
|
assertFalse(afterFileExists);
|
||||||
assertEquals(1, expectedErrors.size());
|
assertEquals(1, expectedErrors.size());
|
||||||
|
|||||||
Reference in New Issue
Block a user