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

More test fixes

Browse Source
This commit is contained in:
Rustam Vishnyakov
2015-03-10 10:10:13 +03:00
parent 27290f9102
commit 7472ce8441
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/codeInsight/GenerateConstructorTest.java
+4 -1
View File
@@ -17,6 +17,7 @@ package com.intellij.codeInsight;
import com.intellij.codeInsight.generation.ClassMember;
import com.intellij.codeInsight.generation.GenerateConstructorHandler;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
@@ -43,7 +44,9 @@ public class GenerateConstructorTest extends LightCodeInsightTestCase {
}
public void testBoundCommentsKeepsBlankLine() throws Exception {
CodeStyleSettingsManager.getInstance(getProject()).getCurrentSettings().BLANK_LINES_AFTER_CLASS_HEADER = 1;
CommonCodeStyleSettings javaSettings =
CodeStyleSettingsManager.getInstance(getProject()).getCurrentSettings().getCommonSettings(JavaLanguage.INSTANCE);
javaSettings.BLANK_LINES_AFTER_CLASS_HEADER = 1;
doTest();
}
java/java-tests/testSrc/com/intellij/codeInsight/JoinLinesTest.java
+1 -1
View File
@@ -195,7 +195,7 @@ public class JoinLinesTest extends LightCodeInsightTestCase {
// Inspired by IDEA-65342
CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject());
settings.setDefaultRightMargin(50);
settings.CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
settings.getCommonSettings(JavaLanguage.INSTANCE).CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
doTest(2);
}
java/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java
+5 -2
View File
@@ -1,8 +1,10 @@
package com.intellij.refactoring;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.roots.LanguageLevelProjectExtension;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.refactoring.typeMigration.TypeMigrationRules;
@@ -767,8 +769,9 @@ public class TypeMigrationTest extends TypeMigrationTestBase {
// Checking preserving method parameters alignment
public void testT127() {
getCurrentCodeStyleSettings().ALIGN_MULTILINE_PARAMETERS = true;
getCurrentCodeStyleSettings().ALIGN_MULTILINE_PARAMETERS_IN_CALLS = true;
CommonCodeStyleSettings javaSettings = getCurrentCodeStyleSettings().getCommonSettings(JavaLanguage.INSTANCE);
javaSettings.ALIGN_MULTILINE_PARAMETERS = true;
javaSettings.ALIGN_MULTILINE_PARAMETERS_IN_CALLS = true;
doTestMethodType("test234",
myFactory.createTypeFromText("int", null),
myFactory.createTypeFromText("long", null));