Author: tfmorris Date: 2008-10-14 14:06:41-0700 New Revision: 15927 Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLAssociationEndRoleBaseListModel.java trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedClassifierComboBoxModel.java trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedOperationComboBoxModel.java trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLInteractionCollaborationListModel.java trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageActionListModel.java trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageActivatorComboBoxModel.java trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageReceiverListModel.java trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageSenderListModel.java trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLGeneralizationPowertypeComboBoxModel.java trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLModelElementClientDependencyListModel.java trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLStructuralFeatureTypeComboBoxModel.java
Log: Issue 5433: Fix some more Swing model tests to make sure they are synchronized with the Swing/AWT event thread http://argouml.tigris.org/issues/show_bug.cgi?id=5433 Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLAssociationEndRoleBaseListModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLAssociationEndRoleBaseListModel.java?view=diff&rev=15927&p1=trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLAssociationEndRoleBaseListModel.java&p2=trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLAssociationEndRoleBaseListModel.java&r1=15926&r2=15927 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLAssociationEndRoleBaseListModel.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLAssociationEndRoleBaseListModel.java 2008-10-14 14:06:41-0700 @@ -31,6 +31,7 @@ import org.argouml.model.InitializeModel; import org.argouml.model.Model; import org.argouml.uml.ui.UMLModelElementListModel2; +import org.argouml.util.ThreadHelper; /** * @since Oct 27, 2002 @@ -96,7 +97,7 @@ model = new UMLAssociationEndRoleBaseListModel(); model.setTarget(elem); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); } /* @@ -122,9 +123,9 @@ /** * Test setting the Base. */ - public void testAdd() { + public void testAdd() throws Exception { Model.getCollaborationsHelper().setBase(elem, baseEnd); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertEquals(1, model.getSize()); assertEquals(baseEnd, model.get(0)); } @@ -145,10 +146,10 @@ /** * Test removing. */ - public void testRemove() { + public void testRemove() throws Exception { Model.getCollaborationsHelper().setBase(elem, baseEnd); Model.getCollaborationsHelper().setBase(elem, null); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertEquals(0, model.getSize()); } Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedClassifierComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedClassifierComboBoxModel.java?view=diff&rev=15927&p1=trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedClassifierComboBoxModel.java&p2=trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedClassifierComboBoxModel.java&r1=15926&r2=15927 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedClassifierComboBoxModel.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedClassifierComboBoxModel.java 2008-10-14 14:06:41-0700 @@ -33,6 +33,7 @@ import org.argouml.profile.init.InitProfileSubsystem; import org.argouml.ui.targetmanager.TargetEvent; import org.argouml.ui.targetmanager.TargetManager; +import org.argouml.util.ThreadHelper; /** * @since Oct 28, 2002 @@ -42,7 +43,6 @@ extends TestCase { private Object elem; -// private Object oper; private Object clazz; private UMLCollaborationRepresentedClassifierComboBoxModel model; @@ -60,21 +60,23 @@ /* * @see junit.framework.TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); elem = Model.getCollaborationsFactory().createCollaboration(); model = new UMLCollaborationRepresentedClassifierComboBoxModel(); TargetManager.getInstance().setTarget(elem); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); Project p = ProjectManager.getManager().getCurrentProject(); Object m = p.getRoot(); clazz = Model.getCoreFactory().buildClass(m); Model.getCollaborationsHelper().setRepresentedClassifier(elem, clazz); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); /* Simulate a target change. */ model.targetSet(new TargetEvent(this, null, null, new Object[] {elem})); + ThreadHelper.synchronize(); } /* @@ -99,12 +101,12 @@ /** * Test removing the represented operation. */ - public void testExtraRepresentedOperation() { + public void testExtraRepresentedOperation() throws Exception { Object cl2 = Model.getCoreFactory().createClass(); Model.getCollaborationsHelper().setRepresentedClassifier(elem, cl2); /* Simulate a target change. */ model.targetSet(new TargetEvent(this, null, null, new Object[] {elem})); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertEquals(3, model.getSize()); } Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedOperationComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedOperationComboBoxModel.java?view=diff&rev=15927&p1=trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedOperationComboBoxModel.java&p2=trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedOperationComboBoxModel.java&r1=15926&r2=15927 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedOperationComboBoxModel.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedOperationComboBoxModel.java 2008-10-14 14:06:41-0700 @@ -24,6 +24,8 @@ package org.argouml.uml.ui.behavior.collaborations; +import java.lang.reflect.InvocationTargetException; + import junit.framework.TestCase; import org.argouml.model.InitializeModel; @@ -33,6 +35,7 @@ import org.argouml.profile.init.InitProfileSubsystem; import org.argouml.ui.targetmanager.TargetEvent; import org.argouml.ui.targetmanager.TargetManager; +import org.argouml.util.ThreadHelper; /** * @since Oct 29, 2002 @@ -65,7 +68,7 @@ elem = Model.getCollaborationsFactory().createCollaboration(); model = new UMLCollaborationRepresentedOperationComboBoxModel(); TargetManager.getInstance().setTarget(elem); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); Project p = ProjectManager.getManager().getCurrentProject(); Object m = p.getRoot(); @@ -73,9 +76,10 @@ oper = Model.getCoreFactory().createOperation(); Model.getCoreHelper().setOwner(oper, clazz); Model.getCollaborationsHelper().setRepresentedOperation(elem, oper); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); /* Simulate a target change. */ model.targetSet(new TargetEvent(this, null, null, new Object[] {elem})); + ThreadHelper.synchronize(); } /* @@ -102,12 +106,12 @@ /** * Test removing the represented operation. */ - public void testExtraRepresentedOperation() { + public void testExtraRepresentedOperation() throws Exception { Object op = Model.getCoreFactory().createOperation(); Model.getCollaborationsHelper().setRepresentedOperation(elem, op); /* Simulate a target change. */ model.targetSet(new TargetEvent(this, null, null, new Object[] {elem})); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertEquals(3, model.getSize()); } Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLInteractionCollaborationListModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLInteractionCollaborationListModel.java?view=diff&rev=15927&p1=trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLInteractionCollaborationListModel.java&p2=trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLInteractionCollaborationListModel.java&r1=15926&r2=15927 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLInteractionCollaborationListModel.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLInteractionCollaborationListModel.java 2008-10-14 14:06:41-0700 @@ -28,6 +28,7 @@ import org.argouml.model.InitializeModel; import org.argouml.model.Model; +import org.argouml.util.ThreadHelper; /** * @since Oct 30, 2002 @@ -50,6 +51,7 @@ /* * @see junit.framework.TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); InitializeModel.initializeDefault(); @@ -57,12 +59,13 @@ elem = Model.getCollaborationsFactory().createInteraction(); model = new UMLInteractionContextListModel(); model.setTarget(elem); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); } /* * @see junit.framework.TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { super.tearDown(); Model.getUmlFactory().delete(elem); @@ -72,11 +75,11 @@ /** * Test setContext(). */ - public void testSetContext() { + public void testSetContext() throws Exception { Object col = Model.getCollaborationsFactory().createCollaboration(); Model.getCollaborationsHelper().setContext(elem, col); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertEquals(1, model.getSize()); assertEquals(col, model.getElementAt(0)); } @@ -84,12 +87,12 @@ /** * Test setContext(null). */ - public void testRemoveContext() { + public void testRemoveContext() throws Exception { Object col = Model.getCollaborationsFactory().createCollaboration(); Model.getCollaborationsHelper().setContext(elem, col); Model.getCollaborationsHelper().setContext(elem, null); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertEquals(0, model.getSize()); assertTrue(model.isEmpty()); } Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageActionListModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageActionListModel.java?view=diff&rev=15927&p1=trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageActionListModel.java&p2=trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageActionListModel.java&r1=15926&r2=15927 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageActionListModel.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageActionListModel.java 2008-10-14 14:06:41-0700 @@ -28,6 +28,7 @@ import org.argouml.model.InitializeModel; import org.argouml.model.Model; +import org.argouml.util.ThreadHelper; /** * @since Oct 30, 2002 @@ -51,6 +52,7 @@ /* * @see junit.framework.TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); InitializeModel.initializeDefault(); @@ -58,12 +60,13 @@ elem = Model.getCollaborationsFactory().createMessage(); model = new UMLMessageActionListModel(); model.setTarget(elem); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); } /* * @see junit.framework.TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { super.tearDown(); Model.getUmlFactory().delete(elem); @@ -73,11 +76,11 @@ /** * Test setAction(). */ - public void testSetAction() { + public void testSetAction() throws Exception { Object action = Model.getCommonBehaviorFactory().createUninterpretedAction(); Model.getCollaborationsHelper().setAction(elem, action); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertEquals(1, model.getSize()); assertEquals(action, model.getElementAt(0)); } @@ -85,12 +88,12 @@ /** * Test setAction() for removing. */ - public void testRemoveAction() { + public void testRemoveAction() throws Exception { Object action = Model.getCommonBehaviorFactory().createUninterpretedAction(); Model.getCollaborationsHelper().setAction(elem, action); Model.getCollaborationsHelper().setAction(elem, null); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertEquals(0, model.getSize()); assertTrue(model.isEmpty()); } Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageActivatorComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageActivatorComboBoxModel.java?view=diff&rev=15927&p1=trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageActivatorComboBoxModel.java&p2=trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageActivatorComboBoxModel.java&r1=15926&r2=15927 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageActivatorComboBoxModel.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageActivatorComboBoxModel.java 2008-10-14 14:06:41-0700 @@ -29,6 +29,7 @@ import org.argouml.model.Model; import org.argouml.ui.targetmanager.TargetEvent; +import org.argouml.util.ThreadHelper; /** * @since Nov 2, 2002 @@ -67,6 +68,7 @@ /* * @see junit.framework.TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); InitializeModel.initializeDefault(); @@ -87,7 +89,7 @@ model = new UMLMessageActivatorComboBoxModel(); model.targetSet(new TargetEvent(this, "set", new Object[0], new Object[] {elem})); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); } /* @@ -115,9 +117,9 @@ /** * Test setActivator(). */ - public void testSetActivator() { + public void testSetActivator() throws Exception { Model.getCollaborationsHelper().setActivator(elem, activators[0]); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); // One can only do this by changing target, // so let's simulate that: model.targetSet(new TargetEvent(this, @@ -126,15 +128,16 @@ new Object[] { elem, })); + ThreadHelper.synchronize(); assertTrue(model.getSelectedItem() == activators[0]); } /** * Test removing. */ - public void testRemoveBase() { + public void testRemoveBase() throws Exception { Model.getUmlFactory().delete(activators[NO_OF_ELEMENTS - 1]); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertEquals("The element count should have reduced", NO_OF_ELEMENTS - 1, model.getSize()); assertTrue("The model should no longer contain the delete element", Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageReceiverListModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageReceiverListModel.java?view=diff&rev=15927&p1=trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageReceiverListModel.java&p2=trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageReceiverListModel.java&r1=15926&r2=15927 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageReceiverListModel.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageReceiverListModel.java 2008-10-14 14:06:41-0700 @@ -29,6 +29,7 @@ import org.argouml.model.Model; import org.argouml.uml.ui.MockUMLUserInterfaceContainer; +import org.argouml.util.ThreadHelper; /** * @since Oct 30, 2002 @@ -50,6 +51,7 @@ /* * @see junit.framework.TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); InitializeModel.initializeDefault(); @@ -60,12 +62,13 @@ cont.setTarget(elem); model = new UMLMessageReceiverListModel(); model.setTarget(elem); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); } /* * @see junit.framework.TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { super.tearDown(); Model.getUmlFactory().delete(elem); @@ -75,11 +78,11 @@ /** * Test setReceiver(). */ - public void testSetReceiver() { + public void testSetReceiver() throws Exception { Object role = Model.getCollaborationsFactory().createClassifierRole(); Model.getCommonBehaviorHelper().setReceiver(elem, role); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertEquals(1, model.getSize()); assertEquals(role, model.getElementAt(0)); } @@ -87,12 +90,12 @@ /** * Test setReceiver() with null argument. */ - public void testRemoveReceiver() { + public void testRemoveReceiver() throws Exception { Object role = Model.getCollaborationsFactory().createClassifierRole(); Model.getCommonBehaviorHelper().setReceiver(elem, role); Model.getCommonBehaviorHelper().setReceiver(elem, null); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertEquals(0, model.getSize()); assertTrue(model.isEmpty()); } Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageSenderListModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageSenderListModel.java?view=diff&rev=15927&p1=trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageSenderListModel.java&p2=trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageSenderListModel.java&r1=15926&r2=15927 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageSenderListModel.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLMessageSenderListModel.java 2008-10-14 14:06:41-0700 @@ -29,6 +29,7 @@ import org.argouml.model.Model; import org.argouml.uml.ui.MockUMLUserInterfaceContainer; +import org.argouml.util.ThreadHelper; /** * @since Oct 30, 2002 @@ -51,6 +52,7 @@ /* * @see junit.framework.TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); InitializeModel.initializeDefault(); @@ -61,12 +63,13 @@ cont.setTarget(elem); model = new UMLMessageSenderListModel(); model.setTarget(elem); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); } /* * @see junit.framework.TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { super.tearDown(); Model.getUmlFactory().delete(elem); @@ -76,11 +79,11 @@ /** * Test setSender(). */ - public void testSetSender() { + public void testSetSender() throws Exception { Object role = Model.getCollaborationsFactory().createClassifierRole(); Model.getCollaborationsHelper().setSender(elem, role); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertEquals(1, model.getSize()); assertEquals(role, model.getElementAt(0)); } @@ -88,12 +91,12 @@ /** * Test setSender() with null argument. */ - public void testRemoveReceiver() { + public void testRemoveReceiver() throws Exception { Object role = Model.getCollaborationsFactory().createClassifierRole(); Model.getCollaborationsHelper().setSender(elem, role); Model.getCollaborationsHelper().setSender(elem, null); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertEquals(0, model.getSize()); assertTrue(model.isEmpty()); } Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLGeneralizationPowertypeComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLGeneralizationPowertypeComboBoxModel.java?view=diff&rev=15927&p1=trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLGeneralizationPowertypeComboBoxModel.java&p2=trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLGeneralizationPowertypeComboBoxModel.java&r1=15926&r2=15927 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLGeneralizationPowertypeComboBoxModel.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLGeneralizationPowertypeComboBoxModel.java 2008-10-14 14:06:41-0700 @@ -32,6 +32,7 @@ import org.argouml.model.Model; import org.argouml.profile.init.InitProfileSubsystem; import org.argouml.ui.targetmanager.TargetEvent; +import org.argouml.util.ThreadHelper; /** * @since Nov 3, 2002 @@ -91,6 +92,7 @@ /* * @see junit.framework.TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); InitializeModel.initializeDefault(); @@ -116,12 +118,13 @@ types[i] = Model.getCoreFactory().createClass(); Model.getCoreHelper().addOwnedElement(m, types[i]); } - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); } /* * @see junit.framework.TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { super.tearDown(); Model.getUmlFactory().delete(elem); @@ -137,8 +140,8 @@ /** * Test setup. */ - public void testSetUp() { - Model.getPump().flushModelEvents(); + public void testSetUp() throws Exception { + ThreadHelper.synchronize(); assertTrue(model.contains(types[NO_OF_ELEMENTS / 2])); assertTrue(model.contains(types[0])); assertTrue(model.contains(types[NO_OF_ELEMENTS - 1])); @@ -147,10 +150,10 @@ /** * Test setPowertype(). */ - public void testSetPowertype() { + public void testSetPowertype() throws Exception { LOG.info("Setting powertype"); Model.getCoreHelper().setPowertype(elem, types[0]); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); // One can only do this by changing target, // so let's simulate that: model.targetSet(new TargetEvent(this, @@ -159,6 +162,7 @@ new Object[] { elem, })); + ThreadHelper.synchronize(); assertTrue(model.getSelectedItem() == types[0]); LOG.info("Powertype set"); } @@ -166,10 +170,10 @@ /** * Test setPowertype() with null argument. */ - public void testSetPowertypeToNull() { + public void testSetPowertypeToNull() throws Exception { Model.getCoreHelper().setPowertype(elem, types[0]); Model.getCoreHelper().setPowertype(elem, null); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); // One can only do this by changing target, // so let's simulate that: model.targetSet(new TargetEvent(this, @@ -178,15 +182,16 @@ new Object[] { elem, })); + ThreadHelper.synchronize(); assertNull(model.getSelectedItem()); } /** * Test deletion. */ - public void testRemovePowertype() { + public void testRemovePowertype() throws Exception { Model.getUmlFactory().delete(types[NO_OF_ELEMENTS - 1]); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertTrue(!model.contains(types[NO_OF_ELEMENTS - 1])); } Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLModelElementClientDependencyListModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLModelElementClientDependencyListModel.java?view=diff&rev=15927&p1=trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLModelElementClientDependencyListModel.java&p2=trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLModelElementClientDependencyListModel.java&r1=15926&r2=15927 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLModelElementClientDependencyListModel.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLModelElementClientDependencyListModel.java 2008-10-14 14:06:41-0700 @@ -28,6 +28,7 @@ import org.argouml.model.InitializeModel; import org.argouml.model.Model; +import org.argouml.util.ThreadHelper; /** * @since Oct 26, 2002 @@ -66,6 +67,7 @@ /* * @see junit.framework.TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); InitializeModel.initializeDefault(); @@ -73,12 +75,13 @@ elem = Model.getCoreFactory().buildClass(ns); model = new UMLModelElementClientDependencyListModel(); model.setTarget(elem); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); } /* * @see junit.framework.TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { super.tearDown(); Model.getUmlFactory().delete(elem); @@ -89,7 +92,7 @@ /** * Tests the programmatically adding of multiple elements to the list. */ - public void testAddMultiple() { + public void testAddMultiple() throws Exception { Object[] suppliers = new Object[NO_OF_ELEMENTS]; Object[] dependencies = new Object[NO_OF_ELEMENTS]; for (int i = 0; i < NO_OF_ELEMENTS; i++) { @@ -97,7 +100,7 @@ dependencies[i] = Model.getCoreFactory().buildDependency(elem, suppliers[i]); } - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertEquals(NO_OF_ELEMENTS, model.getSize()); assertEquals( model.getElementAt(NO_OF_ELEMENTS / 2), @@ -111,7 +114,7 @@ /** * Test the removal of several elements from the list. */ - public void testRemoveMultiple() { + public void testRemoveMultiple() throws Exception { Object[] suppliers = new Object[NO_OF_ELEMENTS]; Object[] dependencies = new Object[NO_OF_ELEMENTS]; for (int i = 0; i < NO_OF_ELEMENTS; i++) { @@ -122,7 +125,7 @@ for (int i = 0; i < NO_OF_ELEMENTS / 2; i++) { Model.getCoreHelper().removeClientDependency(elem, dependencies[i]); } - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertEquals(NO_OF_ELEMENTS - (NO_OF_ELEMENTS / 2), model.getSize()); assertEquals(dependencies[NO_OF_ELEMENTS / 2], model.getElementAt(0)); } Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLStructuralFeatureTypeComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLStructuralFeatureTypeComboBoxModel.java?view=diff&rev=15927&p1=trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLStructuralFeatureTypeComboBoxModel.java&p2=trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLStructuralFeatureTypeComboBoxModel.java&r1=15926&r2=15927 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLStructuralFeatureTypeComboBoxModel.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/core/TestUMLStructuralFeatureTypeComboBoxModel.java 2008-10-14 14:06:41-0700 @@ -34,6 +34,7 @@ import org.argouml.model.Model; import org.argouml.profile.init.InitProfileSubsystem; import org.argouml.ui.targetmanager.TargetEvent; +import org.argouml.util.ThreadHelper; /** * @since Nov 2, 2002 @@ -74,6 +75,7 @@ /* * @see junit.framework.TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); InitializeModel.initializeDefault(); @@ -98,7 +100,7 @@ Model.getCoreHelper().addOwnedElement(mmodel, types[i]); } Model.getCoreHelper().setType(elem, types[0]); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); } /* @@ -117,8 +119,8 @@ /** * Test the test set up. */ - public void testSetUp() { - Model.getPump().flushModelEvents(); + public void testSetUp() throws Exception { + ThreadHelper.synchronize(); // One can only do this by changing target, // so let's simulate that: changeTarget(); @@ -139,9 +141,9 @@ /** * Test the setType function. */ - public void testSetType() { + public void testSetType() throws Exception { Model.getCoreHelper().setType(elem, types[0]); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); changeTarget(); assertTrue(model.getSelectedItem() == types[0]); } @@ -152,19 +154,19 @@ * the combobox model is changed itself, we test for * a not null value. */ - public void testSetTypeToNull() { + public void testSetTypeToNull() throws Exception { Model.getCoreHelper().setType(elem, types[0]); Model.getCoreHelper().setType(elem, null); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertNotNull(model.getSelectedItem()); } /** * The test for removing types. */ - public void testRemoveType() { + public void testRemoveType() throws Exception { Model.getUmlFactory().delete(types[NO_OF_ELEMENTS - 1]); - Model.getPump().flushModelEvents(); + ThreadHelper.synchronize(); assertTrue(!model.contains(types[NO_OF_ELEMENTS - 1])); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
