diff options
author | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
commit | e5266e2343c8d275d79fa0be725180d0fe3a993c (patch) | |
tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /java/typeMigration/testData/refactoring/typeMigration/t17/after | |
parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
parent | 2e5965e996aad62ab1338b09d54caaf99ff3dd6a (diff) | |
download | idea-e5266e2343c8d275d79fa0be725180d0fe3a993c.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143
Diffstat (limited to 'java/typeMigration/testData/refactoring/typeMigration/t17/after')
-rw-r--r-- | java/typeMigration/testData/refactoring/typeMigration/t17/after/Test.items | 18 | ||||
-rw-r--r-- | java/typeMigration/testData/refactoring/typeMigration/t17/after/test.java | 17 |
2 files changed, 35 insertions, 0 deletions
diff --git a/java/typeMigration/testData/refactoring/typeMigration/t17/after/Test.items b/java/typeMigration/testData/refactoring/typeMigration/t17/after/Test.items new file mode 100644 index 000000000000..aa0aa0551659 --- /dev/null +++ b/java/typeMigration/testData/refactoring/typeMigration/t17/after/Test.items @@ -0,0 +1,18 @@ +Types: +PsiField:f : B +PsiMethodCallExpression:f.foo(s) : B +PsiMethodCallExpression:s.add(f) : boolean +PsiParameter:s : java.util.Set<B> +PsiReferenceExpression:f : B +PsiReferenceExpression:f : B +PsiReferenceExpression:s : java.util.Set<B> +PsiReferenceExpression:s : java.util.Set<B> + +Conversions: +f -> $ +f.foo(s) -> $ +s -> $ +s.add(f) -> $ + +New expression type changes: +Fails: diff --git a/java/typeMigration/testData/refactoring/typeMigration/t17/after/test.java b/java/typeMigration/testData/refactoring/typeMigration/t17/after/test.java new file mode 100644 index 000000000000..73530057f21b --- /dev/null +++ b/java/typeMigration/testData/refactoring/typeMigration/t17/after/test.java @@ -0,0 +1,17 @@ +import java.util.*; +class Test { + B f; + + A bar(Set<B> s) { + s.add(f); + return f.foo(s); + } +} +class A { + <T> T foo(Set<T> t) { + return null; + } +} + +class B extends A { +}
\ No newline at end of file |