Attachment 42137 Details for Bug 129929 – proposed fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] proposed fix

fix_129929.txt (text/plain), 3.05 KB, created by Benno Baumgartner

on 2006-05-22 06:34:11 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Benno Baumgartner

Created: 2006-05-22 06:34:11 EDT

Size: 3.05 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.junit
>Index: src/org/eclipse/jdt/internal/junit/model/TestSuiteElement.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/model/TestSuiteElement.java,v
>retrieving revision 1.5
>diff -u -r1.5 TestSuiteElement.java
>--- src/org/eclipse/jdt/internal/junit/model/TestSuiteElement.java	5 May 2006 15:01:44 -0000	1.5
>+++ src/org/eclipse/jdt/internal/junit/model/TestSuiteElement.java	22 May 2006 10:36:10 -0000
>@@ -18,21 +18,24 @@
> public class TestSuiteElement extends TestElement {
> 	
> 	private List/*<TestElement>*/ fChildren;
>+	private Status fSuiteStatus;
> 	
> 	public TestSuiteElement(TestSuiteElement parent, String id, String testName, int childrenCount) {
> 		super(parent, id, testName);
>+		fSuiteStatus= getStatus();
> 		fChildren= new ArrayList(childrenCount);
> 	}
> 
> 	public void addChild(TestElement child) {
> 		fChildren.add(child);
>+		setStatus(internalGetStatus());
> 	}
> 	
> 	public TestElement[] getChildren() {
> 		return (TestElement[]) fChildren.toArray(new TestElement[fChildren.size()]);
> 	}
> 	
>-	public Status getStatus() {
>+	private Status internalGetStatus() {
> 		//TODO: Cache failure count in hierarchy? Recheck behavior when introducing filters
> 		Status suiteStatus= getSuiteStatus();
> //		Assert.isTrue(suiteStatus.isNotRun()
>@@ -55,11 +58,15 @@
> 	}
> 
> 	public Status getSuiteStatus() {
>-		return super.getStatus();
>+		return fSuiteStatus;
> 	}
> 	
> 	public String toString() {
> 		return super.toString() + " (" + fChildren.size() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
> 	}
> 
>+	public void childChangedStatus(TestElement child, Status newStatus) {
>+		setStatus(internalGetStatus());
>+	}
>+
> }
>Index: src/org/eclipse/jdt/internal/junit/model/TestElement.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/model/TestElement.java,v
>retrieving revision 1.8
>diff -u -r1.8 TestElement.java
>--- src/org/eclipse/jdt/internal/junit/model/TestElement.java	5 May 2006 16:09:34 -0000	1.8
>+++ src/org/eclipse/jdt/internal/junit/model/TestElement.java	22 May 2006 10:36:10 -0000
>@@ -155,9 +155,9 @@
> 		fParent= parent;
> 		fId= id;
> 		fTestName= testName;
>+		fStatus= Status.NOT_RUN;
> 		if (parent != null)
> 			parent.addChild(this);
>-		fStatus= Status.NOT_RUN;
> 	}
> 	
> 	/**
>@@ -183,6 +183,9 @@
> 		//TODO: notify about change?
> 		//TODO: multiple errors/failures per test https://bugs.eclipse.org/bugs/show_bug.cgi?id=125296
> 		fStatus= status;
>+		TestSuiteElement parent= getParent();
>+		if (parent != null)
>+			parent.childChangedStatus(this, status);
> 	}
> 	
> 	public void setStatus(Status status, String trace, String expected, String actual) {
>@@ -192,6 +195,9 @@
> 		fTrace= trace;
> 		fExpected= expected;
> 		fActual= actual;
>+		TestSuiteElement parent= getParent();
>+		if (parent != null)
>+			parent.childChangedStatus(this, status);
> 	}
> 
> 	public Status getStatus() {

Actions: View | Diff

Attachments on bug 129929: 42042 | 42137 | 42277 | 42878