1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-23 08:55:25 +02:00

Refactoring of update listener to match debug platform tests.

This commit is contained in:
Pawel Piech 2010-05-24 22:22:42 +00:00
parent 6e50087a2b
commit 43c75ac89f
2 changed files with 21 additions and 10 deletions

View file

@ -53,10 +53,7 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd
fViewer = createViewer(fDisplay, fShell);
fListener = new TestModelUpdatesListener(false, false);
fViewer.addViewerUpdateListener(fListener);
fViewer.addLabelUpdateListener(fListener);
fViewer.addModelChangedListener(fListener);
fListener = new TestModelUpdatesListener(fViewer, false, false);
fModel = new TestModel();
fModel.setRoot( new TestElement(fModel, "root", new TestElement[0] ) );
@ -76,9 +73,7 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd
protected void tearDown() throws Exception {
fVMAdapter.dispose();
fViewer.removeLabelUpdateListener(fListener);
fViewer.removeViewerUpdateListener(fListener);
fViewer.removeModelChangedListener(fListener);
fListener.dispose();
fViewer.getPresentationContext().dispose();
// Close the shell and exit.
fShell.close();

View file

@ -23,6 +23,7 @@ import junit.framework.Assert;
import org.eclipse.cdt.tests.dsf.vm.TestModel.TestElement;
import org.eclipse.debug.internal.ui.viewers.model.ILabelUpdateListener;
import org.eclipse.debug.internal.ui.viewers.model.ITreeModelContentProviderTarget;
import org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenCountUpdate;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IHasChildrenUpdate;
@ -115,6 +116,8 @@ public class TestModelUpdatesListener
};
private final ITreeModelViewer fViewer;
private boolean fFailOnRedundantUpdates;
private boolean fFailOnMultipleModelUpdateSequences;
private boolean fFailOnMultipleLabelUpdateSequences;
@ -136,11 +139,24 @@ public class TestModelUpdatesListener
private long fTimeoutTime;
public TestModelUpdatesListener(boolean failOnRedundantUpdates, boolean failOnMultipleModelUpdateSequences) {
public TestModelUpdatesListener(ITreeModelViewer viewer, boolean failOnRedundantUpdates, boolean failOnMultipleModelUpdateSequences) {
setFailOnRedundantUpdates(failOnRedundantUpdates);
setFailOnMultipleModelUpdateSequences(failOnMultipleModelUpdateSequences);
fViewer = viewer;
fViewer.addLabelUpdateListener(this);
fViewer.addModelChangedListener(this);
fViewer.addStateUpdateListener(this);
fViewer.addViewerUpdateListener(this);
}
public void dispose() {
fViewer.removeLabelUpdateListener(this);
fViewer.removeModelChangedListener(this);
fViewer.removeStateUpdateListener(this);
fViewer.removeViewerUpdateListener(this);
}
public void setFailOnRedundantUpdates(boolean failOnRedundantUpdates) {
fFailOnRedundantUpdates = failOnRedundantUpdates;
}