From 0253480b109da443dd6cb1ee05345bf42c7fa89e Mon Sep 17 00:00:00 2001
From: Fabrice Lecomte <fabrice.lecomte.be@gmail.com>
Date: Mon, 11 May 2020 02:29:02 +0200
Subject: [PATCH] Improve SQL test script

---
 .idea/runConfigurations/SQL_Tests.xml         |  4 +--
 .../{fixture_user.sql => 1-fixture_user.sql}  |  0
 ...ture_citizen.sql => 2-fixture_citizen.sql} |  0
 ..._workgroup.sql => 3-fixture_workgroup.sql} |  0
 ...ture_article.sql => 4-fixture_article.sql} |  0
 src/test/sql/test.sh                          | 33 +++++++++++++++++++
 src/test/test.sh                              |  6 ----
 7 files changed, 35 insertions(+), 8 deletions(-)
 rename src/test/sql/fixtures/{fixture_user.sql => 1-fixture_user.sql} (100%)
 rename src/test/sql/fixtures/{fixture_citizen.sql => 2-fixture_citizen.sql} (100%)
 rename src/test/sql/fixtures/{fixture_workgroup.sql => 3-fixture_workgroup.sql} (100%)
 rename src/test/sql/fixtures/{fixture_article.sql => 4-fixture_article.sql} (100%)
 create mode 100644 src/test/sql/test.sh
 delete mode 100644 src/test/test.sh

diff --git a/.idea/runConfigurations/SQL_Tests.xml b/.idea/runConfigurations/SQL_Tests.xml
index 89d93be..ba4355d 100644
--- a/.idea/runConfigurations/SQL_Tests.xml
+++ b/.idea/runConfigurations/SQL_Tests.xml
@@ -1,10 +1,10 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="SQL Tests" type="ShConfigurationType">
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
-    <option name="SCRIPT_PATH" value="$PROJECT_DIR$/src/test/test.sh" />
+    <option name="SCRIPT_PATH" value="$PROJECT_DIR$/src/test/sql/test.sh" />
     <option name="SCRIPT_OPTIONS" value="" />
     <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
-    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$/src/test" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$/src/test/sql" />
     <option name="INDEPENDENT_INTERPRETER_PATH" value="false" />
     <option name="INTERPRETER_PATH" value="C:/Program Files/Git/bin/bash.exe" />
     <option name="INTERPRETER_OPTIONS" value="" />
diff --git a/src/test/sql/fixtures/fixture_user.sql b/src/test/sql/fixtures/1-fixture_user.sql
similarity index 100%
rename from src/test/sql/fixtures/fixture_user.sql
rename to src/test/sql/fixtures/1-fixture_user.sql
diff --git a/src/test/sql/fixtures/fixture_citizen.sql b/src/test/sql/fixtures/2-fixture_citizen.sql
similarity index 100%
rename from src/test/sql/fixtures/fixture_citizen.sql
rename to src/test/sql/fixtures/2-fixture_citizen.sql
diff --git a/src/test/sql/fixtures/fixture_workgroup.sql b/src/test/sql/fixtures/3-fixture_workgroup.sql
similarity index 100%
rename from src/test/sql/fixtures/fixture_workgroup.sql
rename to src/test/sql/fixtures/3-fixture_workgroup.sql
diff --git a/src/test/sql/fixtures/fixture_article.sql b/src/test/sql/fixtures/4-fixture_article.sql
similarity index 100%
rename from src/test/sql/fixtures/fixture_article.sql
rename to src/test/sql/fixtures/4-fixture_article.sql
diff --git a/src/test/sql/test.sh b/src/test/sql/test.sh
new file mode 100644
index 0000000..13cccaf
--- /dev/null
+++ b/src/test/sql/test.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+PS3='Please enter your choice: '
+options=("RESET DB" "All" "article" "citizen" "comment" "constitution" "follow" "opinion" "user" "vote" "workgroup" "Quit")
+select opt in "${options[@]}"
+do
+    case $opt in
+        "RESET DB")
+            cat \
+              ../../main/resources/sql/migrations/*.down.sql \
+              ../../main/resources/sql/migrations/*.up.sql > ./allSQL.sql
+            docker exec -i postgresql_dc-project psql test test -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
+            rm ./allSQL.sql
+            break;;
+        "All")
+            cat ../../main/resources/sql/functions/*/*.sql \
+              ./fixtures/*.sql \
+              ./*.sql > ./allSQL.sql
+            docker exec -i postgresql_dc-project psql test test -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
+            rm ./allSQL.sql
+            break;;
+        "Quit")
+            break;;
+        *) echo "Start tests $opt"
+            cat ../../main/resources/sql/functions/*/*.sql \
+              ./fixtures/*.sql \
+              ./"$opt".sql > ./allSQL.sql
+            docker exec -i postgresql_dc-project psql test test -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
+            rm ./allSQL.sql
+            break;;
+    esac
+done
+
diff --git a/src/test/test.sh b/src/test/test.sh
deleted file mode 100644
index 393242e..0000000
--- a/src/test/test.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#bin/bash
-echo "Start tests"
-cat ../main/resources/sql/functions/*/*.sql ../main/resources/sql/migrations/*.sql ./sql/fixtures/*.sql ./sql/*.sql > ./allSQL.sql
-docker exec -i postgresql_dc-project psql test test -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
-rm ./allSQL.sql
-#sleep 20
\ No newline at end of file