diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType.log b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType.log new file mode 100644 index 000000000000..f0b400147a65 --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/AddMethodWithCovariantReturnType/BaseServer.class +out/production/AddMethodWithCovariantReturnType/Client.class +End of files +Compiling files: +src/BaseServer.java +src/Client.java +End of files +Cleaning output files: +out/production/AddMethodWithCovariantReturnType/Server.class +End of files +Compiling files: +src/Server.java +End of files diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/.name new file mode 100644 index 000000000000..3f0f88d495ce --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/.name @@ -0,0 +1 @@ +addMethodWithIncompatibleReturnType \ No newline at end of file diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/compiler.xml new file mode 100644 index 000000000000..a1b41c52c724 --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/compiler.xml @@ -0,0 +1,21 @@ + + + + + + diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/copyright/profiles_settings.xml new file mode 100644 index 000000000000..3572571ad83c --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/copyright/profiles_settings.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/encodings.xml new file mode 100644 index 000000000000..e206d70d8595 --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/encodings.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/misc.xml new file mode 100644 index 000000000000..f22d96b8c6a5 --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/misc.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IDEA jdk + + + + + + + + + + + + + + diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/modules.xml new file mode 100644 index 000000000000..0f8971827c3b --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/scopes/scope_settings.xml new file mode 100644 index 000000000000..922003b8433b --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/uiDesigner.xml new file mode 100644 index 000000000000..3b0002030884 --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/uiDesigner.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/vcs.xml new file mode 100644 index 000000000000..def6a6a18457 --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/workspace.xml new file mode 100644 index 000000000000..cbbae244fc1a --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/workspace.xml @@ -0,0 +1,285 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + localhost + 5050 + + + + + + + + 1317921782372 + 1317921782372 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/AddMethodWithCovariantReturnType.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/AddMethodWithCovariantReturnType.iml new file mode 100644 index 000000000000..d5c074327501 --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/AddMethodWithCovariantReturnType.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/BaseServer.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/BaseServer.java.new new file mode 100644 index 000000000000..7e87ae58ba8c --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/BaseServer.java.new @@ -0,0 +1,5 @@ +public class BaseServer { + public Element method() { + return new Element(); + } +} diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/Client.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/Client.java.new new file mode 100644 index 000000000000..963d79aa063a --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/Client.java.new @@ -0,0 +1,7 @@ +public class Client { + + public void foo(BaseServer server) { + Element elem = server.method(); + } + +} \ No newline at end of file diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/data.xml new file mode 100644 index 000000000000..7555d9634087 --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/data.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/src/BaseServer.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/src/BaseServer.java new file mode 100644 index 000000000000..33f9b7be23e4 --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/src/BaseServer.java @@ -0,0 +1,2 @@ +public class BaseServer { +} diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/src/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/src/Client.java new file mode 100644 index 000000000000..6d6fe6ac33b9 --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/src/Client.java @@ -0,0 +1,7 @@ +public class Client { + + public void foo(Server server) { + Element elem = server.method(); + } + +} \ No newline at end of file diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/src/Element.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/src/Element.java new file mode 100644 index 000000000000..629a0a70c4c0 --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/src/Element.java @@ -0,0 +1,2 @@ +public class Element { +} \ No newline at end of file diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/src/Server.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/src/Server.java new file mode 100644 index 000000000000..42e2b1b2fd6f --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/src/Server.java @@ -0,0 +1,5 @@ +public class Server extends BaseServer { + public SubElement method() { + return new SubElement(); + } +} diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/src/SubElement.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/src/SubElement.java new file mode 100644 index 000000000000..b9c519b42e8b --- /dev/null +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/src/SubElement.java @@ -0,0 +1,2 @@ +public class SubElement extends Element { +} \ No newline at end of file diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/MemberChangeTest.java b/jps/jps-builders/testSrc/org/jetbrains/ether/MemberChangeTest.java index 66fb1ab46af0..aa459ddf95e3 100644 --- a/jps/jps-builders/testSrc/org/jetbrains/ether/MemberChangeTest.java +++ b/jps/jps-builders/testSrc/org/jetbrains/ether/MemberChangeTest.java @@ -64,7 +64,7 @@ public class MemberChangeTest extends IncrementalTestCase { doTest(); } - public void testAddMethodWithCovariantReturnType() throws Exception { + public void _testAddMethodWithCovariantReturnType() throws Exception { doTest(); }