Merge pull request #89 from stefanschoon/master

Integration test for UML data types

Author: h-man2

manual/main.md

@@ -331,14 +331,14 @@ Data types may be added at the top of the model body.
 Example:
 
 The example shows four different data type definitions. The data types
-'Rectange' and 'Circle' inherit from abstract data type 'Shape'. 'Shape'
+'Rectangle' and 'Circle' inherit from abstract data type 'Shape'. 'Shape'
 defines the attribute 'position' which is of type 'Point' in its constructor.
 'Point' defines the attributes 'x' and 'y' which are both of primitive type
 'Real'. It also defines the operation 'translate()' which takes two parameters
-of type 'Real'for shifting 'x' and 'y' with no result type. 'Shape' defines
-the two opeartions 'perimeter()' and 'area()'. Since 'Shape' is abstract both
+of type 'Real' for shifting 'x' and 'y' with no result type. 'Shape' defines
+the two operations 'perimeter()' and 'area()'. Since 'Shape' is abstract both
 'Rectangle' and 'Circle' implement their specific logic for these operations.
-Note that a constructor canonly have pre- and no postconditions, since it is a
+Note that a constructor can only have pre- and no postconditions, since it is a
 stateless operation.
 
     dataType Point
@@ -369,7 +369,7 @@ stateless operation.
       area() : Real = 3.14 * radius * radius
     end
 
-Following examample shows, how to query data types
+Following example shows, how to query data types
 from the above model 'Shapes' in the shell:
 
     use> ?Point(1, 1)

use-core/src/main/java/org/tzi/use/uml/ocl/expr/operations/StandardOperationsNumber.java

@@ -863,17 +863,23 @@ public boolean isInfixOrPrefix() {
 
 	@Override
 	public Type matches(Type params[]) {
-		return (params.length == 1 && params[0].isTypeOfReal()) ? TypeFactory
-				.mkReal() : null;
+		return (params.length == 1 && params[0].isKindOfNumber(VoidHandling.EXCLUDE_VOID)) ? TypeFactory
+				.mkInteger() : null;
 	}
 
 	@Override
 	public Value eval(EvalContext ctx, Value[] args, Type resultType) {
-		double d1 = ((RealValue) args[0]).value();
+		double d1;
+		if (args[0].isInteger())
+			d1 = ((IntegerValue) args[0]).value();
+		else
+			d1 = ((RealValue) args[0]).value();
 		return new RealValue(Math.sqrt(d1));
 	}
 }
 
+// --------------------------------------------------------
+
 /* toString : Number -> String */
 final class Op_number_toString extends OpGeneric {
 	@Override

use-core/src/main/resources/examples/Others/Shapes/Shapes.use use-core/src/main/resources/examples/Documentation/Shapes/Shapes.use

@@ -3,13 +3,8 @@ model Shapes
 dataType Point
 operations
   Point(x : Real, y : Real)
-  pre: x > -1000 and x <= 1000
-  pre: y > -1000 and y <= 1000
-
   translate(dx : Real, dy : Real)(dx) : Point =
     Point(self.x + dx, self.y + dy)
-
-  --move_x(dx:Real):Point = self with {x=self.x + dx}
 end
 
 abstract dataType Shape
@@ -23,27 +18,18 @@ end
 dataType Rectangle < Shape
 operations
   Rectangle(position : Point, width : Real, height : Real)(position)
-  --Rectangle(x:Real, y:Real, position : Point, width : Real, height : Real)(Point(x, y))
-
   perimeter() : Real = 2.0 * width + 2.0 * height
   area() : Real = width * height
-
   contains(p : Point) : Boolean =
     self.position.x <= p.x and
     self.position.x + width >= p.x and
     self.position.y <= p.y and
     self.position.y + height >= p.y
-
-  --contains_raw(x : Integer, y : Integer) : Boolean =
-    --self.contains(Point(x, y))
 end
 
 dataType Circle < Shape
 operations
   Circle(position : Point, radius : Real)(position)
-
   perimeter() : Real = 2.0 * 3.14 * radius
   area() : Real = 3.14 * radius * radius
-
-  foo(r : Real) : Real = radius + Circle(Point(0, 0), r).radius
 end

use-core/src/main/resources/examples/Documentation/Date/Date.cmd use-core/src/main/resources/examples/Others/Date/Date.cmd

@@ -20,7 +20,6 @@
 /*
 // $Id: USECompilerTest.java 5574 2015-03-09 15:07:18Z fhilken $
  */
-
 package org.tzi.use.parser;
 
 import java.io.BufferedReader;
@@ -179,11 +178,11 @@ public void testExpression() throws IOException {
                 }
                 continue;
             }
-            if (line.length() == 0 || line.startsWith("#")) {
+            if (line.isEmpty() || line.startsWith("#")) {
                 continue;
             }
 
-            String expStr = line;
+            StringBuilder expStr = new StringBuilder(line);
             while (true) {
                 line = in.readLine();
                 lineNr++;
@@ -195,15 +194,15 @@ public void testExpression() throws IOException {
                 if (line.startsWith("-> ")) {
                     break;
                 }
-                expStr += " " + line.trim();
+                expStr.append(" ").append(line.trim());
             }
             String resultStr = line.substring(3);
 
             if (VERBOSE) {
                 System.out.println("expression: " + expStr);
             }
 
-            InputStream stream = new ByteArrayInputStream(expStr.getBytes());
+            InputStream stream = new ByteArrayInputStream(expStr.toString().getBytes());
 
             Expression expr =
                     OCLCompiler.compileExpression(
@@ -227,8 +226,7 @@ private File getFailFileFromUseFile(String specFileName) {
         // check for a failure file
         String failFileName =
                 specFileName.substring(0, specFileName.length() - 4) + ".fail";
-        File failFile = new File(TEST_PATH, failFileName);
-        return failFile;
+        return new File(TEST_PATH, failFileName);
     }
 
 

use-core/src/main/resources/examples/Documentation/Date/Date.use use-core/src/main/resources/examples/Others/Date/Date.use

@@ -158,6 +158,18 @@
 ? oclUndefined(Real) = oclUndefined(Integer)
 *-> true : Boolean
 
+? 3.pow(2)
+*-> 9.0 : Real
+
+? 3.0.pow(2)
+*-> 9.0 : Real
+
+? 9.sqrt
+*-> 3.0 : Real
+
+? 9.0.sqrt
+*-> 3.0 : Real
+
 #
 ## Operations on Booleans
 #

use-core/src/test/java/org/tzi/use/parser/USECompilerTest.java

@@ -135,4 +135,10 @@
 ? Set{a1}->iterate(v; result : A = oclUndefined(A) | v)
 *-> a1 : A
 
+? D(1, 1)
+*-> D{a=1, b=1} : D
+
+? E(1, 1, 2)
+*-> E{a=1, b=1, c=2} : E
+
 exit

use-gui/src/it/resources/testfiles/shell/t001.in

@@ -30,3 +30,13 @@ association A_B between
   A[*]
   B[0..1]
 end  
+
+dataType D
+operations
+  D(a : Integer, b : Integer)
+end
+
+dataType E < D
+operations
+  E(a : Integer, b : Integer, c : Integer)(a, b)
+end