Author: tfmorris Date: 2008-11-08 08:27:52-0800 New Revision: 15990 Modified: trunk/src/argouml-app/tests/org/argouml/ui/GUITestProjectBrowser.java trunk/src/argouml-app/tests/org/argouml/uml/ui/AbstractUMLModelElementListModel2Test.java
Log: Sync to AWT thread for things which may happen asynchronously. Should have been committed with previous batch of updates to tests. Modified: trunk/src/argouml-app/tests/org/argouml/ui/GUITestProjectBrowser.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/ui/GUITestProjectBrowser.java?view=diff&rev=15990&p1=trunk/src/argouml-app/tests/org/argouml/ui/GUITestProjectBrowser.java&p2=trunk/src/argouml-app/tests/org/argouml/ui/GUITestProjectBrowser.java&r1=15989&r2=15990 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/ui/GUITestProjectBrowser.java (original) +++ trunk/src/argouml-app/tests/org/argouml/ui/GUITestProjectBrowser.java 2008-11-08 08:27:52-0800 @@ -39,6 +39,7 @@ import org.argouml.ui.cmd.ActionNew; import org.argouml.ui.targetmanager.TargetManager; import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram; +import org.argouml.util.ThreadHelper; /** * Testing the ProjectBrowser. @@ -117,7 +118,7 @@ /** * Testing the setTarget method in ProjectBrowser. */ - public void testSetTarget() { + public void testSetTarget() throws Exception { Project p = ProjectManager.getManager().getCurrentProject(); Object package1 = Model.getModelManagementFactory().buildPackage("test1"); @@ -137,9 +138,10 @@ assertEquals("Diagram2 should be the target", diagram2, tm.getTarget()); p.moveToTrash(package2); - Model.getPump().flushModelEvents(); - assertEquals("The target is not reset to the first diagram", - p.getDiagramList().get(0), tm.getTarget()); + ThreadHelper.synchronize(); + + assertEquals("The target is not reset to the first diagram", + p.getDiagramList().get(0), tm.getTarget()); } /** Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/AbstractUMLModelElementListModel2Test.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/AbstractUMLModelElementListModel2Test.java?view=diff&rev=15990&p1=trunk/src/argouml-app/tests/org/argouml/uml/ui/AbstractUMLModelElementListModel2Test.java&p2=trunk/src/argouml-app/tests/org/argouml/uml/ui/AbstractUMLModelElementListModel2Test.java&r1=15989&r2=15990 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/ui/AbstractUMLModelElementListModel2Test.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/ui/AbstractUMLModelElementListModel2Test.java 2008-11-08 08:27:52-0800 @@ -1,5 +1,5 @@ // $Id$ -// Copyright (c) 1996-2007 The Regents of the University of California. All +// Copyright (c) 1996-2008 The Regents of the University of California. All // Rights Reserved. Permission to use, copy, modify, and distribute this // software and its documentation without fee, and without a written // agreement is hereby granted, provided that the above copyright notice @@ -28,6 +28,7 @@ import org.argouml.model.InitializeModel; import org.argouml.model.Model; +import org.argouml.util.ThreadHelper; /** * An abstract class that serves as a basis for testing listmodels. Only works @@ -61,7 +62,7 @@ //MFactoryImpl.setEventPolicy(MFactoryImpl.EVENT_POLICY_IMMEDIATE); buildModel(); model.setTarget(elem); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); } /** @@ -92,9 +93,9 @@ /** * Tests the programmatically adding of multiple elements to the list. */ - public void testAddMultiple() { + public void testAddMultiple() throws Exception { Object[] elements = fillModel(); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertEquals(10, model.getSize()); assertEquals(model.getElementAt(5), elements[5]); assertEquals(model.getElementAt(0), elements[0]); @@ -113,11 +114,11 @@ /** * Test the removal of several elements from the list. */ - public void testRemoveMultiple() { + public void testRemoveMultiple() throws Exception { Object[] elements = fillModel(); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); removeHalfModel(elements); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertEquals(5, model.getSize()); assertEquals(elements[5], model.getElementAt(0)); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
