Bug fixes, Version Updates

Bug fixes, Version Updates

Author: sridharbandi

.github/workflows/build.yml

@@ -4,33 +4,27 @@ on:
     branches:
       - master
   pull_request:
-    types: [opened, synchronize, reopened]
+    types: [ opened, synchronize, reopened ]
 jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
           java-version: 11
-      - name: Cache SonarCloud packages
-        uses: actions/cache@v1
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
       - name: Cache Maven packages
         uses: actions/cache@v1
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
-      - name: Build and analyze
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=sridharbandi_Java-a11y
+      - name: Unit tests
+        run: mvn clean test
+      - name: Codacy Coverage
+        uses: codacy/codacy-coverage-reporter-action@v1
+        with:
+          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
+          coverage-reports: target/jacoco.xml

ReadMe.md

@@ -11,6 +11,8 @@
 
 [![Maven Central](https://img.shields.io/maven-central/v/io.github.sridharbandi/java-a11y.svg)](http://search.maven.org/#search|ga|1|g:"io.github.sridharbandi")
 [![jdk badge](https://img.shields.io/badge/jdk-8-green.svg)](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/8b32dbe54c8d4b5e902390926e8b0d46)](https://www.codacy.com/gh/sridharbandi/Java-a11y/dashboard?utm_source=github.com&utm_medium=referral&utm_content=sridharbandi/Java-a11y&utm_campaign=Badge_Grade)
+[![Codacy Badge](https://app.codacy.com/project/badge/Coverage/8b32dbe54c8d4b5e902390926e8b0d46)](https://www.codacy.com/gh/sridharbandi/Java-a11y/dashboard?utm_source=github.com&utm_medium=referral&utm_content=sridharbandi/Java-a11y&utm_campaign=Badge_Coverage)
 [![License badge](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 [![Contributer badge](https://img.shields.io/github/contributors/sridharbandi/Java-a11y.svg)](https://github.com/sridharbandi/Java-a11y/graphs/contributors)
 
@@ -27,12 +29,12 @@ For maven based project add the below dependency
 <dependency>
   <groupId>io.github.sridharbandi</groupId>
   <artifactId>java-a11y</artifactId>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
 </dependency>
 ```
 For gradle based project add the below dependency
 ```
-compile 'io.github.sridharbandi:java-a11y:3.0.0'
+compile 'io.github.sridharbandi:java-a11y:3.0.1'
 ```
 For non gradle/maven project download the jar from below mentioned link and add it to CLASSPATH for your project
 

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.github.sridharbandi</groupId>
     <artifactId>java-a11y</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
 
     <name>Java a11y</name>
     <description>Accessibility Automation for Web Apps with Java and Selenium Webdriver</description>
@@ -36,17 +36,16 @@
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
-        <freemaker.version>2.3.30</freemaker.version>
-        <slf4j.version>2.0.0-alpha1</slf4j.version>
-        <junit.version>5.7.0</junit.version>
-        <mockito.verion>3.7.0</mockito.verion>
-        <selenium.version>4.0.0-rc-2</selenium.version>
-        <jackson.version>2.12.1</jackson.version>
+        <freemaker.version>2.3.31</freemaker.version>
+        <slf4j.version>2.0.3</slf4j.version>
+        <junit.version>5.9.1</junit.version>
+        <mockito.verion>4.8.1</mockito.verion>
+        <selenium.version>4.5.3</selenium.version>
+        <jackson.version>2.14.0-rc3</jackson.version>
         <commonsio.version>2.11.0</commonsio.version>
+        <annotation.version>1.3.2</annotation.version>
         <surefire.version>3.0.0-M5</surefire.version>
-
-        <sonar.organization>sridharbandi</sonar.organization>
-        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+        <jacoco.version>0.8.8</jacoco.version>
     </properties>
 
     <dependencies>
@@ -67,14 +66,19 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-reload4j</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>${commonsio.version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${annotation.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
@@ -95,6 +99,34 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${surefire.version}</version>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco.version}</version>
+                <configuration>
+                    <excludes>
+                        <exclude>io/github/sridharbandi/modal/**/*</exclude>
+                    </excludes>
+                    <formats>
+                        <format>XML</format>
+                    </formats>
+                    <outputDirectory>${project.build.directory}</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>

src/main/java/io/github/sridharbandi/AxeRunner.java

@@ -12,10 +12,8 @@
 public class AxeRunner implements IRunner {
 
     private A11y a11y;
-    private WebDriver driver;
 
     public AxeRunner(WebDriver driver) {
-        this.driver = driver;
         a11y = new A11y(driver);
     }
 

src/main/java/io/github/sridharbandi/HtmlCsRunner.java

@@ -4,6 +4,7 @@
 import io.github.sridharbandi.a11y.Engine;
 import io.github.sridharbandi.a11y.HTMLCS;
 import io.github.sridharbandi.modal.htmlcs.Issues;
+import io.github.sridharbandi.modal.htmlcs.Params;
 import io.github.sridharbandi.util.A11y;
 import org.openqa.selenium.WebDriver;
 
@@ -15,24 +16,31 @@ public class HtmlCsRunner implements IRunner {
 
     private A11y a11y;
     private HTMLCS standard;
-    private WebDriver driver;
+    private Params params;
+    private String[] codes = {};
 
     public HtmlCsRunner(WebDriver driver) {
-        this.driver = driver;
         a11y = new A11y(driver);
+        params = new Params();
     }
 
     public void setStandard(HTMLCS standard) {
         this.standard = standard;
     }
 
+    public void setIgnoreCodes(String[] codes){
+        this.codes = codes;
+    }
+
+
     @Override
     public void execute() throws IOException, URISyntaxException, TemplateException {
         String stdrd = Objects.isNull(standard) ? HTMLCS.WCAG2AA.name() : standard.name();
-        a11y.execute(Engine.HTMLCS, stdrd);
+        params.setStandard(stdrd);
+        params.setIgnoreCodes(codes);
+        a11y.execute(Engine.HTMLCS, params);
     }
 
-
     public void generateHtmlReport() throws IOException {
         IRunner.super.generateHtmlReport(a11y, Engine.HTMLCS, Issues.class);
     }

src/main/java/io/github/sridharbandi/ftl/FtlConfig.java

@@ -8,17 +8,18 @@
 import java.io.IOException;
 import java.util.Optional;
 
-import static io.github.sridharbandi.util.Statik.ENCODING;
-import static io.github.sridharbandi.util.Statik.TEMPLATE_DIR;
 
 public class FtlConfig {
 
+    public static final String TEMPLATE_DIR = "ftl";
+    public static final String ENCODING = "UTF-8";
+
     private static FtlConfig instance;
 
     private Configuration cfg;
 
     public FtlConfig() {
-        cfg = new Configuration(Configuration.VERSION_2_3_30);
+        cfg = new Configuration(Configuration.VERSION_2_3_31);
         cfg.setClassLoaderForTemplateLoading(this.getClass().getClassLoader(), TEMPLATE_DIR);
         cfg.setDefaultEncoding(ENCODING);
         cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);

src/main/java/io/github/sridharbandi/modal/axe/Any.java

@@ -17,7 +17,7 @@
     "relatedNodes"
 })
 @Generated("jsonschema2pojo")
-public class All {
+public class Checks {
 
     @JsonProperty("data")
     private Object data;