Merge branch 'MQE-601' into sprint-develop

Author: tomreece

.gitignore

@@ -8,3 +8,5 @@ cghooks.lock
 src/Magento/FunctionalTestingFramework/Group/*.php
 .DS_Store
 build/*
+clover.xml
+coverage/

.travis.yml

@@ -5,10 +5,7 @@ php:
 install: composer install --no-interaction --prefer-source
 env:
   matrix:
-    - VERIFICATION_TOOL=copyright-check
     - VERIFICATION_TOOL=phpunit-checks
     - VERIFICATION_TOOL=static-checks
 script:
   - bin/$VERIFICATION_TOOL
-after_script:
-  - if [ $VERIFICATION_TOOL == "phpunit-checks" ]; then php vendor/bin/codacycoverage phpunit; fi

bin/phpunit-checks

@@ -1,12 +1,21 @@
 # Copyright © Magento, Inc. All rights reserved.
 # See COPYING.txt for license details.
 
+# REMEMBER TO UPDATE THE .BAT FILE
+
+UNIT_COVERAGE_THRESHOLD=20
+
 set -e
 
 echo "==============================="
 echo "          UNIT TESTS"
 echo "==============================="
-vendor/bin/phpunit --configuration dev/tests/phpunit.xml --testsuite unit
+vendor/bin/phpunit --configuration dev/tests/phpunit.xml --testsuite unit --coverage-clover clover.xml
+
+echo "==============================="
+echo "       UNIT TEST COVERAGE"
+echo "==============================="
+vendor/bin/coverage-check clover.xml $UNIT_COVERAGE_THRESHOLD
 
 echo "==============================="
 echo "      VERIFICATION TESTS"

bin/phpunit-checks.bat

@@ -1,10 +1,18 @@
 :: Copyright © Magento, Inc. All rights reserved.
 :: See COPYING.txt for license details.
 
+:: REMEMBER TO UPDATE THE BASH FILE
+
+SET UNIT_COVERAGE_THRESHOLD=20
+
 @echo ===============================UNIT TESTS===============================
 @echo off
-call vendor\bin\phpunit --configuration dev\tests\phpunit.xml --testsuite unit --coverage-xml build\coverage-xml
+call vendor\bin\phpunit --configuration dev\tests\phpunit.xml --testsuite unit --coverage-clover clover.xml
+
+@echo ===========================UNIT TEST COVERAGE===========================
+@echo off
+call vendor\bin\coverage-check clover.xml %UNIT_COVERAGE_THRESHOLD%
 
+@echo ===========================VERIFICATION TESTS===========================
 @echo off
-@echo ===============================VERIFICATION TESTS===============================
-call vendor\bin\phpunit --configuration dev\tests\phpunit.xml --testsuite verification --coverage-xml build\coverage-xml
+call vendor\bin\phpunit --configuration dev\tests\phpunit.xml --testsuite verification

bin/static-checks

@@ -1,6 +1,8 @@
 # Copyright © Magento, Inc. All rights reserved.
 # See COPYING.txt for license details.
 
+## REMEMBER TO UPDATE THE .BAT FILE
+
 set -e
 
 echo "==============================="

bin/static-checks.bat

@@ -1,6 +1,8 @@
 :: Copyright © Magento, Inc. All rights reserved.
 :: See COPYING.txt for license details.
 
+:: REMEMBER TO UPDATE THE BASH FILE
+
 @echo off
 @echo ===============================PHP CODE SNIFFER REPORT===============================
 call vendor\bin\phpcs .\src --standard=.\dev\tests\static\Magento
@@ -16,4 +18,4 @@ vendor\bin\phpmd .\src text \dev\tests\static\Magento\CodeMessDetector\ruleset.x
 @echo ===============================MAGENTO COPYRIGHT REPORT===============================
 echo msgbox "INFO:Copyright check currently not run as part of .bat implementation" > "%temp%\popup.vbs"
 wscript.exe "%temp%\popup.vbs"
-::bin\copyright-check
+::bin\copyright-check

composer.json

@@ -22,7 +22,8 @@
         "brainmaestro/composer-git-hooks": "^2.3",
         "codeception/aspect-mock": "^2.0",
         "codacy/coverage": "^1.4",
-        "phpmd/phpmd": "^2.6.0"
+        "phpmd/phpmd": "^2.6.0",
+        "rregeer/phpunit-coverage-check": "^0.1.4"
     },
     "autoload": {
         "psr-4": {