From fb278b35664600b2f81aa2abb4b542e31e103e25 Mon Sep 17 00:00:00 2001 From: Daniel_M_Williams Date: Mon, 14 Dec 2015 20:13:51 -0500 Subject: [PATCH] fixed FinSetTest --- core/src/net/sf/openrocket/rocketcomponent/Rocket.java | 5 +---- core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java index 407d4032a..fb31d9e17 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java +++ b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java @@ -432,10 +432,7 @@ public class Rocket extends RocketComponent { freezeList.add(cce); return; } - - if( -1 == cce.getType()){ - log.debug(">>fireComponentChangeEvent()>> . . ."); - } + // Notify all components first Iterator iterator = this.iterator(true); while (iterator.hasNext()) { diff --git a/core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java b/core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java index b568dc32e..7c083bbd3 100644 --- a/core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java +++ b/core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java @@ -257,12 +257,13 @@ public class FinSetTest extends BaseTestCase { rocket.addChild(stage); stage.addChild(body); body.addChild(fin); + rocket.enableEvents(); Listener l1 = new Listener("l1"); rocket.addComponentChangeListener(l1); fin.setName("Custom name"); - assertTrue(l1.changed); + assertEquals("FinSet listener has not been notified: ", l1.changed, true); assertEquals(ComponentChangeEvent.NONFUNCTIONAL_CHANGE, l1.changetype); @@ -275,7 +276,7 @@ public class FinSetTest extends BaseTestCase { FinSet fincopy = (FinSet) rocketcopy.getChild(0).getChild(0).getChild(0); FreeformFinSet.convertFinSet(fincopy); - assertTrue(l2.changed); + assertTrue("FinSet listener is changed", l2.changed); assertEquals(ComponentChangeEvent.TREE_CHANGE, l2.changetype & ComponentChangeEvent.TREE_CHANGE);