Contrast-Finder v0.8.3

---------------------- set version to 0.8.3 Fixed Asqatasun#100 - Upgraded SpringFramework (4.3.13 instead of 4.3.12) delete unused files (*/AppTest.java) fix Travis build for Asqatasun#107 fixed Asqatasun#107 - Added missing unit tests for engine/utils/* Fixed Asqatasun#106 - Added unit tests coverage report (jacoco-maven-plugin) updated pom.xml (typo) fixed Asqatasun#105 - Upgraded outdated plugin: owasp dependency-check (3.0.2) tar.gz - Added CONTRIBUTING file Fixed Asqatasun#104 - Added maven-jxr-plugin (needed for maven-checkstyle-plugin) fixed pom.xml for maven-project-info-reports-plugin fixed Asqatasun#103 - Upgraded outdated dependency: maven-javadoc-plugin (3.0.0-M1) fixed Asqatasun#102 - Upgraded outdated dependency: markdown-page-generator-plugin fixed Asqatasun#101 - Upgraded outdated dependency: commons-lang3 (3.7) Updated Other-contrast-tools.md set version to 0.8.3-SNAPSHOT
dzc34 · Nov 28, 2017 · 0e1e5ba · 0e1e5ba
2 parents e3c0282 + 58fb8f2
commit 0e1e5ba
Show file tree

Hide file tree

Showing 31 changed files with 1,033 additions and 277 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # CHANGELOG
 
+Contrast-Finder 0.8.3, 2017-11-28
+---------------------------------
+
+Upgrade-o-meter: just replace the .war file and restart Tomcat
+
+### Outdated dependencies
+- [#100 - Upgraded SpringFramework (4.3.13 instead of 4.3.12)](https://github.com/Asqatasun/Contrast-Finder/issues/100) 
+- [#101 - Upgraded commons-lang3 (3.7 instead of 3.6)](https://github.com/Asqatasun/Contrast-Finder/issues/101) 
+- [#102 - Upgraded markdown-page-generator-plugin (2.0.0 instead of 1.0.0)](https://github.com/Asqatasun/Contrast-Finder/issues/102) 
+- [#103 - Upgraded maven-javadoc-plugin (3.0.0-M1 instead of 2.10.4)](https://github.com/Asqatasun/Contrast-Finder/issues/103) 
+- [#105 - Upgraded org.owasp:dependency-check (3.0.2 instead of 1.4.5)](https://github.com/Asqatasun/Contrast-Finder/issues/105) 
+
+### Task
+- [#104 - Added maven-jxr-plugin (needed for maven-checkstyle-plugin)](https://github.com/Asqatasun/Contrast-Finder/issues/104) 
+- [#106 - Added unit tests coverage report (jacoco-maven-plugin)](https://github.com/Asqatasun/Contrast-Finder/issues/106) 
+- [#107 - Added missing unit tests for engine/utils/*](https://github.com/Asqatasun/Contrast-Finder/issues/107) 
+
+
+
 Contrast-Finder 0.8.2, 2017-10-28
 ---------------------------------
 

diff --git a/docker/RELEASE/Dockerfile b/docker/RELEASE/Dockerfile
@@ -1,7 +1,7 @@
 FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
 LABEL org.label-schema.schema-version = "1.0.0-rc.1"                                            \
       org.label-schema.name           = "Contrast-Finder - WebApp"                              \
-      org.label-schema.version        = "0.8.2"                                             \
+      org.label-schema.version        = "0.8.3"                                             \
       org.label-schema.url            = "https://contrast-finder.org"                           \
       org.label-schema.vcs-url        = "https://github.com/Asqatasun/Contrast-Finder"          \
       org.label-schema.docker.cmd     = "docker run -p 8087:8080 -d asqatasun/contrast-finder"  \
@@ -13,9 +13,9 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1"
 #
 #   --- Building this docker image
 #   docker build -t asqatasun/contrast-finder  .
-#   docker build -t asqatasun/contrast-finder  --build-arg CONTRAST_FINDER_RELEASE=0.8.2  .
-#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.2/   .
-#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.2/contrast-finder_0.8.2.i386.tar.gz   .
+#   docker build -t asqatasun/contrast-finder  --build-arg CONTRAST_FINDER_RELEASE=0.8.3  .
+#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.3/   .
+#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.3/contrast-finder_0.8.3.i386.tar.gz   .
 #
 #   --- Launch a container
 #   docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder
@@ -36,7 +36,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1"
 ###################################################################
 
 # build variables
-ARG CONTRAST_FINDER_RELEASE="0.8.2"
+ARG CONTRAST_FINDER_RELEASE="0.8.3"
 ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}"
 ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz"
 

diff --git a/docker/RELEASE/README.md b/docker/RELEASE/README.md
@@ -7,7 +7,8 @@ Tool to provide color combination for a good (accessible, WCAG-compliant) contra
 Supported tags and respective `Dockerfile` links :
 
 * [pre-requisites_from-Ubuntu](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile)
-* [v0.8.2, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile)
+* [v0.8.3, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile)
+* [v0.8.2](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.2/docker/RELEASE/Dockerfile)
 * [v0.8.1](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.1/docker/RELEASE/Dockerfile)
 * [v0.8.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.0/docker/RELEASE/Dockerfile)
 * [v0.7.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.7.0/docker/RELEASE/Dockerfile)

diff --git a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile
@@ -25,7 +25,7 @@ FROM tomcat:7.0-jre7
 ###################################################################
 
 # environment variables
-ENV CONTRAST_FINDER_RELEASE="0.8.2"
+ENV CONTRAST_FINDER_RELEASE="0.8.3"
 ENV TOMCAT_WEBAPP_DIR="/usr/local/tomcat/webapps"
 
 # Prepare Contrast-Finder

diff --git a/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile
@@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
 ###################################################################
 
 # environment variables
-ENV CONTRAST_FINDER_RELEASE="0.8.2"
+ENV CONTRAST_FINDER_RELEASE="0.8.3"
 
 # Add contrast-finder .war
 ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz  /root

diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile
@@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
 ###################################################################
 
 # environment variables
-ENV CONTRAST_FINDER_RELEASE="0.8.2"
+ENV CONTRAST_FINDER_RELEASE="0.8.3"
 ENV CONF_DEFAULT_ALGO="Rgb"
     # ENV CONF_DEFAULT_ALGO="Rgb"
     # ENV CONF_DEFAULT_ALGO="HSV"

diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile
@@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
 ###################################################################
 
 # environment variables
-ENV CONTRAST_FINDER_RELEASE="0.8.2"
+ENV CONTRAST_FINDER_RELEASE="0.8.3"
 ENV CONF_ENV="debug"
 
 # Add contrast-finder .war

diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile
@@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
 ###################################################################
 
 # environment variables
-ENV CONTRAST_FINDER_RELEASE="0.8.2"
+ENV CONTRAST_FINDER_RELEASE="0.8.3"
 ENV PIWIK_KEY="9"
 ENV PIWIK_URL="http://localhost/piwik/"
 

diff --git a/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile b/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:14.04
 LABEL org.label-schema.schema-version = "1.0.0-rc.1"                                            \
       org.label-schema.name           = "Contrast-Finder - WebApp pre-requisites"               \
-      org.label-schema.version        = "0.8.2"                                             \
+      org.label-schema.version        = "0.8.3"                                             \
       org.label-schema.url            = "https://contrast-finder.org"                           \
       org.label-schema.vcs-url        = "https://github.com/Asqatasun/Contrast-Finder"
           # ----> documentation  http://label-schema.org/

diff --git a/documentation/en/Other-contrast-tools.md b/documentation/en/Other-contrast-tools.md
@@ -9,6 +9,7 @@
     * src: https://github.com/moroshko/accessible-colors
 
 ## Other contrast tools (which are actually good, but it appears we don't them)
+
 * http://webaim.org/resources/contrastchecker/
 * http://contrastchecker.com/
 * http://leaverou.github.io/contrast-ratio/
@@ -19,10 +20,13 @@
     * src: https://github.com/andrewbrandwood/a11y-image-text
 
 ### Other contrast tools 
+
 * http://www.visionaustralia.org/digital-access-determinator
 * http://a11yrocks.com/colorPalette/
 * http://colorsafe.co/
-  * https://github.com/donnieberg/accessible-color-palette/
+    * src: https://github.com/donnieberg/accessible-color-palette/
+* https://ryanhemphill.github.io/contrast-colorblind-colorpicker/
+    * src: https://github.com/ryanhemphill/contrast-colorblind-colorpicker
 * https://github.com/johnotander/get-contrast
 * http://www.randoma11y.com/
 * https://www.joedolson.com/tools/color-contrast-tester.php
@@ -31,7 +35,6 @@
     * https://toolness.github.io/accessible-color-matrix/
 * https://addons.mozilla.org/fr/firefox/addon/wcag-contrast-checker/
 * https://hexnaw.com/
-
 * http://jxnblk.com/colorable/
     * https://colorable.jxnblk.com/
     * http://jxnblk.com/hello-color/

diff --git a/documentation/pom.xml b/documentation/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.8.2</version>
+        <version>0.8.3</version>
     </parent>
     <artifactId>documentation</artifactId>
     <packaging>pom</packaging>
-    <version>0.8.2</version>
+    <version>0.8.3</version>
     <name>contrast-finder-documentation</name>
     <licenses>
         <license>
@@ -23,19 +23,12 @@
         <url>https://asqatasun.org</url>
     </organization>   
 
-    <dependencies>
-        <dependency>
-            <groupId>com.ruleoftech</groupId>
-            <artifactId>markdown-page-generator-plugin</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-    </dependencies>
+
     <build>
         <plugins>
                <plugin>
                 <groupId>com.ruleoftech</groupId>
                 <artifactId>markdown-page-generator-plugin</artifactId>
-                <version>1.0.0</version>
                 <executions>
                     <execution>
                         <phase>process-sources</phase>

diff --git a/engine/api/pom.xml b/engine/api/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>engine</artifactId>
-        <version>0.8.2</version>
+        <version>0.8.3</version>
     </parent>
     <artifactId>contrast-finder-api</artifactId>
-    <version>0.8.2</version>
+    <version>0.8.3</version>
     <packaging>jar</packaging>
     <name>api</name>
     <licenses>

diff --git a/engine/api/src/test/java/org/asqatasun/contrast/finder/api/AppTest.java b/engine/api/src/test/java/org/asqatasun/contrast/finder/api/AppTest.java
diff --git a/engine/api/src/test/java/org/asqatasun/contrastfinder/AbstractColorFinderImplTest.java b/engine/api/src/test/java/org/asqatasun/contrastfinder/AbstractColorFinderImplTest.java
@@ -6,6 +6,7 @@
 
 import java.awt.Color;
 import junit.framework.TestCase;
+import org.junit.Test;  // Junit 4 anotation @Test
 
 /**
  *
@@ -30,6 +31,7 @@ protected void tearDown() throws Exception {
     /**
      * Test of findColors method, of class AbstractColorFinderImpl.
      */
+    @Test
     public void testFindColorsWithValidContrastWithBackgroundTested() {
         System.out.println("findColorsWithValidContrastWithBackgroundTested");
         Color foregroundColor = null;
@@ -45,6 +47,7 @@ public void testFindColorsWithValidContrastWithBackgroundTested() {
     /**
      * Test of findColors method, of class AbstractColorFinderImpl.
      */
+    @Test
     public void testFindColorsWithValidContrastWithForegroundTested() {
         System.out.println("findColorsWithValidContrastWithForegroundTested");
         Color foregroundColor = null;
@@ -60,6 +63,7 @@ public void testFindColorsWithValidContrastWithForegroundTested() {
     /**
      * Test of findColors method, of class AbstractColorFinderImpl.
      */
+    @Test
     public void testFindColorsWithInvalidContrastWithBackgroundTested() {
         System.out.println("findColorsWithInvalidContrastWithBackgroundTested");
         Color foregroundColor = null;
@@ -75,6 +79,7 @@ public void testFindColorsWithInvalidContrastWithBackgroundTested() {
     /**
      * Test of findColors method, of class AbstractColorFinderImpl.
      */
+    @Test
     public void testFindColorsWithInvalidContrastWithForegroundTested() {
         System.out.println("findColorsWithInvalidContrastWithForegroundTested");
         Color foregroundColor = null;

diff --git a/engine/hsv/pom.xml b/engine/hsv/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>engine</artifactId>
-        <version>0.8.2</version>
+        <version>0.8.3</version>
     </parent>
     <artifactId>contrast-finder-hsv</artifactId>
-    <version>0.8.2</version>
+    <version>0.8.3</version>
     <packaging>jar</packaging>
     <name>hsv</name>
     <licenses>

diff --git a/engine/hsv/src/test/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvPsychoTest.java b/engine/hsv/src/test/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvPsychoTest.java
@@ -9,6 +9,8 @@
 import java.util.List;
 import static junit.framework.Assert.assertEquals;
 import junit.framework.TestCase;
+import org.junit.Test;  // Junit 4 anotation @Test
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.asqatasun.contrastfinder.result.ColorCombinaison;
@@ -36,6 +38,7 @@ protected void tearDown() throws Exception {
         super.tearDown();
     }
 
+    @Test
     public void testFindColorsNearColorOrange() {
         System.out.println("FindColorsNearColor");
         Color foregroundColor = new Color(255, 165, 0);
@@ -69,7 +72,8 @@ public void testFindColorsNearColorOrange() {
 //        }
 //        LOGGER.debug("Out of bound values " + counter );
     }
-
+
+//    @Test
 //    public void testFindColorsNearColor() {
 //        System.out.println("FindColorsNearColor");
 //        Color foregroundColor = new Color(127, 127, 127);
@@ -89,6 +93,7 @@ public void testFindColorsNearColorOrange() {
     /**
      * Test of getColorFinderKey method, of class ColorFinderHsvPsycho.
      */
+    @Test
     public void testGetColorFinderKey() {
         System.out.println("Key");
         ColorFinderHsv instance = new ColorFinderHsv();