changed test

OGP1718-Worms/src/worms/model/Worm.java

@@ -102,17 +102,21 @@ public class Worm {
 
         if (!isValidMinRadius(minRadius))
             throw new IllegalArgumentException("Invalid min radius"); // TODO add decent exception msg
-        if (!canHaveAsMinRadius(radius))
+        this.minRadius = minRadius;
+
+        if (!canHaveAsRadius(radius))
             throw new IllegalArgumentException("Invalid radius");
 
         setRadius(radius);
-        this.minRadius = minRadius;
+
         setActionPoints(getMaxActionPoints());
 
         int validName = isValidName(name);
         if (validName != -1)
             throw new IllegalNameException(validName, name);
         this.name = name;
+
+        Tuple<Integer, Integer> test = null;
     }
 
     //===================================================================================
@@ -231,13 +235,13 @@ public class Worm {
     /**
      * check whether the given radius is a valid minimum radius for the worm
      *
-     * @param radius
+     * @param minRadius
      * 		  the radius to check
      * @return True if and only if the radius is a number and the radius is bigger then 0
      * 		   |result == ((!Double.isNaN(radius)) && (radius > 0))
      */
-    public static boolean isValidMinRadius(double radius) {
-        return !Double.isNaN(radius) && radius > 0;
+    public static boolean isValidMinRadius(double minRadius) {
+        return !Double.isNaN(minRadius) && minRadius > 0;
     }
 
     /**
@@ -252,7 +256,7 @@ public class Worm {
      * 		   |! canHaveAsMinRadius(radius)
      */
     public void setRadius(double radius) throws IllegalArgumentException {
-        if (!canHaveAsMinRadius(radius))
+        if (!canHaveAsRadius(radius))
             throw new IllegalArgumentException("Invalid radius");
 
         this.radius = radius;
@@ -290,8 +294,8 @@ public class Worm {
      * 	       (or equal) and the radius is a number
      * 		   |result == (radius >= this.minRadius && !Double.isNaN(radius))
      */
-    private boolean canHaveAsMinRadius(double radius) {
-        return radius >= getMinRadius() && !Double.isNaN(radius);
+    private boolean canHaveAsRadius(double radius) {
+        return !Double.isNaN(radius) && radius >= getMinRadius();
     }
 
     /**