Merge branch 'master' into future/keyboard-shortcuts-for-Accept-Revert

CHANGELOG.md

@@ -10,12 +10,21 @@ All notable changes to AET will be documented in this file.
 ## Unreleased
 
 **List of changes that are finished but not yet released in any final version.**
+
+## Version 3.2.0
+
+
+- [PR-451](https://github.com/Cognifide/aet/pull/451) Collectors and comparators configured by single config number
+- [PR-449](https://github.com/Cognifide/aet/pull/449) Improvements to the Winter Edition Theme
 - [PR-354](https://github.com/Cognifide/aet/pull/354) Remove jmsEndpointConfig information from communication settings endpoint ([#352](https://github.com/Cognifide/aet/issues/352))
 - [PR-412](https://github.com/Cognifide/aet/pull/412) ([PR-336](https://github.com/Cognifide/aet/pull/336), [PR-337](https://github.com/Cognifide/aet/pull/337), [PR-395](https://github.com/Cognifide/aet/pull/395)) - Added rerun functionality for suite, test and url 
 - [PR-429](https://github.com/Cognifide/aet/pull/429) - `aet-cookbook` version updated to [`v5.1.1`](https://github.com/Cognifide/aet-cookbook/blob/master/CHANGELOG.md#511) in Vagrant. **Important**: please follow the instructions from [PR-43 description](https://github.com/Cognifide/aet-cookbook/pull/43) in order to keep the MongoDB data on your local environment.
 - [PR-422](https://github.com/Cognifide/aet/pull/422) RunnerConfiguration's urlPackageSize property got set to 1
 - [PR-430](https://github.com/Cognifide/aet/pull/430) Upgraded HTML codesniffer to latest release (3.2.0)
 - [PR-385](https://github.com/Cognifide/aet/pull/385) Fixed ChefDK and vagrant-berkshelf versions
+- [PR-404](https://github.com/Cognifide/aet/pull/404) Added missing tooltip for conditional tests
+- [PR-408](https://github.com/Cognifide/aet/pull/408) Advanced Screen Comparision button layout fix
+- [PR-410](https://github.com/Cognifide/aet/pull/410) Notification that displays when exclude-elements are not found on page now shows what specific elements were not found([#372](https://github.com/Cognifide/aet/issues/372)) 
 
 ## Version 3.1.0
 

CONTRIBUTING.md

@@ -67,7 +67,7 @@ Please do so, we believe that having good an up-to-date documentation is as impo
 
 ## Changelog
 When changing or fixing some important part of AET, please remember to update [Changelog](https://github.com/Cognifide/aet/blob/master/CHANGELOG.md).
-Your entry should be enlisted in `Unreleased` section. It will be moved to appropriate release notes during release process.
+Your entry should be enlisted **at the end** of the `Unreleased` section. It will be moved to appropriate release notes during release process.
 Please use convention `- [PR-ABC](https://github.com/Cognifide/aet/pull/ABC) - short description of the PR.`.
 
 ## Tests naming convention

api/communication-api/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <artifactId>api</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>communication-api</artifactId>

api/communication-api/src/main/java/com/cognifide/aet/communication/api/metadata/exclude/ExcludedElement.java

@@ -20,6 +20,7 @@
 import java.io.Serializable;
 
 public class ExcludedElement implements Serializable {
+
   private static final long serialVersionUID = 692282363549228800L;
 
   private final Point point;

api/communication-api/src/main/java/com/cognifide/aet/communication/api/metadata/exclude/LayoutExclude.java

@@ -17,18 +17,25 @@
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Set;
 
 public class LayoutExclude implements Serializable {
+
   private static final long serialVersionUID = -6496109702966509444L;
 
   private final List<ExcludedElement> excludedElements;
+  private final Set<String> notFoundElements;
 
-  public LayoutExclude(
-      List<ExcludedElement> excludedElements) {
+  public LayoutExclude(List<ExcludedElement> excludedElements, Set<String> notFoundElements) {
     this.excludedElements = excludedElements;
+    this.notFoundElements = notFoundElements;
   }
 
   public List<ExcludedElement> getExcludedElements() {
     return excludedElements;
   }
+
+  public Set<String> getNotFoundElements() {
+    return notFoundElements;
+  }
 }

api/communication-api/src/main/java/com/cognifide/aet/communication/api/queues/QueuesConstant.java

@@ -0,0 +1,41 @@
+/**
+ * AET
+ *
+ * Copyright (C) 2013 Cognifide Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.cognifide.aet.communication.api.queues;
+
+public enum QueuesConstant implements WorkerConfig {
+  COLLECTOR("collectorJobs", "collectorResults"),
+  COMPARATOR("comparatorJobs", "comparatorResults");
+
+  public static final String NAMESPACE = "AET.";
+
+  final String jobsQueueName;
+  final String resultsQueueName;
+
+  QueuesConstant(String jobsQueueName, String resultsQueueName) {
+    this.jobsQueueName = jobsQueueName;
+    this.resultsQueueName = resultsQueueName;
+  }
+
+  @Override
+  public String getJobsQueueName() {
+    return NAMESPACE + jobsQueueName;
+  }
+
+  @Override
+  public String getResultsQueueName() {
+    return NAMESPACE + resultsQueueName;
+  }
+}

api/communication-api/src/main/java/com/cognifide/aet/communication/api/queues/WorkerConfig.java

@@ -0,0 +1,30 @@
+/**
+ * AET
+ *
+ * Copyright (C) 2013 Cognifide Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.cognifide.aet.communication.api.queues;
+
+public interface WorkerConfig {
+
+  /**
+   * @return name of the jobs queue
+   */
+  String getJobsQueueName();
+
+  /**
+   * @return name of the results queue name
+   */
+  String getResultsQueueName();
+
+}

api/datastorage-api/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <artifactId>api</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>datastorage-api</artifactId>

api/jobs-api/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <artifactId>api</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>jobs-api</artifactId>

api/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <artifactId>aet-root</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>api</artifactId>

api/validation-api/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <artifactId>api</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>validation-api</artifactId>

client/aet-maven-plugin/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <artifactId>client</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>aet-maven-plugin</artifactId>

client/client-core/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <artifactId>client</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>client-core</artifactId>

client/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <artifactId>aet-root</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>client</artifactId>

core/cleaner/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <artifactId>core</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cleaner</artifactId>

core/communication/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <artifactId>core</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>communication</artifactId>

core/datastorage/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <artifactId>core</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>datastorage</artifactId>

core/jobs/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <artifactId>core</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>jobs</artifactId>
@@ -141,11 +141,15 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+    </dependency>
+
   </dependencies>
 
   <build>

core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/screen/ScreenCollector.java

@@ -32,10 +32,18 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.stream.Collectors;
 import javax.imageio.ImageIO;
 import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.openqa.selenium.By;
@@ -56,6 +64,8 @@ public class ScreenCollector extends WebElementsLocatorParams implements Collect
 
   private static final String PNG_FORMAT = "png";
 
+  private static final String CSS_SELECTOR_SEPARATOR = ",";
+
   private final WebDriver webDriver;
 
   private final ArtifactsDAO artifactsDAO;
@@ -70,22 +80,6 @@ public class ScreenCollector extends WebElementsLocatorParams implements Collect
     this.artifactsDAO = artifactsDAO;
   }
 
-  private List<ExcludedElement> getExcludeElementsFromWebElements(List<WebElement> webElements) {
-    List<ExcludedElement> excludeExcludedElements = new ArrayList<>(webElements.size());
-
-    Point screenshotOffset = isSelectorPresent() ?
-        webDriver.findElement(getLocator()).getLocation() : new Point(0, 0);
-    for (WebElement webElement : webElements) {
-      Point point = webElement.getLocation()
-          .moveBy(-screenshotOffset.getX(), -screenshotOffset.getY());
-
-      excludeExcludedElements.add(new ExcludedElement(
-          new java.awt.Point(point.getX(), point.getY()),
-          new java.awt.Dimension(webElement.getSize().width, webElement.getSize().height)));
-    }
-    return excludeExcludedElements;
-  }
-
   @Override
   public CollectorStepResult collect() throws ProcessingException {
     byte[] screenshot = takeScreenshot();
@@ -98,11 +92,7 @@ public CollectorStepResult collect() throws ProcessingException {
         String resultId = artifactsDAO.saveArtifact(properties, screenshotStream, CONTENT_TYPE);
 
         if (excludeCssSelector != null) {
-          List<ExcludedElement> excludeExcludedElements = getExcludeElementsFromWebElements(
-              webDriver.findElements(By.cssSelector(excludeCssSelector)));
-          stepResult = CollectorStepResult
-              .newCollectedResult(resultId,
-                  new Payload((new LayoutExclude(excludeExcludedElements))));
+          stepResult = getResultWithExcludeSelectors(resultId);
         } else {
           stepResult = CollectorStepResult.newCollectedResult(resultId);
         }
@@ -124,6 +114,65 @@ private boolean isPatternAndResultMD5Identical(byte[] screenshot) {
     }
   }
 
+  private CollectorStepResult getResultWithExcludeSelectors(String resultId) {
+    ArrayList<String> cssSelectors = new ArrayList<>(
+        Arrays.asList(excludeCssSelector.split(CSS_SELECTOR_SEPARATOR)));
+
+    Map<String, List<WebElement>> elements = searchElementsOnPage(cssSelectors);
+
+    List<WebElement> foundExcludeElements = getFoundWebElements(elements);
+    Set<String> notFoundSelectors = getNotFoundSelectors(elements);
+
+    List<ExcludedElement> excludedElements = getExcludeElementsFromWebElements(
+        foundExcludeElements);
+    return CollectorStepResult.newCollectedResult(resultId,
+        new Payload((new LayoutExclude(excludedElements, notFoundSelectors))));
+  }
+
+  private HashMap<String, List<WebElement>> searchElementsOnPage(ArrayList<String> cssSelectors) {
+    HashMap<String, List<WebElement>> elements = new HashMap<>();
+
+    cssSelectors.forEach(selector -> {
+      List<WebElement> foundElements = webDriver.findElements(By.cssSelector(selector));
+      if (!CollectionUtils.isEmpty(foundElements)) {
+        elements.put(selector, foundElements);
+      } else {
+        elements.put(selector, Collections.emptyList());
+      }
+    });
+
+    return elements;
+  }
+
+  private List<WebElement> getFoundWebElements(Map<String, List<WebElement>> elements) {
+    return elements.values().stream()
+        .flatMap(Collection::stream)
+        .collect(Collectors.toList());
+  }
+
+  private Set<String> getNotFoundSelectors(Map<String, List<WebElement>> elements) {
+    return elements.entrySet().stream()
+        .filter(entry -> entry.getValue().isEmpty())
+        .map(Entry::getKey)
+        .collect(Collectors.toSet());
+  }
+
+  private List<ExcludedElement> getExcludeElementsFromWebElements(List<WebElement> webElements) {
+    List<ExcludedElement> excludeExcludedElements = new ArrayList<>(webElements.size());
+
+    Point screenshotOffset = isSelectorPresent() ?
+        webDriver.findElement(getLocator()).getLocation() : new Point(0, 0);
+    for (WebElement webElement : webElements) {
+      Point point = webElement.getLocation()
+          .moveBy(-screenshotOffset.getX(), -screenshotOffset.getY());
+
+      excludeExcludedElements.add(new ExcludedElement(
+          new java.awt.Point(point.getX(), point.getY()),
+          new java.awt.Dimension(webElement.getSize().width, webElement.getSize().height)));
+    }
+    return excludeExcludedElements;
+  }
+
   @Override
   public void setParameters(Map<String, String> params) throws ParametersException {
     if (StringUtils.isNotBlank(params.get(XPATH_PARAM)) || StringUtils