diff --git a/java/java-tests/testData/refactoring/introduceField/afterLocalVarAnnotations.java b/java/java-tests/testData/refactoring/introduceField/afterLocalVarAnnotations.java index 3ede0846a511..911e2e37e985 100644 --- a/java/java-tests/testData/refactoring/introduceField/afterLocalVarAnnotations.java +++ b/java/java-tests/testData/refactoring/introduceField/afterLocalVarAnnotations.java @@ -1,5 +1,7 @@ class Test { - void foo() { - @Deprecated String foo; - } + @Deprecated + public final String string = ""; + + void foo() { + } } \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java index 5159ab459f28..dd6e9734be1c 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java @@ -1,15 +1,12 @@ package com.intellij.refactoring; import com.intellij.JavaTestUtil; -import com.intellij.idea.Bombed; import com.intellij.psi.PsiPrimitiveType; import com.intellij.psi.PsiType; import com.intellij.refactoring.introduceField.BaseExpressionToFieldHandler; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.testFramework.LightCodeInsightTestCase; -import java.util.Calendar; - /** * @author ven */ @@ -107,10 +104,9 @@ public class IntroduceFieldInSameClassTest extends LightCodeInsightTestCase { checkResultByFile("/refactoring/introduceField/afterEnclosingAnonymous.java"); } - @Bombed(month = Calendar.JANUARY, day = 17) public void testLocalVarAnnotations() throws Exception { configureByFile("/refactoring/introduceField/beforeLocalVarAnnotations.java"); - performRefactoring(BaseExpressionToFieldHandler.InitializationPlace.IN_CONSTRUCTOR, false); + performRefactoring(BaseExpressionToFieldHandler.InitializationPlace.IN_FIELD_DECLARATION, false); checkResultByFile("/refactoring/introduceField/afterLocalVarAnnotations.java"); } } \ No newline at end of file diff --git a/java/mockJDK-1.7/jre/lib/rt.jar b/java/mockJDK-1.7/jre/lib/rt.jar index 404bf3f98567..f3b8e7677cd2 100644 Binary files a/java/mockJDK-1.7/jre/lib/rt.jar and b/java/mockJDK-1.7/jre/lib/rt.jar differ diff --git a/java/mockJDK-1.7/src.zip b/java/mockJDK-1.7/src.zip index 57bfb2c5cfb9..caa267e8a6f4 100644 Binary files a/java/mockJDK-1.7/src.zip and b/java/mockJDK-1.7/src.zip differ