diff options
| author | Pawel Piech | 2012-10-08 16:29:53 +0000 |
|---|---|---|
| committer | Pawel Piech | 2012-10-08 16:30:13 +0000 |
| commit | d6a02af9bf146e8096b0ba5fea9b022946f12e69 (patch) | |
| tree | 3a3f93963dea37e1b29d3098110394e0de81a169 /org.eclipse.debug.tests | |
| parent | edfab47671de30ab12d17294cb58ff12f3e7b4c4 (diff) | |
| download | eclipse.platform.debug-d6a02af9bf146e8096b0ba5fea9b022946f12e69.tar.gz eclipse.platform.debug-d6a02af9bf146e8096b0ba5fea9b022946f12e69.tar.xz eclipse.platform.debug-d6a02af9bf146e8096b0ba5fea9b022946f12e69.zip | |
Bug 390052 - VirtualViewerFilterTests.testREfreshToUnfilterElementsWithMixedFilters test times out on Windows 7v20121008-163013
Diffstat (limited to 'org.eclipse.debug.tests')
| -rw-r--r-- | org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModelUpdatesListener.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModelUpdatesListener.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModelUpdatesListener.java index 11d6f9cad..1a1f66c4c 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModelUpdatesListener.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModelUpdatesListener.java @@ -457,7 +457,8 @@ public class TestModelUpdatesListener } if ( (flags & LABEL_SEQUENCE_COMPLETE) != 0) { - if (fLabelUpdatesComplete == fLabelUpdatesCompleteAtReset) return false; + if (fLabelUpdatesComplete == fLabelUpdatesCompleteAtReset || + fLabelUpdatesComplete != fLabelUpdatesStarted) return false; } if ( (flags & LABEL_SEQUENCE_STARTED) != 0) { if (fLabelUpdatesStarted == fLabelUpdatesStartedAtReset) return false; @@ -469,7 +470,8 @@ public class TestModelUpdatesListener if (fViewerUpdatesStarted == fViewerUpdatesStartedAtReset) return false; } if ( (flags & CONTENT_SEQUENCE_COMPLETE) != 0) { - if (fViewerUpdatesComplete == fViewerUpdatesCompleteAtReset) return false; + if (fViewerUpdatesComplete == fViewerUpdatesCompleteAtReset || + fViewerUpdatesStarted != fViewerUpdatesComplete) return false; } if ( (flags & HAS_CHILDREN_UPDATES_STARTED) != 0) { if (fHasChildrenUpdatesRunning.isEmpty() && fHasChildrenUpdatesCompleted.isEmpty()) return false; @@ -731,6 +733,9 @@ public class TestModelUpdatesListener if ( (flags & LABEL_SEQUENCE_COMPLETE) != 0) { buf.append("\n\t"); buf.append("fLabelUpdatesComplete = " + fLabelUpdatesComplete); + buf.append("\n\t"); + buf.append("fLabelUpdatesCompleteAtReset = "); + buf.append( fLabelUpdatesCompleteAtReset ); } if ( (flags & LABEL_UPDATES_RUNNING) != 0) { buf.append("\n\t"); @@ -758,6 +763,8 @@ public class TestModelUpdatesListener if ( (flags & CONTENT_SEQUENCE_COMPLETE) != 0) { buf.append("\n\t"); buf.append("fViewerUpdatesComplete = " + fViewerUpdatesComplete); + buf.append("\n\t"); + buf.append("fViewerUpdatesCompleteAtReset = " + fViewerUpdatesCompleteAtReset); } if ( (flags & HAS_CHILDREN_UPDATES_STARTED) != 0) { buf.append("\n\t"); |