get pgtap tests up and running

Author: bitner

docker-compose.yml

@@ -24,6 +24,9 @@ services:
       - POSTGRES_USER=username
       - POSTGRES_PASSWORD=password
       - POSTGRES_DB=postgis
+      - PGUSER=username
+      - PGPASSWORD=password
+      - PGDATABASE=postgis
     ports:
       - "5432:5432"
     volumes:

scripts/test

@@ -16,14 +16,10 @@ Runs tests for the project.
 
 if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
     echo "Running database tests..."
-    # TODO: Fix these tests
-    # scripts/server --detach;
-    # docker-compose  \
-    #     run --rm \
-    #     -e PGUSER=username \
-    #     -e PGPASSWORD=password \
-    #     -e PGHOST=database \
-    #     database /opt/src/test/test.sh;
+    scripts/server --detach;
+    docker-compose  \
+        exec \
+        database /opt/src/test/test.sh;
 
     echo "Running pypgstac tests..."
     docker-compose  \

test/pgtap.sql

@@ -6,6 +6,7 @@
 \pset format unaligned
 \pset tuples_only true
 \pset pager off
+\timing off
 
 -- Revert all changes on failure.
 \set ON_ERROR_ROLLBACK 1
@@ -134,7 +135,6 @@ SELECT has_function('pgstac'::name, 'filter_by_order', ARRAY['item','jsonb','tex
 SELECT has_function('pgstac'::name, 'search_dtrange', ARRAY['jsonb']);
 SELECT has_function('pgstac'::name, 'search', ARRAY['jsonb']);
 
-
 -- Finish the tests and clean up.
 SELECT * FROM finish();
 ROLLBACK;

test/test.sh

@@ -1,22 +1,13 @@
 #!/bin/bash
-tempid=$(cat /dev/urandom | tr -dc 'a-zA-Z' | fold -w 8 | head -n 1)
-tempdb="pgstac_tst_${tmpid}"
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-
-
-createdb $tempdb;
-export PGDATABASE=$tempdb
-
-cd $DIR/..
-psql -f pgstac.sql
-
-
-cat test/testdata/collections.ndjson | psql -c "copy pgstac.collections_staging FROM stdin"
-cat test/testdata/items.ndjson | psql -c "copy pgstac.items_staging FROM stdin"
-
-psql -X -f test/test.sql >/tmp/$tempdb.out
-
-cmp --silent /tmp/$tempdb.out test/test.out && echo '### SUCCESS: Files Tests Pass! ###' || echo '### WARNING: Tests did not pass! ###' && diff /tmp/$tempdb.out test/test.out
-
-dropdb $tempdb;
-rm /tmp/$tempdb.out
+TESTOUTPUT=$(psql -X -f $(dirname $0)/pgtap.sql)
+if [ $? != 0 ]; then
+    echo "Problem connecting to database to run tests."
+    exit 1
+fi
+echo "$TESTOUTPUT" | grep '^not'
+if [ $? == 0 ]; then
+    exit 1
+else
+    echo "All PGTap Tests Passed!"
+    exit 0
+fi