Attachment 112557 Details for Bug 247307 – Test patch

[patch] Test patch

247307.txt (text/plain), 7.31 KB, created by Philipe Mulet

on 2008-09-15 12:41:10 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Philipe Mulet

Created: 2008-09-15 12:41:10 EDT

Size: 7.31 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core.tests.compiler
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/ArrayTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ArrayTest.java,v
>retrieving revision 1.25
>diff -u -r1.25 ArrayTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/ArrayTest.java	27 Jun 2008 16:04:45 -0000	1.25
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/ArrayTest.java	15 Sep 2008 16:40:48 -0000
>@@ -10,6 +10,7 @@
>  *******************************************************************************/
> package org.eclipse.jdt.core.tests.compiler.regression;
> import java.io.File;
>+import java.util.Map;
> 
> import junit.framework.Test;
> 
>@@ -393,4 +394,189 @@
> 		"argument cannot be resolved\n" +
> 		"----------\n");
> }
>+// Check return type of array#clone()
>+public void test014() throws Exception {
>+	Map optionsMap = getCompilerOptions();
>+	CompilerOptions options = new CompilerOptions(optionsMap);
>+	if (options.complianceLevel <= ClassFileConstants.JDK1_4) {
>+		this.runNegativeTest(
>+				new String[] {
>+					"X.java",
>+					"public class X {\n" + 
>+					"	void foo(long[] longs) throws Exception {\n" + 
>+					"		long[] other = longs.clone();\n" + 
>+					"	}\n" + 
>+					"}\n",
>+				},
>+				"----------\n" + 
>+				"1. ERROR in X.java (at line 3)\n" + 
>+				"	long[] other = longs.clone();\n" + 
>+				"	               ^^^^^^^^^^^^^\n" + 
>+				"Type mismatch: cannot convert from Object to long[]\n" + 
>+				"----------\n");
>+		return;
>+	}
>+	// check that #clone() return type is changed only from -source 1.5 only (independant from compliance level)
>+	optionsMap.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_4);
>+	this.runNegativeTest(
>+			new String[] {
>+				"X.java",
>+				"public class X {\n" + 
>+				"	void foo(long[] longs) throws Exception {\n" + 
>+				"		long[] other = longs.clone();\n" + 
>+				"	}\n" + 
>+				"}\n",
>+			},
>+			"----------\n" + 
>+			"1. ERROR in X.java (at line 3)\n" + 
>+			"	long[] other = longs.clone();\n" + 
>+			"	               ^^^^^^^^^^^^^\n" + 
>+			"Type mismatch: cannot convert from Object to long[]\n" + 
>+			"----------\n",
>+			null,
>+			true,
>+			optionsMap);
>+
>+	// try again with default source level >=1.5
>+	this.runConformTest(
>+		new String[] {
>+			"X.java",
>+			"public class X {\n" + 
>+			"	void foo(long[] longs) throws Exception {\n" + 
>+			"		long[] other = longs.clone();\n" + 
>+			"	}\n" + 
>+			"}\n",
>+		},
>+		"");
>+
>+	ClassFileBytesDisassembler disassembler = ToolFactory.createDefaultClassFileBytesDisassembler();
>+	byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(new File(OUTPUT_DIR + File.separator  +"X.class"));
>+	String actualOutput =
>+		disassembler.disassemble(
>+			classFileBytes,
>+			"\n",
>+			ClassFileBytesDisassembler.DETAILED);
>+
>+	String expectedOutput =
>+		"  static {};\n" +
>+		"    0  iconst_2\n" +
>+		"    1  anewarray java.lang.Object [3]\n" +
>+		"    4  putstatic X.X : java.lang.Object[] [9]\n" +
>+		"    7  return\n" +
>+		"      Line numbers:\n" +
>+		"        [pc: 0, line: 2]\n" +
>+		"        [pc: 7, line: 1]\n";
>+
>+	int index = actualOutput.indexOf(expectedOutput);
>+	if (index == -1 || expectedOutput.length() == 0) {
>+		System.out.println(Util.displayString(actualOutput, 3));
>+	}
>+	if (index == -1) {
>+		assertEquals("unexpected bytecode sequence", expectedOutput, actualOutput);
>+	}
>+}
>+//Check constant pool declaring class of array#clone()
>+public void test016() throws Exception {
>+	this.runConformTest(
>+			new String[] {
>+				"X.java",
>+				"public class X {\n" + 
>+				"	void foo(long[] longs) throws Exception {\n" + 
>+				"		Object other = longs.clone();\n" + 
>+				"	}\n" + 
>+				"}\n",
>+			},
>+			"");
>+	ClassFileBytesDisassembler disassembler = ToolFactory.createDefaultClassFileBytesDisassembler();
>+	byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(new File(OUTPUT_DIR + File.separator  +"X.class"));
>+	String actualOutput =
>+		disassembler.disassemble(
>+			classFileBytes,
>+			"\n",
>+			ClassFileBytesDisassembler.DETAILED);
>+
>+	String expectedOutput =	new CompilerOptions(getCompilerOptions()).sourceLevel <= ClassFileConstants.JDK1_4
>+		?	"  // Method descriptor #15 ([J)V\n" + 
>+			"  // Stack: 1, Locals: 3\n" + 
>+			"  void foo(long[] longs) throws java.lang.Exception;\n" + 
>+			"    0  aload_1 [longs]\n" + 
>+			"    1  invokevirtual java.lang.Object.clone() : java.lang.Object [19]\n" + 
>+			"    4  astore_2 [other]\n" + 
>+			"    5  return\n" + 
>+			"      Line numbers:\n" + 
>+			"        [pc: 0, line: 3]\n" + 
>+			"        [pc: 5, line: 4]\n"
>+		:	"  // Method descriptor #15 ([J)V\n" + 
>+			"  // Stack: 1, Locals: 3\n" + 
>+			"  void foo(long[] longs) throws java.lang.Exception;\n" + 
>+			"    0  aload_1 [longs]\n" + 
>+			"    1  invokevirtual long[].clone() : java.lang.Object [19]\n" + 
>+			"    4  astore_2 [other]\n" + 
>+			"    5  return\n" + 
>+			"      Line numbers:\n" + 
>+			"        [pc: 0, line: 3]\n" + 
>+			"        [pc: 5, line: 4]\n";
>+
>+	int index = actualOutput.indexOf(expectedOutput);
>+	if (index == -1 || expectedOutput.length() == 0) {
>+		System.out.println(Util.displayString(actualOutput, 3));
>+	}
>+	if (index == -1) {
>+		assertEquals("unexpected bytecode sequence", expectedOutput, actualOutput);
>+	}		
>+	return;
>+}
>+
>+
>+//Check constant pool declaring class of array#clone()
>+public void test017() throws Exception {
>+	Map optionsMap = getCompilerOptions();
>+	CompilerOptions options = new CompilerOptions(optionsMap);
>+	if (options.complianceLevel >= ClassFileConstants.JDK1_4) {
>+		// check that #clone() return type is changed ONLY from -source 1.5 only (independant from compliance level)
>+		optionsMap.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_4);		
>+	}
>+	this.runConformTest(
>+			new String[] {
>+				"X.java",
>+				"public class X {\n" + 
>+				"	void foo(long[] longs) throws Exception {\n" + 
>+				"		Object other = longs.clone();\n" + 
>+				"	}\n" + 
>+				"}\n",
>+			},
>+			"",
>+			null,
>+			true,
>+			null,
>+			optionsMap,
>+			null);
>+	ClassFileBytesDisassembler disassembler = ToolFactory.createDefaultClassFileBytesDisassembler();
>+	byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(new File(OUTPUT_DIR + File.separator  +"X.class"));
>+	String actualOutput =
>+		disassembler.disassemble(
>+			classFileBytes,
>+			"\n",
>+			ClassFileBytesDisassembler.DETAILED);
>+
>+	String expectedOutput =
>+		"  // Method descriptor #15 ([J)V\n" + 
>+		"  // Stack: 1, Locals: 3\n" + 
>+		"  void foo(long[] longs) throws java.lang.Exception;\n" + 
>+		"    0  aload_1 [longs]\n" + 
>+		"    1  invokevirtual java.lang.Object.clone() : java.lang.Object [19]\n" + 
>+		"    4  astore_2 [other]\n" + 
>+		"    5  return\n" + 
>+		"      Line numbers:\n" + 
>+		"        [pc: 0, line: 3]\n" + 
>+		"        [pc: 5, line: 4]\n";
>+
>+	int index = actualOutput.indexOf(expectedOutput);
>+	if (index == -1 || expectedOutput.length() == 0) {
>+		System.out.println(Util.displayString(actualOutput, 3));
>+	}
>+	if (index == -1) {
>+		assertEquals("unexpected bytecode sequence", expectedOutput, actualOutput);
>+	}		
>+}
> }

Actions: View | Diff

Attachments on bug 247307: 112557 | 112567