From 75414fb1c34cec3870534aeb079d56dd07268808 Mon Sep 17 00:00:00 2001
From: Antonin Delpeuch <antonin@delpeuch.eu>
Date: Mon, 10 Sep 2018 14:26:14 +0100
Subject: [PATCH] Simplify test invocation

---
 .travis.yml  | 4 +---
 appveyor.yml | 5 ++---
 refine       | 4 ++--
 refine.bat   | 6 ++++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 082984d84..693ae6268 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,11 +22,9 @@ before_install:
   - psql -c 'CREATE DATABASE test_db;' -U postgres
   - psql -U postgres test_db < extensions/database/tests/conf/travis-pgsql.sql
   - cp extensions/database/tests/conf/travis_tests.xml extensions/database/tests/conf/tests.xml
-  - mvn process-resources
 
 script:
-  - ./refine server_test
-  - ./refine extensions_test
+  - ./refine test
 
 after_success:
   - java -cp ~/codacy-coverage-reporter-assembly-latest.jar com.codacy.CodacyCoverageReporter -l Java -r build/report/jacoco.xml
diff --git a/appveyor.yml b/appveyor.yml
index c09cde600..5fb4dd001 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -37,6 +37,7 @@ before_test:
     psql -U postgres test_db < extensions\database\tests\conf\travis-pgsql.sql
 
     copy extensions\database\tests\conf\appveyor_tests.xml extensions\database\tests\conf\tests.xml
+- cmd: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
 
 test_script:
 - cmd: echo Running test_script...
@@ -45,6 +46,4 @@ test_script:
 
     path
 
-    refine server_test
-  
-    refine extensions_test
+    refine test
diff --git a/refine b/refine
index da581366a..d43116ca0 100755
--- a/refine
+++ b/refine
@@ -623,12 +623,12 @@ ui_test() {
 
 server_test() {
     mvn_prepare
-    $MVN test -pl main
+    $MVN test -f main
 }
 
 extensions_test() {
     mvn_prepare
-    $MVN test -pl extensions
+    $MVN test -f extensions
 }
 
 run() {
diff --git a/refine.bat b/refine.bat
index 00edbbc11..46545b511 100644
--- a/refine.bat
+++ b/refine.bat
@@ -47,6 +47,7 @@ echo.
 echo   build ..................... Build OpenRefine
 echo   run ....................... Run OpenRefine
 echo.
+echo   test ...................... Run all the tests
 echo   server_test ............... Run the server tests
 echo   extensions_test ........... Run the extensions tests
 echo.
@@ -234,8 +235,9 @@ echo.
 :gotMvnHome
 set MVN_ACTION=""%ACTION%""
 if ""%ACTION%"" == ""build"" set MVN_ACTION=""process-resources compile dependency:build-classpath""
-if ""%ACTION%"" == ""server_test"" set MVN_ACTION=""process-resources compile test -pl main""
-if ""%ACTION%"" == ""extensions_test"" set MVN_ACTION=""process-resources compile test -pl extensions""
+if ""%ACTION%"" == ""test"" set MVN_ACTION=""process-resources compile test""
+if ""%ACTION%"" == ""server_test"" set MVN_ACTION=""process-resources compile test -f main""
+if ""%ACTION%"" == ""extensions_test"" set MVN_ACTION=""process-resources compile test -f extensions""
 "%MAVEN_HOME%\bin\mvn.cmd" %MVN_ACTION%
 goto end