[overlord-commits] Overlord SVN: r599 - in cdl/trunk/tools/plugins: org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator and 2 other directories.

overlord-commits at lists.jboss.org overlord-commits at lists.jboss.org
Sun Apr 26 17:12:46 EDT 2009


Author: objectiser
Date: 2009-04-26 17:12:45 -0400 (Sun, 26 Apr 2009)
New Revision: 599

Modified:
   cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java
   cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java
   cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at SupplierQuoteEngine.bpel
   cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at SupplierTxnProcessor.bpel
   cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
Log:
Update tests for sub-definitions, to reduce the scope associated with the interactions.

Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java	2009-04-26 17:53:56 UTC (rev 598)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java	2009-04-26 21:12:45 UTC (rev 599)
@@ -29,8 +29,6 @@
 import org.scribble.model.admin.ModelInfo;
 import org.scribble.model.admin.ModelRepository;
 import org.scribble.model.change.ModelGenerator;
-import org.w3c.dom.Node;
-import org.eclipse.jdt.core.*;
 import org.eclipse.core.resources.*;
 import org.eclipse.core.runtime.*;
 

Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java	2009-04-26 17:53:56 UTC (rev 598)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java	2009-04-26 21:12:45 UTC (rev 599)
@@ -28,23 +28,30 @@
 import org.pi4soa.scribble.cdm.model.CDMNotation;
 import org.scribble.extensions.RegistryFactory;
 import org.scribble.model.ModelReference;
+import org.scribble.model.SubDefinitionPath;
 import org.scribble.model.change.ModelGenerator;
 
 public class GeneratorTest extends TestCase {
 
     public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Conversation->BPEL Generator Tests");       
+        TestSuite suite = new TestSuite("Conversation->BPEL Generator Tests");
+        
         suite.addTest(new ConversationToBPELTest("EventHandler at Store"));
         suite.addTest(new ChoreographyToBPELTest("ESBBroker", "Broker"));
         suite.addTest(new ChoreographyToBPELTest("ESBBroker", "Buyer"));
         suite.addTest(new ChoreographyToBPELTest("ESBBroker", "CreditAgency"));
-        suite.addTest(new ChoreographyToBPELTest("ESBBroker", "SupplierTxnProcessor"));
-        suite.addTest(new ChoreographyToBPELTest("ESBBroker", "SupplierQuoteEngine"));
+        suite.addTest(new ChoreographyToBPELTest("ESBBroker",
+        				new SubDefinitionPath(new String[]{"CompleteTransaction"}),
+        								"SupplierTxnProcessor"));
+        suite.addTest(new ChoreographyToBPELTest("ESBBroker", 
+						new SubDefinitionPath(new String[]{"RequestForQuote"}),
+										"SupplierQuoteEngine"));
         suite.addTest(new ChoreographyToBPELTest("PurchaseGoods", "Buyer"));
         suite.addTest(new ChoreographyToBPELTest("PurchaseGoods", "CreditAgency"));
         suite.addTest(new ChoreographyToBPELTest("PurchaseGoods", "Store"));
         suite.addTest(new ChoreographyToBPELTest("ReqRespFault", "Buyer"));
         suite.addTest(new ChoreographyToBPELTest("ReqRespFault", "Seller"));
+
         return suite;
     }
     
@@ -187,13 +194,29 @@
 		 * @param name The test name
 		 * @param role The role
 		 */
-		public ChoreographyToBPELTest(String name, String role) {
+		public ChoreographyToBPELTest(String name,
+							String role) {
 			super(name+"@"+role);
 			m_name = name;
 			m_role = role;
 		}
 		
 		/**
+		 * This constructor is initialized with the test
+		 * name.
+		 * 
+		 * @param name The test name
+		 * @param role The role
+		 */
+		public ChoreographyToBPELTest(String name,
+							SubDefinitionPath sdp, String role) {
+			super(name+sdp.toString()+"@"+role);
+			m_name = name;
+			m_subDefinitionPath = sdp;
+			m_role = role;
+		}
+		
+		/**
 		 * This method runs the test.
 		 * 
 		 * @param result The test result
@@ -228,7 +251,8 @@
 						new org.scribble.model.Role(m_role);
 					
 					org.scribble.model.Model projected=
-							projector.project(ref, model, role, l);
+							projector.project(ref, model,
+									m_subDefinitionPath, role, l);
 					
 					ModelGenerator generator=(ModelGenerator)
 							RegistryFactory.getRegistry().getExtension(
@@ -312,6 +336,7 @@
 		}
 
 		private String m_name=null;
+		private SubDefinitionPath m_subDefinitionPath=null;
 		private String m_role=null;
 	}
 }

Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at SupplierQuoteEngine.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at SupplierQuoteEngine.bpel	2009-04-26 17:53:56 UTC (rev 598)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at SupplierQuoteEngine.bpel	2009-04-26 21:12:45 UTC (rev 599)
@@ -1,17 +1,9 @@
-<process name="ESBBrokerProcess_SupplierQuoteEngine" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+<process name="RequestForQuote_SupplierQuoteEngine" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
     <partnerLinks>
         <partnerLink myRole="SupplierQuoteEngineService" name="BrokerToSupplierQuoteEngine" partnerLinkType="BrokerToSupplierQuoteEngineServiceLT"/>
     </partnerLinks>
     <sequence>
-        <while>
-            <sequence>
-                <scope>
-                    <sequence>
-                        <receive operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT"/>
-                        <reply operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT"/>
-                    </sequence>
-                </scope>
-            </sequence>
-        </while>
+        <receive operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT"/>
+        <reply operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT"/>
     </sequence>
 </process>

Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at SupplierTxnProcessor.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at SupplierTxnProcessor.bpel	2009-04-26 17:53:56 UTC (rev 598)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at SupplierTxnProcessor.bpel	2009-04-26 21:12:45 UTC (rev 599)
@@ -1,23 +1,15 @@
-<process name="ESBBrokerProcess_SupplierTxnProcessor" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+<process name="CompleteTransaction_SupplierTxnProcessor" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
     <partnerLinks>
         <partnerLink myRole="SupplierTxnProcessorService" name="BrokerToSupplierTxnProcessor" partnerLinkType="BrokerToSupplierTxnProcessorServiceLT"/>
         <partnerLink myRole="SupplierTxnProcessorRequester" name="SupplierTxnProcessorToBroker" partnerLinkType="SupplierTxnProcessorToBrokerRequesterLT" partnerRole="BrokerService"/>
     </partnerLinks>
     <sequence>
-        <if>
-            <sequence>
-                <scope>
-                    <sequence>
-                        <pick>
-                            <onMessage operation="confirm" partnerLink="SupplierTxnProcessorToBroker" portType="SupplierTxnProcessorBrokerCallbackPT">
-                                <sequence>
-                                    <reply operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT"/>
-                                </sequence>
-                            </onMessage>
-                        </pick>
-                    </sequence>
-                </scope>
-            </sequence>
-        </if>
+        <pick>
+            <onMessage operation="confirm" partnerLink="SupplierTxnProcessorToBroker" portType="SupplierTxnProcessorBrokerCallbackPT">
+                <sequence>
+                    <reply operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT"/>
+                </sequence>
+            </onMessage>
+        </pick>
     </sequence>
 </process>

Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java	2009-04-26 17:53:56 UTC (rev 598)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java	2009-04-26 21:12:45 UTC (rev 599)
@@ -26,7 +26,6 @@
 import javax.xml.transform.stream.StreamResult;
 
 import org.eclipse.core.resources.IFile;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.generator.BuildSystem;
 import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
 import org.scribble.conformance.model.transform.StatelessTransformer;
 import org.scribble.conversation.model.ConversationModel;




More information about the overlord-commits mailing list