Specsize as percentage and px for issue #259

printed the doubles with the minimum necessary precision
galenframework · Apr 10, 2015 · c3c06a3 · c3c06a3
1 parent 035a11d
commit c3c06a3
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/galen-core/src/main/java/net/mindengine/galen/validation/SpecValidation.java b/galen-core/src/main/java/net/mindengine/galen/validation/SpecValidation.java
@@ -89,17 +89,25 @@ protected Range convertRange(Range range, PageValidation pageValidation) throws
         }
     }
 
-    protected String getRangeAndValue(Range specRange, Range convertedRange, double realValue) {
+     protected String getRangeAndValue(Range specRange, Range convertedRange, int realValue) {
         String dimension = "px";
         String originalValue = realValue + dimension;
         String rangeValue = convertedRange.getErrorMessageSuffix();
         if (specRange.isPercentage()) {
             double size = convertedRange.getFrom() / specRange.getFrom() * 100.0;
             dimension = "%";
-            originalValue = format("%f%s [%s]", realValue / size * 100.0, dimension, originalValue);
+            originalValue = format("%s%s [%s]", getInteger(realValue / size * 100.0), dimension, originalValue);
             rangeValue = format("%s [%s]", specRange.getErrorMessageSuffix(dimension), convertedRange.toString());
         }
         return format("%s %s", originalValue, rangeValue);
     }
 
+    private String getInteger(double d) {
+        if (d == (long) d) {
+            return String.format("%d", (long) d);
+        } else {
+            return String.format("%s", d);
+        }
+    }
+
 }