From 472d16982d0e704f2a1f4904346b7d4401905058 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 1 Jun 2012 21:39:06 +0400 Subject: [PATCH] commented tests for use interface where possible refactoring --- .../covariantReturnTypes/after/Main.java | 16 ++++++++++++ .../covariantReturnTypes/before/Main.java | 16 ++++++++++++ .../turnRefsToSuper/listArgs/after/Main.java | 14 +++++++++++ .../turnRefsToSuper/listArgs/before/Main.java | 14 +++++++++++ .../turnRefsToSuper/newExpr/after/Main.java | 25 +++++++++++++++++++ .../turnRefsToSuper/newExpr/before/Main.java | 25 +++++++++++++++++++ .../staticCallArguments/after/Main.java | 11 ++++++++ .../staticCallArguments/before/Main.java | 11 ++++++++ .../refactoring/TurnRefsToSuperTest.java | 16 ++++++++++++ 9 files changed, 148 insertions(+) create mode 100644 java/java-tests/testData/refactoring/turnRefsToSuper/covariantReturnTypes/after/Main.java create mode 100644 java/java-tests/testData/refactoring/turnRefsToSuper/covariantReturnTypes/before/Main.java create mode 100644 java/java-tests/testData/refactoring/turnRefsToSuper/listArgs/after/Main.java create mode 100644 java/java-tests/testData/refactoring/turnRefsToSuper/listArgs/before/Main.java create mode 100644 java/java-tests/testData/refactoring/turnRefsToSuper/newExpr/after/Main.java create mode 100644 java/java-tests/testData/refactoring/turnRefsToSuper/newExpr/before/Main.java create mode 100644 java/java-tests/testData/refactoring/turnRefsToSuper/staticCallArguments/after/Main.java create mode 100644 java/java-tests/testData/refactoring/turnRefsToSuper/staticCallArguments/before/Main.java diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/covariantReturnTypes/after/Main.java b/java/java-tests/testData/refactoring/turnRefsToSuper/covariantReturnTypes/after/Main.java new file mode 100644 index 000000000000..87838bd4cdf2 --- /dev/null +++ b/java/java-tests/testData/refactoring/turnRefsToSuper/covariantReturnTypes/after/Main.java @@ -0,0 +1,16 @@ +interface Int { + Int f(); +} +class Impl implements Int { + void foo(){} + Impl f() {return this;} +} + +class Usage { + void fk(Impl l, Impl ll){ + l.f().foo(); + + final Impl f = ll.f(); + f.foo(); + } +} diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/covariantReturnTypes/before/Main.java b/java/java-tests/testData/refactoring/turnRefsToSuper/covariantReturnTypes/before/Main.java new file mode 100644 index 000000000000..87838bd4cdf2 --- /dev/null +++ b/java/java-tests/testData/refactoring/turnRefsToSuper/covariantReturnTypes/before/Main.java @@ -0,0 +1,16 @@ +interface Int { + Int f(); +} +class Impl implements Int { + void foo(){} + Impl f() {return this;} +} + +class Usage { + void fk(Impl l, Impl ll){ + l.f().foo(); + + final Impl f = ll.f(); + f.foo(); + } +} diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/listArgs/after/Main.java b/java/java-tests/testData/refactoring/turnRefsToSuper/listArgs/after/Main.java new file mode 100644 index 000000000000..f5461e3ae76c --- /dev/null +++ b/java/java-tests/testData/refactoring/turnRefsToSuper/listArgs/after/Main.java @@ -0,0 +1,14 @@ +import java.util.*; +interface Int {} +class Impl implements Int { + void foo(){} +} + +class Usage { + void f(List l){ + for (Impl aImpl : l) { + aImpl.foo(); + } + l.get(0).foo(); + } +} diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/listArgs/before/Main.java b/java/java-tests/testData/refactoring/turnRefsToSuper/listArgs/before/Main.java new file mode 100644 index 000000000000..f5461e3ae76c --- /dev/null +++ b/java/java-tests/testData/refactoring/turnRefsToSuper/listArgs/before/Main.java @@ -0,0 +1,14 @@ +import java.util.*; +interface Int {} +class Impl implements Int { + void foo(){} +} + +class Usage { + void f(List l){ + for (Impl aImpl : l) { + aImpl.foo(); + } + l.get(0).foo(); + } +} diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/newExpr/after/Main.java b/java/java-tests/testData/refactoring/turnRefsToSuper/newExpr/after/Main.java new file mode 100644 index 000000000000..53f59ce1a836 --- /dev/null +++ b/java/java-tests/testData/refactoring/turnRefsToSuper/newExpr/after/Main.java @@ -0,0 +1,25 @@ +import java.util.*; + +interface Int { +} + +class Impl implements Int { + void foo() { + } +} + +class Usage { + void f() { + List l = new ArrayList(); + l.get(0).foo(); + + + List l1 = new ArrayList(); + Int i = l1.get(0); + + + List l2 = new ArrayList(); + Impl i2 = l2.get(0); + i2.foo(); + } +} diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/newExpr/before/Main.java b/java/java-tests/testData/refactoring/turnRefsToSuper/newExpr/before/Main.java new file mode 100644 index 000000000000..50ae4b902da8 --- /dev/null +++ b/java/java-tests/testData/refactoring/turnRefsToSuper/newExpr/before/Main.java @@ -0,0 +1,25 @@ +import java.util.*; + +interface Int { +} + +class Impl implements Int { + void foo() { + } +} + +class Usage { + void f() { + List l = new ArrayList(); + l.get(0).foo(); + + + List l1 = new ArrayList(); + Impl i = l1.get(0); + + + List l2 = new ArrayList(); + Impl i2 = l2.get(0); + i2.foo(); + } +} diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/staticCallArguments/after/Main.java b/java/java-tests/testData/refactoring/turnRefsToSuper/staticCallArguments/after/Main.java new file mode 100644 index 000000000000..65863080db14 --- /dev/null +++ b/java/java-tests/testData/refactoring/turnRefsToSuper/staticCallArguments/after/Main.java @@ -0,0 +1,11 @@ +import java.util.*; +interface Int {} +class Impl implements Int { +} + +class Usage { + void f(List l){} + void bar() { + f(Collections.emptyList()); + } +} diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/staticCallArguments/before/Main.java b/java/java-tests/testData/refactoring/turnRefsToSuper/staticCallArguments/before/Main.java new file mode 100644 index 000000000000..bdbd11ba0c5f --- /dev/null +++ b/java/java-tests/testData/refactoring/turnRefsToSuper/staticCallArguments/before/Main.java @@ -0,0 +1,11 @@ +import java.util.*; +interface Int {} +class Impl implements Int { +} + +class Usage { + void f(List l){} + void bar() { + f(Collections.emptyList()); + } +} diff --git a/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java b/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java index 5c85acae04c8..ff9dae636d0b 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java @@ -150,6 +150,22 @@ public class TurnRefsToSuperTest extends MultiFileTestCase { doTest("Clazz", "Intf", false); } + public void _testStaticCallArguments() throws Exception { + doTest("Impl", "Int", false); + } + + public void _testListArgs() throws Exception { + doTest("Impl", "Int", false); + } + + public void _testCovariantReturnTypes() throws Exception { + doTest("Impl", "Int", false); + } + + public void _testNewExpr() throws Exception { + doTest("Impl", "Int", false); + } + private void doTest(@NonNls final String className, @NonNls final String superClassName, final boolean replaceInstanceOf) throws Exception { doTest(new PerformAction() { @Override