Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"

1 files changed, 44 insertions, 0 deletions

diff --git a/java/typeMigration/test/com/intellij/refactoring/TypeMigrationByThreadLocalRuleTest.java b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationByThreadLocalRuleTest.java
new file mode 100644
index 000000000000..5d002d3fcced
--- /dev/null
+++ b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationByThreadLocalRuleTest.java
@@ -0,0 +1,44 @@
+/*
+ * User: anna
+ * Date: 19-Aug-2009
+ */
+package com.intellij.refactoring;
+
+import com.intellij.psi.PsiType;
+import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.openapi.roots.LanguageLevelProjectExtension;
+import com.intellij.pom.java.LanguageLevel;
+import org.jetbrains.annotations.NotNull;
+
+public class TypeMigrationByThreadLocalRuleTest extends TypeMigrationTestBase{
+  @NotNull
+  @Override
+  protected String getTestRoot() {
+    return "/refactoring/typeMigrationByThreadLocal/";
+  }
+
+
+  public void testDirectInt() throws Exception {
+    doTestFieldType("i", PsiType.INT, myJavaFacade.getElementFactory().createTypeFromText("java.lang.ThreadLocal<java.lang.Integer>", null));
+  }
+  
+  public void testDirectByte() throws Exception {
+    doTestFieldType("i", PsiType.BYTE, myJavaFacade.getElementFactory().createTypeFromText("java.lang.ThreadLocal<java.lang.Byte>", null));
+  }
+
+  public void testDirectString() throws Exception {
+    doTestFieldType("myS", PsiType.getJavaLangString(myPsiManager, GlobalSearchScope.allScope(myProject)), myJavaFacade.getElementFactory().createTypeFromText("java.lang.ThreadLocal<java.lang.String>", null));
+  }
+
+  public void testLanguageLevel() throws Exception {
+    final LanguageLevelProjectExtension extension = LanguageLevelProjectExtension.getInstance(getProject());
+    final LanguageLevel languageLevel = extension.getLanguageLevel();
+    try {
+      extension.setLanguageLevel(LanguageLevel.JDK_1_3);
+      doTestFieldType("i", PsiType.INT, myJavaFacade.getElementFactory().createTypeFromText("java.lang.ThreadLocal", null));
+    }
+    finally {
+      extension.setLanguageLevel(languageLevel);
+    }
+  }
+}
\ No newline at end of file