From e110089a0f347a45f15b42ce5e01033a7b76ad12 Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 1 Feb 2010 17:12:52 +0300 Subject: [PATCH] test data --- .../after/Bar.java | 2 ++ .../after/BarImpl.java | 9 +++++++++ .../after/IBar.java | 3 +++ .../after/IFoo.java | 3 +++ .../before/Bar.java | 2 ++ .../before/BarImpl.java | 9 +++++++++ .../before/IBar.java | 3 +++ .../before/IFoo.java | 4 ++++ .../testSrc/com/intellij/refactoring/SafeDeleteTest.java | 8 ++++++++ 9 files changed, 43 insertions(+) create mode 100644 java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/after/Bar.java create mode 100644 java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/after/BarImpl.java create mode 100644 java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/after/IBar.java create mode 100644 java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/after/IFoo.java create mode 100644 java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/before/Bar.java create mode 100644 java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/before/BarImpl.java create mode 100644 java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/before/IBar.java create mode 100644 java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/before/IFoo.java diff --git a/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/after/Bar.java b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/after/Bar.java new file mode 100644 index 000000000000..4ce69e626fd1 --- /dev/null +++ b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/after/Bar.java @@ -0,0 +1,2 @@ +public interface Bar extends IFoo, IBar { +} diff --git a/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/after/BarImpl.java b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/after/BarImpl.java new file mode 100644 index 000000000000..04d6e04e4125 --- /dev/null +++ b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/after/BarImpl.java @@ -0,0 +1,9 @@ +public class BarImpl implements Bar { + public String getText() { + return "hello"; + } + + public IBar getIBar() { + return this; + } +} diff --git a/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/after/IBar.java b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/after/IBar.java new file mode 100644 index 000000000000..ead66e85e1ee --- /dev/null +++ b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/after/IBar.java @@ -0,0 +1,3 @@ +public interface IBar { + String getText(); +} diff --git a/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/after/IFoo.java b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/after/IFoo.java new file mode 100644 index 000000000000..233bfed8f2da --- /dev/null +++ b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/after/IFoo.java @@ -0,0 +1,3 @@ +public interface IFoo { + IBar getIBar(); +} diff --git a/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/before/Bar.java b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/before/Bar.java new file mode 100644 index 000000000000..4ce69e626fd1 --- /dev/null +++ b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/before/Bar.java @@ -0,0 +1,2 @@ +public interface Bar extends IFoo, IBar { +} diff --git a/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/before/BarImpl.java b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/before/BarImpl.java new file mode 100644 index 000000000000..04d6e04e4125 --- /dev/null +++ b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/before/BarImpl.java @@ -0,0 +1,9 @@ +public class BarImpl implements Bar { + public String getText() { + return "hello"; + } + + public IBar getIBar() { + return this; + } +} diff --git a/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/before/IBar.java b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/before/IBar.java new file mode 100644 index 000000000000..ead66e85e1ee --- /dev/null +++ b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/before/IBar.java @@ -0,0 +1,3 @@ +public interface IBar { + String getText(); +} diff --git a/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/before/IFoo.java b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/before/IFoo.java new file mode 100644 index 000000000000..4c238962f489 --- /dev/null +++ b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementationThroughCommonInterface/before/IFoo.java @@ -0,0 +1,4 @@ +public interface IFoo { + String getText(); + IBar getIBar(); +} diff --git a/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java b/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java index 6aa8177e3726..45f0bbf0a683 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java @@ -2,6 +2,7 @@ package com.intellij.refactoring; import com.intellij.JavaTestUtil; import com.intellij.codeInsight.TargetElementUtilBase; +import com.intellij.idea.Bombed; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiClass; @@ -12,6 +13,7 @@ import com.intellij.testFramework.IdeaTestUtil; import org.jetbrains.annotations.NonNls; import java.io.File; +import java.util.Calendar; public class SafeDeleteTest extends MultiFileTestCase { private VirtualFile myRootBefore; @@ -51,6 +53,12 @@ public class SafeDeleteTest extends MultiFileTestCase { doTest("IFoo"); } + @Bombed(day = 3, month = Calendar.FEBRUARY, description = "should not delete method implementing IBar interface") + public void testMultipleInterfacesImplementationThroughCommonInterface() throws Exception { + myDoCompare = false; + doTest("IFoo"); + } + public void testExtendsList() throws Exception { myDoCompare = false; doTest("B");