Author: objectiser Date: 2008-10-01 08:20:37 -0400 (Wed, 01 Oct 2008) New Revision: 356 Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/AbstractESBModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationInteractionModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/IfModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ParallelModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/RunModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/SpawnModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhenModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhileModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationInteractionModelChangeRuleTest.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/RunModelChangeRuleTest.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/SpawnModelChangeRuleTest.java Log: Enable delete resolution for run, spawn and conversation interaction. Currently issue with deleting grouping constructs, as it will be necessary to identify the scope of the contained paths. Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/AbstractESBModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/AbstractESBModelChangeRule.java 2008-09-30 15:53:47 UTC (rev 355) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/AbstractESBModelChangeRule.java 2008-10-01 12:20:37 UTC (rev 356) @@ -19,6 +19,7 @@ import org.jboss.tools.overlord.cdl.jbossesb.model.*; import org.jboss.tools.overlord.cdl.jbossesb.model.actions.*; +import org.scribble.conversation.model.ConversationInteraction; import org.scribble.model.*; import org.scribble.model.change.*; @@ -74,14 +75,14 @@ } /** - * This method determines the insertion position based on the - * supplied service and optional reference model object. + * This method determines the position of the supplied + * model object within the supplied service. * * @param service The service - * @param ref The optional reference model object - * @return The position, or -1 if at end + * @param ref The optional model object + * @return The position, or -1 if not found */ - protected int getInsertionPosition(ESBService service, ModelObject ref) { + protected int getPosition(ESBService service, ModelObject ref) { int ret=-1; // Check if reference model object provided, and if so, @@ -119,4 +120,54 @@ return(ret); } + + /** + * This method determines whether the rule is appropriate + * for the supplied type of model, parent (in the context) + * and deleted model object. + * + * @param context The context + * @param model The model + * @param mobj The model object to be removed + * @return Whether the rule supports the supplied information + */ + @Override + public boolean isDeleteSupported(ModelChangeContext context, + Model model, ModelObject mobj) { + boolean ret=false; + + if (mobj.getSource().getObject() instanceof AbstractESBAction && + (context.getParent() instanceof ESBService || + ((AbstractESBAction)mobj.getSource().getObject()).getService() != null) && + model instanceof ESBLanguageModel) { + ret = true; + } + + return(ret); + } + + /** + * This method removes the supplied model object from the + * supplied model. The model object representation must + * contain the necessary model specific to remove the + * object from the underlying model representation. + * + * @param context The context + * @param model The model being changed + * @param mobj The model object to be deleted + * @return Whether the change has been applied + */ + @Override + public boolean delete(ModelChangeContext context, + Model model, ModelObject mobj) { + boolean ret=false; + ESBService service=getESBService(context, mobj); + ESBAction action=(ESBAction)mobj.getSource().getObject(); + + if (action != null && service != null) { + ret = service.getActions().remove(action); + } + + return(ret); + } } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationInteractionModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationInteractionModelChangeRule.java 2008-09-30 15:53:47 UTC (rev 355) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationInteractionModelChangeRule.java 2008-10-01 12:20:37 UTC (rev 356) @@ -124,7 +124,7 @@ // Check if reference model object provided, and if so, // if it has a position within the service - int pos=getInsertionPosition(service, ref); + int pos=getPosition(service, ref); // Check if subsequent action(s) are initiators if (pos != -1) { @@ -256,7 +256,7 @@ // Check if reference model object provided, and if so, // if it has a position within the service - int pos=getInsertionPosition(service, ref); + int pos=getPosition(service, ref); // Check if subsequent action(s) are initiators if (pos != -1) { @@ -527,4 +527,27 @@ action.setMessageType(mtype); } } + + /** + * This method determines whether the rule is appropriate + * for the supplied type of model, parent (in the context) + * and deleted model object. + * + * @param context The context + * @param model The model + * @param mobj The model object to be removed + * @return Whether the rule supports the supplied information + */ + @Override + public boolean isDeleteSupported(ModelChangeContext context, + Model model, ModelObject mobj) { + boolean ret=false; + + if (mobj instanceof ConversationInteraction && + super.isDeleteSupported(context, model, mobj)) { + ret = true; + } + + return(ret); + } } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/IfModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/IfModelChangeRule.java 2008-09-30 15:53:47 UTC (rev 355) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/IfModelChangeRule.java 2008-10-01 12:20:37 UTC (rev 356) @@ -93,7 +93,7 @@ ESBService service=getESBService(context, ref); If ifElem=(If)mobj; - int pos=getInsertionPosition(service, ref); + int pos=getPosition(service, ref); ESBService joinService= esbModel.createService(service.getCategory(), @@ -411,6 +411,6 @@ ((Conversation)ifElem.getEnclosingDefinition()))); } } - + private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.model.change"); } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ParallelModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ParallelModelChangeRule.java 2008-09-30 15:53:47 UTC (rev 355) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ParallelModelChangeRule.java 2008-10-01 12:20:37 UTC (rev 356) @@ -92,7 +92,7 @@ ESBService service=getESBService(context, ref); Parallel parallel=(Parallel)mobj; - int pos=getInsertionPosition(service, ref); + int pos=getPosition(service, ref); // Create the join service ESBService joinService= Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/RunModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/RunModelChangeRule.java 2008-09-30 15:53:47 UTC (rev 355) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/RunModelChangeRule.java 2008-10-01 12:20:37 UTC (rev 356) @@ -92,7 +92,7 @@ ESBService service=getESBService(context, ref); Run run=(Run)mobj; - int pos=getInsertionPosition(service, ref); + int pos=getPosition(service, ref); PerformAction action=new PerformAction(service); @@ -137,5 +137,65 @@ return(true); } + /** + * This method determines whether the rule is appropriate + * for the supplied type of model, parent (in the context) + * and deleted model object. + * + * @param context The context + * @param model The model + * @param mobj The model object to be removed + * @return Whether the rule supports the supplied information + */ + @Override + public boolean isDeleteSupported(ModelChangeContext context, + Model model, ModelObject mobj) { + boolean ret=false; + + if (mobj instanceof Run && + super.isDeleteSupported(context, model, mobj)) { + ret = true; + } + + return(ret); + } + + /** + * This method removes the supplied model object from the + * supplied model. The model object representation must + * contain the necessary model specific to remove the + * object from the underlying model representation. + * + * @param context The context + * @param model The model being changed + * @param mobj The model object to be deleted + * @return Whether the change has been applied + */ + @Override + public boolean delete(ModelChangeContext context, + Model model, ModelObject mobj) { + boolean ret=false; + ESBService service=getESBService(context, mobj); + ESBAction action=(ESBAction)mobj.getSource().getObject(); + + int pos=getPosition(service, mobj); + + if (action instanceof PerformAction && pos != -1) { + ScheduleStateAction schedule= + new ScheduleStateAction(service); + + PerformAction perform=(PerformAction)action; + + schedule.setDestination(perform.getPropertyValue(PerformAction.RETURN_SERVICE_CATEGORY), + perform.getPropertyValue(PerformAction.RETURN_SERVICE_NAME), true); + + service.addAction(schedule, pos); + + ret = super.delete(context, model, mobj); + } + + return(ret); + } + private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.model.change"); } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/SpawnModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/SpawnModelChangeRule.java 2008-09-30 15:53:47 UTC (rev 355) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/SpawnModelChangeRule.java 2008-10-01 12:20:37 UTC (rev 356) @@ -90,7 +90,7 @@ ESBService service=getESBService(context, ref); Spawn spawn=(Spawn)mobj; - int pos=getInsertionPosition(service, ref); + int pos=getPosition(service, ref); PerformAction action=new PerformAction(service); @@ -111,5 +111,28 @@ return(true); } + /** + * This method determines whether the rule is appropriate + * for the supplied type of model, parent (in the context) + * and deleted model object. + * + * @param context The context + * @param model The model + * @param mobj The model object to be removed + * @return Whether the rule supports the supplied information + */ + @Override + public boolean isDeleteSupported(ModelChangeContext context, + Model model, ModelObject mobj) { + boolean ret=false; + + if (mobj instanceof Spawn && + super.isDeleteSupported(context, model, mobj)) { + ret = true; + } + + return(ret); + } + //private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.model.change"); } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhenModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhenModelChangeRule.java 2008-09-30 15:53:47 UTC (rev 355) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhenModelChangeRule.java 2008-10-01 12:20:37 UTC (rev 356) @@ -92,7 +92,7 @@ ESBService service=getESBService(context, ref); When when=(When)mobj; - int pos=getInsertionPosition(service, ref); + int pos=getPosition(service, ref); // Create join service ESBService joinService= Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhileModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhileModelChangeRule.java 2008-09-30 15:53:47 UTC (rev 355) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhileModelChangeRule.java 2008-10-01 12:20:37 UTC (rev 356) @@ -93,7 +93,7 @@ ESBService original=service; While whileElem=(While)mobj; - int pos=getInsertionPosition(service, ref); + int pos=getPosition(service, ref); // Check if action needs to be placed in new service // descriptor - i.e. if insert at end, but current service Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationInteractionModelChangeRuleTest.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationInteractionModelChangeRuleTest.java 2008-09-30 15:53:47 UTC (rev 355) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationInteractionModelChangeRuleTest.java 2008-10-01 12:20:37 UTC (rev 356) @@ -1549,4 +1549,299 @@ fail("Route message type has not been updated"); } } + + public void testDeleteMiddleReceiveBetweenTwoActions() { + ConversationInteractionModelChangeRule rule=new ConversationInteractionModelChangeRule(); + + TestESBLanguageModel model=new TestESBLanguageModel(); + + TestESBService service=(TestESBService) + model.createService("testcategory", "testname"); + + model.addService(service); + + TestESBAction act1=new TestESBAction(); + act1.setInitiator(true); + act1.setSessionBased(true); + service.addAction(act1, -1); + + // Add gateway service + TestESBService gwservice=(TestESBService) + model.createService("testcategory", "gateway"); + gwservice.setGateway(true); + + MessageRouterAction mra=new MessageRouterAction(gwservice); + gwservice.setGatewayAction(mra); + + model.setGatewayService(gwservice); + + + TestModelChangeContext context=new TestModelChangeContext(); + context.setParent(service); + + Role role=new Role(); + role.setName("role1"); + + context.setRole(role); + + Conversation conv=new Conversation(); + ModelName mname=new ModelName(); + mname.setLocatedRole(role); + conv.setModelName(mname); + + ConversationInteraction mobj1=new ConversationInteraction(); + mobj1.setToRole(role); + conv.getBlock().getContents().add(mobj1); + + MessageSignature msig1=new MessageSignature(); + mobj1.setMessageSignature(msig1); + + TypeReference ref1=new TypeReference(); + ref1.setNamespace("ns"); + ref1.setLocalpart("lp1"); + + msig1.getTypes().add(ref1); + + if (rule.insert(context, model, mobj1, null) == false) { + fail("Failed to insert 1"); + } + + // Once first interaction associated with service it + // will become session based + service.setSessionBased(true); + + TestESBAction act2=new TestESBAction(); + ((ESBService)context.getParent()).addAction(act2, -1); + + // Check actions + if (service.getActions().size() != 2) { + fail("Expecting 2 actions: "+service.getActions().size()); + } + + if (service.getActions().get(0) != act1) { + fail("Action 1 was not test ESB action: "+service.getActions().get(0)); + } + + if ((service.getActions().get(1) instanceof ScheduleStateAction) == false) { + fail("Action 2 was not ScheduleStateAction: "+service.getActions().get(1)); + } + + if (model.getServices().size() != 2) { + fail("Two services expected: "+model.getServices().size()); + } + + ESBService newService=null; + java.util.Iterator<ESBService> iter=model.getServices().iterator(); + while (newService == null && iter.hasNext()) { + ESBService s=iter.next(); + + if (s != service) { + newService = s; + } + } + + if (newService == null) { + fail("Other service not found"); + } + + ((TestESBService)newService).setSessionBased(true); + + // Check schedule details + ScheduleStateAction schedule=(ScheduleStateAction) + service.getActions().get(1); + + if (newService.getCategory().equals(schedule.getPropertyValue( + ScheduleStateAction.SERVICE_CATEGORY)) == false) { + fail("Schedule service category '"+ + schedule.getPropertyValue( + ScheduleStateAction.SERVICE_CATEGORY)+ + "' invalid, expecting: "+ + service.getCategory()); + } + + if (newService.getName().equals(schedule.getPropertyValue( + ScheduleStateAction.SERVICE_NAME)) == false) { + fail("Schedule service name '"+ + schedule.getPropertyValue( + ScheduleStateAction.SERVICE_NAME)+ + "' invalid, expecting: "+ + service.getName()); + } + + // Check actions + if (newService.getActions().size() != 2) { + fail("Expecting 2 actions: "+newService.getActions().size()); + } + + if ((newService.getActions().get(0) instanceof ReceiveMessageAction) == false) { + fail("Action 1 was not ReceiveMessageAction: "+newService.getActions().get(0)); + } + + if (newService.getActions().get(1) != act2) { + fail("Action 2 was not 2nd test ESB action: "+newService.getActions().get(1)); + } + + ReceiveMessageAction recv=(ReceiveMessageAction) + newService.getActions().get(0); + + + java.util.List<Activity> acts=new java.util.Vector<Activity>(); + + DefaultConversionContext convContext=new DefaultConversionContext(role.getName()); + recv.convert(acts, convContext); + + if (acts.size() != 1) { + fail("Expecting 1 activity: "+acts.size()); + } + + // TODO: Need to pass representation of last interaction + if (rule.delete(context, model, acts.get(0)) == false) { + fail("Failed to delete receive"); + } + + // Re-Check actions + if (service.getActions().size() != 2) { + fail("Expecting 2 actions: "+service.getActions().size()); + } + + if (service.getActions().get(0) != act1) { + fail("Action 1 was not test ESB action: "+service.getActions().get(0)); + } + + if ((service.getActions().get(1) instanceof ScheduleStateAction) == false) { + fail("Action 2 was not ScheduleStateAction: "+service.getActions().get(1)); + } + + if (model.getServices().size() != 2) { + fail("Two services expected: "+model.getServices().size()); + } + + // TODO: Need to check if new service has been inserted + // in the middle of the previously inserted interactions + + // Check actions + if (newService.getActions().size() != 1) { + fail("Now Expecting 1 action: "+newService.getActions().size()); + } + + if (newService.getActions().get(0) != act2) { + fail("Action 1 was not 2nd test ESB action: "+newService.getActions().get(0)); + } + } + + public void testDeleteMiddleSendBetweenTwoActions() { + ConversationInteractionModelChangeRule rule=new ConversationInteractionModelChangeRule(); + + TestESBLanguageModel model=new TestESBLanguageModel(); + + TestESBService service=(TestESBService) + model.createService("testcategory", "testname"); + + model.addService(service); + + TestESBAction act1=new TestESBAction(); + act1.setInitiator(true); + act1.setSessionBased(true); + service.addAction(act1, -1); + + // Add gateway service + TestESBService gwservice=(TestESBService) + model.createService("testcategory", "gateway"); + gwservice.setGateway(true); + + MessageRouterAction mra=new MessageRouterAction(gwservice); + gwservice.setGatewayAction(mra); + + model.setGatewayService(gwservice); + + + TestModelChangeContext context=new TestModelChangeContext(); + context.setParent(service); + + Role role=new Role(); + role.setName("role1"); + + context.setRole(role); + + Conversation conv=new Conversation(); + ModelName mname=new ModelName(); + mname.setLocatedRole(role); + conv.setModelName(mname); + + ConversationInteraction mobj1=new ConversationInteraction(); + mobj1.setFromRole(role); + conv.getBlock().getContents().add(mobj1); + + MessageSignature msig1=new MessageSignature(); + mobj1.setMessageSignature(msig1); + + TypeReference ref1=new TypeReference(); + ref1.setNamespace("ns"); + ref1.setLocalpart("lp1"); + + msig1.getTypes().add(ref1); + + if (rule.insert(context, model, mobj1, null) == false) { + fail("Failed to insert 1"); + } + + // Once first interaction associated with service it + // will become session based + service.setSessionBased(true); + + TestESBAction act2=new TestESBAction(); + ((ESBService)context.getParent()).addAction(act2, -1); + + // Check actions + if (service.getActions().size() != 3) { + fail("Expecting 2 actions: "+service.getActions().size()); + } + + if (service.getActions().get(0) != act1) { + fail("Action 1 was not test ESB action: "+service.getActions().get(0)); + } + + if ((service.getActions().get(1) instanceof SendMessageAction) == false) { + fail("Action 2 was not SendMessageAction: "+service.getActions().get(1)); + } + + if (service.getActions().get(2) != act2) { + fail("Action 3 was not 2nd test ESB action: "+service.getActions().get(2)); + } + + if (model.getServices().size() != 1) { + fail("One service expected: "+model.getServices().size()); + } + + + SendMessageAction send=(SendMessageAction) + service.getActions().get(1); + + java.util.List<Activity> acts=new java.util.Vector<Activity>(); + + DefaultConversionContext convContext=new DefaultConversionContext(role.getName()); + send.convert(acts, convContext); + + if (acts.size() != 1) { + fail("Expecting 1 activity: "+acts.size()); + } + + // TODO: Need to pass representation of last interaction + if (rule.delete(context, model, acts.get(0)) == false) { + fail("Failed to delete send"); + } + + // Re-Check actions + if (service.getActions().size() != 2) { + fail("Expecting 2 actions: "+service.getActions().size()); + } + + if (service.getActions().get(0) != act1) { + fail("Action 1 was not test ESB action: "+service.getActions().get(0)); + } + + if (service.getActions().get(1) != act2) { + fail("Action 2 was not 2nd test ESB action: "+service.getActions().get(1)); + } + } } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/RunModelChangeRuleTest.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/RunModelChangeRuleTest.java 2008-09-30 15:53:47 UTC (rev 355) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/RunModelChangeRuleTest.java 2008-10-01 12:20:37 UTC (rev 356) @@ -284,4 +284,188 @@ } } + public void testDeletePerformActionMiddle() { + String runName="subconv"; + + RunModelChangeRule rule=new RunModelChangeRule(); + + TestESBLanguageModel model=new TestESBLanguageModel(); + + TestESBService service=(TestESBService) + model.createService("testcategory", "testname"); + + model.addService(service); + + TestESBAction act1=new TestESBAction(); + act1.setInitiator(true); + act1.setSessionBased(true); + service.addAction(act1, -1); + + TestModelChangeContext context=new TestModelChangeContext(); + context.setParent(service); + + Role role=new Role(); + role.setName("role1"); + + context.setRole(role); + + ConversationModel cm=new ConversationModel(); + + Namespace ns=new Namespace(); + cm.setNamespace(ns); + ns.setName("ns"); + + Conversation conv=new Conversation(); + ModelName mname=new ModelName(); + mname.setLocatedRole(role); + conv.setModelName(mname); + + cm.setConversation(conv); + + Conversation subconv=new Conversation(); + ModelName submname=new ModelName(); + submname.setName(runName); + submname.setLocatedRole(role); + subconv.setModelName(mname); + + Run mobj=new Run(); + mobj.setInlineDefinition(subconv); + + conv.getBlock().getContents().add(mobj); + + if (rule.insert(context, model, mobj, null) == false) { + fail("Failed to insert"); + } + + TestESBAction act2=new TestESBAction(); + ((ESBService)context.getParent()).addAction(act2, -1); + + // Check actions + if (service.getActions().size() != 2) { + fail("Expecting 2 action: "+service.getActions().size()); + } + + if (service.getActions().get(0) != act1) { + fail("Expecting test ESB action 1: "+service.getActions().get(0)); + } + + if ((service.getActions().get(1) instanceof PerformAction) == false) { + fail("Action was not PerformAction: "+service.getActions().get(1)); + } + + if (model.getServices().size() != 2) { + fail("Two services expected: "+model.getServices().size()); + } + + PerformAction action=(PerformAction)service.getActions().get(1); + + ESBService newService=null; + java.util.Iterator<ESBService> iter=model.getServices().iterator(); + while (newService == null && iter.hasNext()) { + ESBService s=iter.next(); + + if (s != service) { + newService = s; + } + } + + if (newService == null) { + fail("Other service not found"); + } + + // Check details + if (ConversationUtil.getServiceCategory(mobj.getDefinition()).equals(action.getPropertyValue( + PerformAction.SERVICE_CATEGORY)) == false) { + fail("Perform service category '"+ + action.getPropertyValue( + PerformAction.SERVICE_CATEGORY)+ + "' invalid, expecting: "+ + ConversationUtil.getServiceCategory(mobj.getDefinition())); + } + + if (ConversationUtil.getServiceName(mobj.getDefinition()).equals(action.getPropertyValue( + PerformAction.SERVICE_NAME)) == false) { + fail("Perform service name '"+ + action.getPropertyValue( + PerformAction.SERVICE_NAME)+ + "' invalid, expecting: "+ + ConversationUtil.getServiceName(mobj.getDefinition())); + } + if (newService.getCategory().equals(action.getPropertyValue( + PerformAction.RETURN_SERVICE_CATEGORY)) == false) { + fail("Perform return service category '"+ + action.getPropertyValue( + PerformAction.RETURN_SERVICE_CATEGORY)+ + "' invalid, expecting: "+ + newService.getCategory()); + } + + if (newService.getName().equals(action.getPropertyValue( + PerformAction.RETURN_SERVICE_NAME)) == false) { + fail("Perform return service name '"+ + action.getPropertyValue( + PerformAction.RETURN_SERVICE_NAME)+ + "' invalid, expecting: "+ + newService.getName()); + } + + if (newService.getActions().size() != 1) { + fail("Return service should have 1 action: "+newService.getActions().size()); + } + + if (newService.getActions().get(0) != act2) { + fail("Expecting test ESB action 2: "+newService.getActions().get(0)); + } + + java.util.List<Activity> acts=new java.util.Vector<Activity>(); + + DefaultConversionContext convContext=new DefaultConversionContext(role.getName()); + action.convert(acts, convContext); + + if (acts.size() != 1) { + fail("Expecting 1 activity: "+acts.size()); + } + + // TODO: Need to pass representation of last interaction + if (rule.delete(context, model, acts.get(0)) == false) { + fail("Failed to delete spawn"); + } + + if (service.getActions().size() != 2) { + fail("Expecting 2 action: "+service.getActions().size()); + } + + if (service.getActions().get(0) != act1) { + fail("Expecting test ESB action 1: "+service.getActions().get(0)); + } + + if ((service.getActions().get(1) instanceof ScheduleStateAction) == false) { + fail("Action was not ScheduleStateAction: "+service.getActions().get(1)); + } + + ScheduleStateAction ssa=(ScheduleStateAction)service.getActions().get(1); + + if (ssa.getPropertyValue(PerformAction.SERVICE_CATEGORY).equals(newService.getCategory()) == false) { + fail("Category not correct '"+ssa.getPropertyValue(PerformAction.SERVICE_CATEGORY)+ + "' expecting: "+newService.getCategory()); + } + + if (ssa.getPropertyValue(PerformAction.SERVICE_NAME).equals(newService.getName()) == false) { + fail("Name not correct '"+ssa.getPropertyValue(PerformAction.SERVICE_NAME)+ + "' expecting: "+newService.getName()); + } + + if (newService.getActions().size() != 1) { + fail("Return service should have 1 action: "+newService.getActions().size()); + } + + if (newService.getActions().get(0) != act2) { + fail("Expecting test ESB action 2: "+newService.getActions().get(0)); + } + + if (model.getServices().size() != 2) { + fail("Two services expected: "+model.getServices().size()); + } + + } } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/SpawnModelChangeRuleTest.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/SpawnModelChangeRuleTest.java 2008-09-30 15:53:47 UTC (rev 355) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/SpawnModelChangeRuleTest.java 2008-10-01 12:20:37 UTC (rev 356) @@ -217,4 +217,129 @@ ConversationUtil.getServiceName(mobj.getDefinition())); } } + + public void testDeletePerformActionMiddle() { + String runName="subconv"; + + SpawnModelChangeRule rule=new SpawnModelChangeRule(); + + TestESBLanguageModel model=new TestESBLanguageModel(); + + TestESBService service=(TestESBService) + model.createService("testcategory", "testname"); + + model.addService(service); + + TestESBAction act1=new TestESBAction(); + act1.setInitiator(true); + act1.setSessionBased(true); + service.addAction(act1, -1); + + TestModelChangeContext context=new TestModelChangeContext(); + context.setParent(service); + + Role role=new Role(); + role.setName("role1"); + + context.setRole(role); + + ConversationModel cm=new ConversationModel(); + + Namespace ns=new Namespace(); + cm.setNamespace(ns); + ns.setName("ns"); + + Conversation conv=new Conversation(); + ModelName mname=new ModelName(); + mname.setLocatedRole(role); + conv.setModelName(mname); + + cm.setConversation(conv); + + Conversation subconv=new Conversation(); + ModelName submname=new ModelName(); + submname.setName(runName); + submname.setLocatedRole(role); + subconv.setModelName(mname); + + Spawn mobj=new Spawn(); + mobj.setInlineDefinition(subconv); + + conv.getBlock().getContents().add(mobj); + + if (rule.insert(context, model, mobj, null) == false) { + fail("Failed to insert"); + } + + TestESBAction act2=new TestESBAction(); + service.addAction(act2, -1); + + // Check actions + if (service.getActions().size() != 3) { + fail("Expecting 3 action: "+service.getActions().size()); + } + + if (service.getActions().get(0) != act1) { + fail("Expecting test ESB action 1: "+service.getActions().get(0)); + } + + if ((service.getActions().get(1) instanceof PerformAction) == false) { + fail("Action was not PerformAction: "+service.getActions().get(1)); + } + + if (service.getActions().get(2) != act2) { + fail("Expecting test ESB action 2: "+service.getActions().get(2)); + } + + if (model.getServices().size() != 1) { + fail("One services expected: "+model.getServices().size()); + } + + PerformAction action=(PerformAction)service.getActions().get(1); + + // Check details + if (ConversationUtil.getServiceCategory(mobj.getDefinition()).equals(action.getPropertyValue( + PerformAction.SERVICE_CATEGORY)) == false) { + fail("Perform service category '"+ + action.getPropertyValue( + PerformAction.SERVICE_CATEGORY)+ + "' invalid, expecting: "+ + ConversationUtil.getServiceCategory(mobj.getDefinition())); + } + + if (ConversationUtil.getServiceName(mobj.getDefinition()).equals(action.getPropertyValue( + PerformAction.SERVICE_NAME)) == false) { + fail("Perform service name '"+ + action.getPropertyValue( + PerformAction.SERVICE_NAME)+ + "' invalid, expecting: "+ + ConversationUtil.getServiceName(mobj.getDefinition())); + } + + java.util.List<Activity> acts=new java.util.Vector<Activity>(); + + DefaultConversionContext convContext=new DefaultConversionContext(role.getName()); + action.convert(acts, convContext); + + if (acts.size() != 1) { + fail("Expecting 1 activity: "+acts.size()); + } + + // TODO: Need to pass representation of last interaction + if (rule.delete(context, model, acts.get(0)) == false) { + fail("Failed to delete spawn"); + } + + if (service.getActions().size() != 2) { + fail("Expecting 2 action: "+service.getActions().size()); + } + + if (service.getActions().get(0) != act1) { + fail("Expecting test ESB action 1: "+service.getActions().get(0)); + } + + if (service.getActions().get(1) != act2) { + fail("Expecting test ESB action 2: "+service.getActions().get(1)); + } + } }