Attachment 52361 Details for Bug 161674 – Adds new method that allows for multiple expected results and uses it.

[patch] Adds new method that allows for multiple expected results and uses it.

patch.txt (text/plain), 2.31 KB, created by Corey Ashford

on 2006-10-19 21:17:14 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Corey Ashford

Created: 2006-10-19 21:17:14 EDT

Size: 2.31 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core.tests.model
>Index: src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java,v
>retrieving revision 1.171
>diff -u -r1.171 AbstractJavaModelTests.java
>--- src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java	26 Jun 2006 17:16:04 -0000	1.171
>+++ src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java	20 Oct 2006 01:08:58 -0000
>@@ -525,6 +525,19 @@
> 			expected,
> 			actual);
> 	}
>+
>+	protected void assertDeltas(String message, String expected[]) {
>+		String actual = this.deltaListener.toString();
>+		for (int i = 0; i < expected.length; i++) {
>+			// If any one of the expected values matches, we are done
>+			if (expected[i].equals(actual)) return;
>+		}
>+
>+		System.out.println(displayString(actual, 2));
>+		System.err.println(this.deltaListener.stackTraces.toString());
>+		assertTrue(message, false);
>+	}
>+	
> 	protected void assertDeltas(String message, String expected, IJavaElementDelta delta) {
> 		String actual = delta == null ? "<null>" : delta.toString();
> 		if (!expected.equals(actual)) {
>Index: src/org/eclipse/jdt/core/tests/model/ReconcilerTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ReconcilerTests.java,v
>retrieving revision 1.103
>diff -u -r1.103 ReconcilerTests.java
>--- src/org/eclipse/jdt/core/tests/model/ReconcilerTests.java	1 Sep 2006 08:41:14 -0000	1.103
>+++ src/org/eclipse/jdt/core/tests/model/ReconcilerTests.java	20 Oct 2006 01:08:58 -0000
>@@ -1072,12 +1072,15 @@
> 		"public class X {\n" +
> 		"}");
> 	this.workingCopy.reconcile(ICompilationUnit.NO_AST, false, null, null);
>-	assertDeltas(
>-		"Unexpected delta", 
>-		"X[*]: {CHILDREN | FINE GRAINED}\n" +
>-		"	bar()[-]: {}\n" +
>-		"	foo()[-]: {}"
>-	);
>+	
>+	String expectedDeltas[] = {"X[*]: {CHILDREN | FINE GRAINED}\n" +
>+			"	bar()[-]: {}\n" +
>+			"	foo()[-]: {}", "X[*]: {CHILDREN | FINE GRAINED}\n" +
>+			"	foo()[-]: {}\n" +
>+			"	bar()[-]: {}"};
>+	
>+	assertDeltas("Unexpected delta", expectedDeltas);
>+	
> }
> /*
>  * Ensures that excluded part of prereq project are not visible

Actions: View | Diff

Attachments on bug 161674: 52361