Attachment 229084 Details for Bug 198508 – Fixed failing tests.

[patch] Fixed failing tests.

eclipse.jdt.ui.test.20130327.patch (text/plain), 12.44 KB, created by Martin Mathew

on 2013-03-27 06:39:17 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Mathew

Created: 2013-03-27 06:39:17 EDT

Size: 12.44 KB

patch

obsolete

>diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/CamelCaseCompletionTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/CamelCaseCompletionTest.java
>index 36c9215..8400ee4 100644
>--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/CamelCaseCompletionTest.java
>+++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/CamelCaseCompletionTest.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2011 IBM Corporation and others.
>+ * Copyright (c) 2005, 2013 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -42,12 +42,12 @@
> 
> 	public void testMethod() throws Exception {
> 		addMembers("void methodCallWithParams(int par) {}");
>-		assertMethodBodyProposal("this.mCW|", "methodCallWith", "this.methodCallWithParams(|)");
>+		assertMethodBodyProposal("this.mCW|", "methodCallWith", "this.methodCallWithParams(|);");
> 	}
> 
> 	public void testMethodWithTrailing() throws Exception {
> 		addMembers("void methodCallWithParams(int par) {}");
>-		assertMethodBodyProposal("this.mCWith|", "methodCallWith", "this.methodCallWithParams(|)");
>+		assertMethodBodyProposal("this.mCWith|", "methodCallWith", "this.methodCallWithParams(|);");
> 	}
> 
> 	public void testField() throws Exception {
>diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/CodeCompletionTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/CodeCompletionTest.java
>index a70f603..7accf33 100644
>--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/CodeCompletionTest.java
>+++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/CodeCompletionTest.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2012 IBM Corporation and others.
>+ * Copyright (c) 2000, 2013 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -895,16 +895,16 @@
> 		int i= 0;
> 		assertAppliedProposal(contents, proposals[i++], "clone()");
> 		assertAppliedProposal(contents, proposals[i++], "equals()");
>-		assertAppliedProposal(contents, proposals[i++], "finalize()");
>+		assertAppliedProposal(contents, proposals[i++], "finalize();");
> 		assertAppliedProposal(contents, proposals[i++], "getClass()");
> 		assertAppliedProposal(contents, proposals[i++], "hashCode()");
>-		assertAppliedProposal(contents, proposals[i++], "notify()");
>-		assertAppliedProposal(contents, proposals[i++], "notifyAll()");
>-		assertAppliedProposal(contents, proposals[i++], "run()");
>+		assertAppliedProposal(contents, proposals[i++], "notify();");
>+		assertAppliedProposal(contents, proposals[i++], "notifyAll();");
>+		assertAppliedProposal(contents, proposals[i++], "run();");
> 		assertAppliedProposal(contents, proposals[i++], "toString()");
>-		assertAppliedProposal(contents, proposals[i++], "wait()");
>-		assertAppliedProposal(contents, proposals[i++], "wait()");
>-		assertAppliedProposal(contents, proposals[i++], "wait()");
>+		assertAppliedProposal(contents, proposals[i++], "wait();");
>+		assertAppliedProposal(contents, proposals[i++], "wait();");
>+		assertAppliedProposal(contents, proposals[i++], "wait();");
> 	}
> 
> 	public void testNormalAllMethodCompletionWithParametersGuessed() throws Exception {
>@@ -946,16 +946,16 @@
> 		int i= 0;
> 		assertAppliedProposal(contents, proposals[i++], "clone()");
> 		assertAppliedProposal(contents, proposals[i++], "equals(run)");
>-		assertAppliedProposal(contents, proposals[i++], "finalize()");
>+		assertAppliedProposal(contents, proposals[i++], "finalize();");
> 		assertAppliedProposal(contents, proposals[i++], "getClass()");
> 		assertAppliedProposal(contents, proposals[i++], "hashCode()");
>-		assertAppliedProposal(contents, proposals[i++], "notify()");
>-		assertAppliedProposal(contents, proposals[i++], "notifyAll()");
>-		assertAppliedProposal(contents, proposals[i++], "run()");
>+		assertAppliedProposal(contents, proposals[i++], "notify();");
>+		assertAppliedProposal(contents, proposals[i++], "notifyAll();");
>+		assertAppliedProposal(contents, proposals[i++], "run();");
> 		assertAppliedProposal(contents, proposals[i++], "toString()");
>-		assertAppliedProposal(contents, proposals[i++], "wait()");
>-		assertAppliedProposal(contents, proposals[i++], "wait(longVal)");
>-		assertAppliedProposal(contents, proposals[i++], "wait(longVal, intVal)");
>+		assertAppliedProposal(contents, proposals[i++], "wait();");
>+		assertAppliedProposal(contents, proposals[i++], "wait(longVal);");
>+		assertAppliedProposal(contents, proposals[i++], "wait(longVal, intVal);");
> 
> 		assertEquals(i, proposals.length);
> 	}
>@@ -996,16 +996,16 @@
> 		int i= 0;
> 		assertAppliedProposal(contents, proposals[i++], "clone()");
> 		assertAppliedProposal(contents, proposals[i++], "equals(arg0)");
>-		assertAppliedProposal(contents, proposals[i++], "finalize()");
>+		assertAppliedProposal(contents, proposals[i++], "finalize();");
> 		assertAppliedProposal(contents, proposals[i++], "getClass()");
> 		assertAppliedProposal(contents, proposals[i++], "hashCode()");
>-		assertAppliedProposal(contents, proposals[i++], "notify()");
>-		assertAppliedProposal(contents, proposals[i++], "notifyAll()");
>-		assertAppliedProposal(contents, proposals[i++], "run()");
>+		assertAppliedProposal(contents, proposals[i++], "notify();");
>+		assertAppliedProposal(contents, proposals[i++], "notifyAll();");
>+		assertAppliedProposal(contents, proposals[i++], "run();");
> 		assertAppliedProposal(contents, proposals[i++], "toString()");
>-		assertAppliedProposal(contents, proposals[i++], "wait()");
>-		assertAppliedProposal(contents, proposals[i++], "wait(arg0)");
>-		assertAppliedProposal(contents, proposals[i++], "wait(arg0, arg1)");
>+		assertAppliedProposal(contents, proposals[i++], "wait();");
>+		assertAppliedProposal(contents, proposals[i++], "wait(arg0);");
>+		assertAppliedProposal(contents, proposals[i++], "wait(arg0, arg1);");
> 
> 		assertEquals(i, proposals.length);
> 	}
>@@ -1051,7 +1051,7 @@
> 				 "public class Completion {\n" +
> 				 "    \n" +
> 				 "    void foomethod() {\n" +
>-				 "        this.foomethod()//here\n" +
>+				"        this.foomethod();//here\n" +
> 				 "    }\n" +
> 				 "}\n";
> 
>@@ -1888,7 +1888,7 @@
> 			buf.append("\n");
> 			buf.append("public class B {\n");
> 			buf.append("    public void bar() {\n");
>-			buf.append("        foo()//here\n");
>+			buf.append("        foo();//here\n");
> 			buf.append("    }\n");
> 			buf.append("}\n");
> 			assertEquals(buf.toString(), doc.get());
>@@ -1966,7 +1966,7 @@
> 			buf.append("\n");
> 			buf.append("public class B {\n");
> 			buf.append("    public void bar() {\n");
>-			buf.append("        A.foo()//here\n");
>+			buf.append("        A.foo();//here\n");
> 			buf.append("    }\n");
> 			buf.append("    public void foo(int x) {\n");
> 			buf.append("    }\n");
>diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/MethodInsertionFormattedCompletionTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/MethodInsertionFormattedCompletionTest.java
>index 5e20493..001b583 100644
>--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/MethodInsertionFormattedCompletionTest.java
>+++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/MethodInsertionFormattedCompletionTest.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2011 IBM Corporation and others.
>+ * Copyright (c) 2005, 2013 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -96,7 +96,7 @@
> 	public void testFormattedMethodWithParameterFilling2() throws Exception {
> 		getJDTUIPrefs().setValue(PreferenceConstants.CODEASSIST_FILL_ARGUMENT_NAMES, true);
> 		addMembers("private java.util.List fList;");
>-		assertMethodBodyProposal("fList.", "add(int", "fList.add ( |arg0|, arg1 )");
>+		assertMethodBodyProposal("fList.", "add(int", "fList.add ( |arg0|, arg1 );");
> 	}
> 
> 	public void testFormattedMethodWithParameterGuessing1() throws Exception {
>@@ -114,7 +114,7 @@
> 		addMembers("private java.util.List fList;");
> 		addLocalVariables("int foo= 3; Object obj= null;\n");
> 
>-		assertMethodBodyProposal("fList.", "add(int", "fList.add ( |foo|, obj )");
>+		assertMethodBodyProposal("fList.", "add(int", "fList.add ( |foo|, obj );");
> 	}
> 
> }
>diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/MethodParameterGuessingCompletionTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/MethodParameterGuessingCompletionTest.java
>index 8bdc617..f597bba 100644
>--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/MethodParameterGuessingCompletionTest.java
>+++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/MethodParameterGuessingCompletionTest.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2011 IBM Corporation and others.
>+ * Copyright (c) 2005, 2013 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -46,7 +46,7 @@
> 	}
> 
> 	public void testMethodWithParam2() throws Exception {
>-		assertMethodBodyProposal("fList.", "add(int", "fList.add(|foo|, obj)");
>+		assertMethodBodyProposal("fList.", "add(int", "fList.add(|foo|, obj);");
> 	}
> 
> 	public void testInsertMethodWithParam1() throws Exception {
>@@ -54,7 +54,7 @@
> 	}
> 
> 	public void testInsertMethodWithParam2() throws Exception {
>-		assertMethodBodyProposal("fList.|bar", "add(int", "fList.add(|foo|, obj)bar");
>+		assertMethodBodyProposal("fList.|bar", "add(int", "fList.add(|foo|, obj);bar");
> 	}
> 
> 	public void testOverwriteMethodWithParam1() throws Exception {
>@@ -64,7 +64,7 @@
> 
> 	public void testOverwriteMethodWithParam2() throws Exception {
> 		getJDTUIPrefs().setValue(PreferenceConstants.CODEASSIST_INSERT_COMPLETION, false);
>-		assertMethodBodyProposal("fList.|bar", "add(int", "fList.add(|foo|, obj)");
>+		assertMethodBodyProposal("fList.|bar", "add(int", "fList.add(|foo|, obj);");
> 	}
> 
> }
>diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/MethodParamsCompletionTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/MethodParamsCompletionTest.java
>index ed2c5bc..9f60dde 100644
>--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/MethodParamsCompletionTest.java
>+++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/MethodParamsCompletionTest.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2011 IBM Corporation and others.
>+ * Copyright (c) 2005, 2013 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -44,7 +44,7 @@
> 	}
> 
> 	public void testMethodWithParam2() throws Exception {
>-		assertMethodBodyProposal("fList.", "add(int", "fList.add(|arg0|, arg1)");
>+		assertMethodBodyProposal("fList.", "add(int", "fList.add(|arg0|, arg1);");
> 	}
> 
> 	public void testInsertMethodWithParam1() throws Exception {
>@@ -52,7 +52,7 @@
> 	}
> 
> 	public void testInsertMethodWithParam2() throws Exception {
>-		assertMethodBodyProposal("fList.|bar", "add(int", "fList.add(|arg0|, arg1)bar");
>+		assertMethodBodyProposal("fList.|bar", "add(int", "fList.add(|arg0|, arg1);bar");
> 	}
> 
> 	public void testOverwriteMethodWithParam1() throws Exception {
>@@ -62,7 +62,7 @@
> 
> 	public void testOverwriteMethodWithParam2() throws Exception {
> 		getJDTUIPrefs().setValue(PreferenceConstants.CODEASSIST_INSERT_COMPLETION, false);
>-		assertMethodBodyProposal("fList.|bar", "add(int", "fList.add(|arg0|, arg1)");
>+		assertMethodBodyProposal("fList.|bar", "add(int", "fList.add(|arg0|, arg1);");
> 	}
> 
> }

Flags:

daniel_megert: review+

Actions: View | Diff

Attachments on bug 198508: 228996 | 229083 | 229084 | 229668