Changeset 1988 for trunk/autoquest-plugin-uml/src/main/java/de/ugoe/cs

Timestamp:

07/07/15 08:36:28 (9 years ago)

Author:

sherbold

Message:

• updated EqualSOAPDataMap: not a singleton anymore, now each event has a reference to the map. the map is created when the SOAPEvents are converted to SimpleSOAPEvents using the appropriate method from the SOAPUtils
• the logic for deciding if random SOAP requests are selected or the one of the event itself was changed within the SimpleSOAPEvents. Now methods for both are offered and the caller has to decide which method to choose
• the test case generation in the model utils now has a parameter to decide if random data or the data of the SimpleSOAPEvents is used

File:

• trunk/autoquest-plugin-uml/src/main/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtils.java (modified) (4 diffs)

trunk/autoquest-plugin-uml/src/main/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtils.java

@@ -425 +425 @@
      *            Name of the test context that should be used. If this value is null, the first
      *            test context found is used.
+     * @param useRandomRequestBodies
+     *            defines is random request bodies are used or the body of the associated event
      */
     public static Interaction createInteractionFromEventSequence(List<Event> sequence,
                                                                  Model model,
                                                                  String interactionName,
-                                                                 String testContextName)
+                                                                 String testContextName,
+                                                                 boolean useRandomRequestBodies)
     {
         final Component testContext = fetchTestContext(model, testContextName);
@@ -546 +549 @@
                 Message callMessage = interaction.createMessage(prefix + "call");
                 callMessage.setSignature(calledOperation);
-                setCallMessageParameters(callMessage, calledOperation, event, prefix);
+                setCallMessageParameters(callMessage, calledOperation, event, useRandomRequestBodies, prefix);
                 callMessage.setConnector(connector);
                 callMessage.setSendEvent(callSendFragment);
@@ -1025 +1028 @@
      * @param event
      *            event that provides the parameters; in case of null, default values are assumed
+     * @param useRandomRequestBodies
+     *            defines is random request bodies are used or the body of the associated event
      * @param prefix
      *            prefix of the call message; used to create good warnings and debugging information
@@ -1031 +1036 @@
                                                  Operation calledOperation,
                                                  Event event,
+                                                 boolean useRandomRequestBodies,
                                                  String prefix)
     {
-        org.w3c.dom.Element requestBody = SOAPUtils.getSoapRequestBodyFromEvent(event);
+        org.w3c.dom.Element requestBody = SOAPUtils.getSoapRequestBodyFromEvent(event, useRandomRequestBodies);
         Package instSpecPkg = null;