Author: scabanovich Date: 2008-04-07 07:58:46 -0400 (Mon, 07 Apr 2008) New Revision: 7378 Modified: trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/MetaModelTest.java Log: JBIDE-893 Modified: trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/MetaModelTest.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/MetaModelTest.java 2008-04-07 11:37:37 UTC (rev 7377) +++ trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/MetaModelTest.java 2008-04-07 11:58:46 UTC (rev 7378) @@ -28,6 +28,7 @@ import org.jboss.tools.common.meta.impl.XModelEntityImpl; import org.jboss.tools.common.meta.impl.XModelMetaDataImpl; import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.engines.impl.EnginesLoader; import org.jboss.tools.common.model.event.XModelTreeEvent; @@ -336,7 +337,11 @@ XModelObjectLoaderUtil.setTempBody(object2, body); loader.load(object2); MergeListener m = new MergeListener(model); - EnginesLoader.merge(object, object2); + try { + EnginesLoader.merge(object, object2); + } catch (XModelException e) { + fail(e.getMessage()); + } m.dispose(); if(!m.equal) { errors++;