diff options
| author | Laurent Redor | 2016-02-12 15:49:42 +0000 |
|---|---|---|
| committer | Laurent Redor | 2016-02-12 15:52:50 +0000 |
| commit | ad1e732e67182121d4dee188e330fd3f92cc8f10 (patch) | |
| tree | 01b2720ff17493dd2b2c337bc635dff66d16dda4 | |
| parent | dd0347e3b23ecc5932e50de55ab2a6f59f0f41d9 (diff) | |
| download | org.eclipse.sirius-ad1e732e67182121d4dee188e330fd3f92cc8f10.tar.gz org.eclipse.sirius-ad1e732e67182121d4dee188e330fd3f92cc8f10.tar.xz org.eclipse.sirius-ad1e732e67182121d4dee188e330fd3f92cc8f10.zip | |
[486330] Update unreliable DAnalysisSessionTests
The test DAnalysisSessionTests.testWarmup() is unreliable. Indeed,
sometimes, the description found for "OCL Class Diagram" is a proxy (get
in "Viewpoint proxy" of the VSM resource made by doCleanup() call).
Fix:
* A clean of the viewpoints list has been made in doCleanup().
* The viewpoints list has been transformed in LinkedHashSet to avoid
other unreliable tests with this list.
Bug: 486330
Change-Id: Ie42965790e47b5b6d5053a267e8072318eead885
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
2 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.sirius.tests.junit.support/src/org/eclipse/sirius/tests/support/api/SiriusTestCase.java b/plugins/org.eclipse.sirius.tests.junit.support/src/org/eclipse/sirius/tests/support/api/SiriusTestCase.java index 481f99d141..ce8a328dac 100644 --- a/plugins/org.eclipse.sirius.tests.junit.support/src/org/eclipse/sirius/tests/support/api/SiriusTestCase.java +++ b/plugins/org.eclipse.sirius.tests.junit.support/src/org/eclipse/sirius/tests/support/api/SiriusTestCase.java @@ -184,7 +184,7 @@ public abstract class SiriusTestCase extends TestCase { /** * Registered viewpoints. */ - protected final Set<Viewpoint> viewpoints = new HashSet<Viewpoint>(); + protected final Set<Viewpoint> viewpoints = new LinkedHashSet<Viewpoint>(); /** * The viewpoint selection callback to use. diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/session/DAnalysisSessionTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/session/DAnalysisSessionTests.java index ea42700949..01f71ae22f 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/session/DAnalysisSessionTests.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/session/DAnalysisSessionTests.java @@ -238,6 +238,7 @@ public class DAnalysisSessionTests extends SiriusDiagramTestCase { } representations = new ArrayList<DRepresentation>(); editors = new ArrayList<IEditorPart>(); + viewpoints.clear(); } private void doCloseSession() { |