Merge pull request #4 from pazone/master

Solved empty elements problem
pazone · Oct 10, 2014 · 96e4a0b · 96e4a0b
2 parents a65b1e8 + 7f11c14
commit 96e4a0b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ As result aShot provides he image with WebElement
 <dependency>
     <groupId>ru.yandex.qatools.ashot</groupId>
     <artifactId>ashot</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
 </dependency>
 ``` 
 

diff --git a/src/main/java/ru/yandex/qatools/ashot/coordinates/CoordsProvider.java b/src/main/java/ru/yandex/qatools/ashot/coordinates/CoordsProvider.java
@@ -17,7 +17,10 @@ public abstract class CoordsProvider {
     public Set<Coords> ofElements(WebDriver driver, Iterable<WebElement> elements) {
         Set<Coords> elementsCoords = new HashSet<>();
         for (WebElement element : elements) {
-            elementsCoords.add(ofElement(driver, element));
+            Coords elementCoords = ofElement(driver, element);
+            if (!elementCoords.isEmpty()) {
+                elementsCoords.add(ofElement(driver, element));
+            }
         }
         return elementsCoords;
     }

diff --git a/src/main/java/ru/yandex/qatools/ashot/cropper/indent/IndentCropper.java b/src/main/java/ru/yandex/qatools/ashot/cropper/indent/IndentCropper.java
@@ -40,7 +40,7 @@ public Screenshot cropScreenshot(BufferedImage image, Set<Coords> coordsToCompar
 
         Screenshot cropped = super.cropScreenshot(image, new HashSet<>(asList(coordsWithIndent)));
         cropped.setCoordsToCompare(Coords.setReferenceCoords(coordsWithIndent, coordsToCompare));
-        List<NoFilteringArea> noFilteringAreas = createNotFilteringAreas(cropped.getImage(),cropped.getCoordsToCompare());
+        List<NoFilteringArea> noFilteringAreas = createNotFilteringAreas(cropped.getImage(), cropped.getCoordsToCompare());
         cropped.setImage(applyFilters(cropped.getImage()));
         pasteAreasToCompare(cropped.getImage(), noFilteringAreas);
         return cropped;
@@ -67,7 +67,9 @@ protected Coords createIndentMask(Coords originCoords, BufferedImage image) {
     protected List<NoFilteringArea> createNotFilteringAreas(BufferedImage image, Set<Coords> coordsToCompare) {
         List<NoFilteringArea> noFilteringAreas = new ArrayList<>();
         for (Coords noFilteringCoords : coordsToCompare) {
-            noFilteringAreas.add(new NoFilteringArea(image, noFilteringCoords));
+            if (noFilteringCoords.intersects(Coords.ofImage(image))) {
+                noFilteringAreas.add(new NoFilteringArea(image, noFilteringCoords));
+            }
         }
         return noFilteringAreas;
     }