changed content in layout comparator documentation, removed unused bl…

…ank lines, changed error message in layout comparator
wttech · Aug 1, 2018 · 329bb24 · 329bb24
1 parent 2312405
commit 329bb24
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/.../jobs/src/main/java/com/cognifide/aet/job/common/comparators/layout/LayoutComparator.java b/.../jobs/src/main/java/com/cognifide/aet/job/common/comparators/layout/LayoutComparator.java
@@ -51,9 +51,9 @@ public class LayoutComparator implements ComparatorJob {
 
   private final ArtifactsDAO artifactsDAO;
 
-  private Integer pixelThreshold = null;
+  private Integer pixelThreshold;
 
-  private Double percentageThreshold = null;
+  private Double percentageThreshold;
 
   LayoutComparator(ComparatorProperties comparatorProperties, ArtifactsDAO artifactsDAO) {
     this.properties = comparatorProperties;
@@ -185,12 +185,12 @@ public void setParameters(Map<String, String> params) throws ParametersException
       setPercentageThreshold(Double.valueOf(params.get(PERCENTAGE_THRESHOLD_PARAM)));
       ParametersValidator
           .checkRange(percentageThreshold.intValue(), 0, 100,
-              "Wrong percentage threshold value");
+              "Percentage threshold should be a decimal value between 0 and 100");
     }
     if (params.containsKey(PIXEL_THRESHOLD_PARAM)) {
       setPixelThreshold(Integer.valueOf(params.get(PIXEL_THRESHOLD_PARAM)));
       ParametersValidator.checkParameter(pixelThreshold >= 0,
-          "Pixel threshold should be greater than 0");
+          "Pixel threshold should be greater or equal to 0");
     }
   }
 

diff --git a/.../test/java/com/cognifide/aet/job/common/comparators/layout/utils/ImageComparisonTest.java b/.../test/java/com/cognifide/aet/job/common/comparators/layout/utils/ImageComparisonTest.java
@@ -139,4 +139,4 @@ private void closeInputStreams(InputStream... inputStreams) {
       IOUtils.closeQuietly(inputStream);
     }
   }
-}
+}
diff --git a/documentation/src/main/wiki/LayoutComparator.md b/documentation/src/main/wiki/LayoutComparator.md
@@ -12,8 +12,8 @@ Resource name: screen
 
 | Parameter | Value | Description | Mandatory |
 | --------- | ----- | ----------- | --------- |
-| `pixelThreshold` | int (bigger than 0) | The value to set the error threshold in pixels e.g if difference between photos is smaller or equal to `pixelThreshold`, the test will pass. In case of difference is bigger than `pixelThreshold`, the test will fail. | no |
-| `percentageThreshold` | double (0 to 100) | It works as `pixelThreshold` but values are in percentages | no |
+| `pixelThreshold` | int (equal or greater than 0) | The value to set the error threshold in pixels e.g if difference between photos is smaller or equal to `pixelThreshold`, the test will pass. In case of difference is bigger than `pixelThreshold`, the test will fail. | no |
+| `percentageThreshold` | double (between 0 and 100) | It works as `pixelThreshold` but values are in percentages | no |
 
 When you provide `pixelThreshold` and `percentageThreshold` test will pass only if pixel difference is smaller or equal than `pixelThreshold` and percentage difference is smaller or equal than `percentageThreshold`.
 

diff --git a/report/src/main/webapp/app/layout/main/test/mainView.test.view.html b/report/src/main/webapp/app/layout/main/test/mainView.test.view.html
@@ -31,7 +31,7 @@
                   <i class="fas {{theme.statusClasses[url.getStatus()]}}"></i>
                 </div>
                 <div ng-if="url.getStatus() == 'rebased' || url.getStatus() == 'conditionallyPassed'" class="fontawesome">
-                    <i class="fas {{theme.statusClasses[url.getStatus()]}}"></i>
+                  <i class="fas {{theme.statusClasses[url.getStatus()]}}"></i>
                 </div>
                 <div class="tile-stats">
                   <span class="statistics">Url cases statistics:</span>
@@ -45,7 +45,6 @@
                         data-trigger="hover" data-container="body">{{url.conditionallyPassed}}</span> /
                   <span class="status rebased" data-toggle="popover" data-content="Accepted cases"
                         data-trigger="hover" data-container="body">{{url.rebased}}</span>
-
                 </div>
                 <span>{{url.name}}</span>
               </div>