Changeset 2011

Timestamp:

07/17/15 10:40:38 (9 years ago)

Author:

sherbold

Message:

• updated UMLUtils to allow TestComponent? stereotype directly applied to the property in a test context
• updated UMLInteractionCreator to ignore unknown primitive types and only give a warning instead of throwing an exception and aborting

Location:

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

Files:

• UMLInteractionCreator.java (modified) (4 diffs)
• UMLUtils.java (modified) (1 diff)

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

@@ -482 +482 @@
             else if (prop.getType() instanceof DataType) {
                 if( isXSDSequence(prop.getType()) ) { // XSD sequence, no real type
-                    System.out.println(SOAPUtils.getChildNodeNames(currentNode));
                     List<String> childNames = SOAPUtils.getChildNodeNames(currentNode);
                     List<org.w3c.dom.Element> childNodes = SOAPUtils.getChildElements(currentNode);
@@ -550 +549 @@
                             } 
                         }
-                        System.out.println(prop.getName() + " " + sequenceIsMatch);
                     }
                 }
@@ -697 +695 @@
                 Console.traceln(Level.SEVERE, "could not create literal for primitive type: " +
                     prop.getType().getName());
-                throw new RuntimeException("unknown primitive type: " + prop.getType().getName());
+                Console.traceln(Level.SEVERE, "attribute is ignored!");
+                // TODO
+                //throw new RuntimeException("unknown primitive type: " + prop.getType().getName());
             }
         }
@@ -747 +747 @@
             if( attributeValue!=null ) {
                 value.setInstance(((Enumeration) prop.getType()).getOwnedLiteral(attributeValue));
-                System.out.println("foo");
             } else {
                 throw new RuntimeException("cannot create enumeration literal with dummy value");

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

@@ -759 +759 @@
         final Set<Property> properties = new HashSet<>();
         for (Property property : testContext.getAllAttributes()) {
-            if (property.getType().getAppliedStereotypes().contains(utpTestComponent)) {
+            // TODO once all models are update the first condition should be removed
+            if (property.getType().getAppliedStereotypes().contains(utpTestComponent) ||
+                property.getType().getApplicableStereotypes().contains(utpTestComponent)) {
                 properties.add(property);
             }