From ed4d50724a5ce38d3155abf4246b4975b1edfc5b Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sat, 25 Jan 2014 18:24:53 -0300 Subject: [PATCH 1/2] Add JCoco Coverage report. --- config/database/mysql/apopulate-schemas.sql | 4 +++ config/database/mysql/create-database.sql | 3 +++ config/database/mysql/create-schemas.sql | 4 +++ wise-webapp/pom.xml | 30 +++++++++++++++++++-- 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/config/database/mysql/apopulate-schemas.sql b/config/database/mysql/apopulate-schemas.sql index cd449f1a..ea90f79a 100644 --- a/config/database/mysql/apopulate-schemas.sql +++ b/config/database/mysql/apopulate-schemas.sql @@ -1,3 +1,7 @@ +# +# Command: mysql -u root -p < apopulate_schemas.sql +# + INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (1, 'test@wisemapping.org', CURRENT_DATE()); INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type) VALUES (1, 'Test', 'User', 'ENC:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3', 1237, CURRENT_DATE(), 1,'D'); diff --git a/config/database/mysql/create-database.sql b/config/database/mysql/create-database.sql index 52a7cd2f..6d2cd226 100644 --- a/config/database/mysql/create-database.sql +++ b/config/database/mysql/create-database.sql @@ -1,3 +1,6 @@ +# +# Command: mysql -u root -p < create_database.sql +# DROP DATABASE IF EXISTS wisemapping; CREATE DATABASE IF NOT EXISTS wisemapping diff --git a/config/database/mysql/create-schemas.sql b/config/database/mysql/create-schemas.sql index 4e26a3fc..c9164ad0 100644 --- a/config/database/mysql/create-schemas.sql +++ b/config/database/mysql/create-schemas.sql @@ -1,3 +1,7 @@ +# +# Command: mysql -u root -p < create_schemas.sql +# + USE wisemapping; CREATE TABLE COLLABORATOR ( diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml index b215d43c..a788a2a6 100644 --- a/wise-webapp/pom.xml +++ b/wise-webapp/pom.xml @@ -507,12 +507,38 @@ - org.apache.maven.plugins maven-surefire-plugin - + + org.jacoco + jacoco-maven-plugin + 0.6.4.201312101107 + + + + pre-unit-test + + prepare-agent + + + + + post-unit-test + test + + report + + + + org.apache.tomcat.maven tomcat7-maven-plugin From b9e64e20e34c4d8e2cd6de957150f4c928227d5c Mon Sep 17 00:00:00 2001 From: Claudio Barril Date: Sat, 25 Jan 2014 23:53:17 -0300 Subject: [PATCH 2/2] fix mysql populate file selected --- wise-webapp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml index a788a2a6..fba5bf53 100644 --- a/wise-webapp/pom.xml +++ b/wise-webapp/pom.xml @@ -417,7 +417,7 @@ config/database/mysql/create-database.sql config/database/mysql/create-schemas.sql - config/database/mysql/test-data.sql + config/database/mysql/apopulate-schemas.sql