From 4b7c3b7d28f0dc85c7b6123bc4001a191267ab8f Mon Sep 17 00:00:00 2001
From: Bborie Park <bkpark at ucdavis.edu>
Date: Fri, 24 May 2013 17:27:48 +0000
Subject: [PATCH] Refactored use of out-db rasters for regression tests

git-svn-id: http://svn.osgeo.org/postgis/trunk@11496 b70326c6-7e19-0410-871a-916f4a2858ee
---
 raster/test/regress/Makefile.in               | 18 ++++--
 raster/test/regress/clean.sql                 |  4 ++
 raster/test/regress/clean_expected            |  0
 ...{rt_addband-post.pl => load_outdb-post.pl} |  2 +-
 ...{rt_utility-post.sh => load_outdb-post.sh} |  2 +-
 .../{rt_bytea-pre.pl => load_outdb-pre.pl}    |  7 ++-
 .../{rt_utility-pre.sh => load_outdb-pre.sh}  |  3 +-
 raster/test/regress/load_outdb.sql            |  1 +
 raster/test/regress/load_outdb_expected       |  1 +
 raster/test/regress/rt_addband-post.sh        |  6 --
 raster/test/regress/rt_addband-pre.pl         | 61 -------------------
 raster/test/regress/rt_addband-pre.sh         | 55 -----------------
 raster/test/regress/rt_bytea-post.pl          |  8 ---
 raster/test/regress/rt_bytea-post.sh          |  6 --
 raster/test/regress/rt_bytea-pre.sh           | 55 -----------------
 raster/test/regress/rt_utility-post.pl        |  8 ---
 raster/test/regress/rt_utility-pre.pl         | 61 -------------------
 regress/run_test.pl                           |  6 +-
 18 files changed, 29 insertions(+), 275 deletions(-)
 create mode 100644 raster/test/regress/clean.sql
 create mode 100644 raster/test/regress/clean_expected
 rename raster/test/regress/{rt_addband-post.pl => load_outdb-post.pl} (79%)
 rename raster/test/regress/{rt_utility-post.sh => load_outdb-post.sh} (85%)
 rename raster/test/regress/{rt_bytea-pre.pl => load_outdb-pre.pl} (85%)
 rename raster/test/regress/{rt_utility-pre.sh => load_outdb-pre.sh} (90%)
 create mode 100644 raster/test/regress/load_outdb.sql
 create mode 100644 raster/test/regress/load_outdb_expected
 delete mode 100755 raster/test/regress/rt_addband-post.sh
 delete mode 100755 raster/test/regress/rt_addband-pre.pl
 delete mode 100755 raster/test/regress/rt_addband-pre.sh
 delete mode 100755 raster/test/regress/rt_bytea-post.pl
 delete mode 100755 raster/test/regress/rt_bytea-post.sh
 delete mode 100755 raster/test/regress/rt_bytea-pre.sh
 delete mode 100755 raster/test/regress/rt_utility-post.pl
 delete mode 100755 raster/test/regress/rt_utility-pre.pl

diff --git a/raster/test/regress/Makefile.in b/raster/test/regress/Makefile.in
index 161f746d4..8161dbb90 100644
--- a/raster/test/regress/Makefile.in
+++ b/raster/test/regress/Makefile.in
@@ -30,7 +30,11 @@ PATH := $(PGSQL_BINDIR):$(PATH)
 export PATH
 
 TEST_FIRST = \
-	check_gdal
+	check_gdal \
+	load_outdb
+
+TEST_LAST = \
+	clean
 
 TEST_METADATA = \
 	check_raster_columns \
@@ -131,11 +135,13 @@ TEST_LOADER = \
 	loader/Tiled10x10Copy \
 	loader/Tiled8x8
 
-TESTS = $(TEST_FIRST) $(TEST_METADATA) $(TEST_IO) $(TEST_BASIC_FUNC) \
-		$(TEST_PROPS) $(TEST_BANDPROPS) \
-		$(TEST_UTILITY) $(TEST_MAPALGEBRA) $(TEST_SREL) \
-		$(TEST_BUGS) \
-		$(TEST_LOADER)
+TESTS = $(TEST_FIRST) \
+	$(TEST_METADATA) $(TEST_IO) $(TEST_BASIC_FUNC) \
+	$(TEST_PROPS) $(TEST_BANDPROPS) \
+	$(TEST_UTILITY) $(TEST_MAPALGEBRA) $(TEST_SREL) \
+	$(TEST_BUGS) \
+	$(TEST_LOADER) \
+	$(TEST_LAST)
 
 all:
 	@echo "Use 'make check' to run all tests"
diff --git a/raster/test/regress/clean.sql b/raster/test/regress/clean.sql
new file mode 100644
index 000000000..b96c2d418
--- /dev/null
+++ b/raster/test/regress/clean.sql
@@ -0,0 +1,4 @@
+SET client_min_messages TO warning;
+
+-- remove raster_outdb_template table
+DROP TABLE IF EXISTS raster_outdb_template;
diff --git a/raster/test/regress/clean_expected b/raster/test/regress/clean_expected
new file mode 100644
index 000000000..e69de29bb
diff --git a/raster/test/regress/rt_addband-post.pl b/raster/test/regress/load_outdb-post.pl
similarity index 79%
rename from raster/test/regress/rt_addband-post.pl
rename to raster/test/regress/load_outdb-post.pl
index a48c932ff..54c91a3bf 100755
--- a/raster/test/regress/rt_addband-post.pl
+++ b/raster/test/regress/load_outdb-post.pl
@@ -5,4 +5,4 @@ my $REGDIR = abs_path(dirname($0));
 my $RASTERDIR = abs_path($REGDIR . "/../raster/test/regress");
 
 unlink $RASTERDIR . '/' . $TEST . '-pre.sql';
-unlink $RASTERDIR . '/' . $TEST . '-post.sql';
+#unlink $RASTERDIR . '/' . $TEST . '-post.sql';
diff --git a/raster/test/regress/rt_utility-post.sh b/raster/test/regress/load_outdb-post.sh
similarity index 85%
rename from raster/test/regress/rt_utility-post.sh
rename to raster/test/regress/load_outdb-post.sh
index e17075809..914c97b30 100755
--- a/raster/test/regress/rt_utility-post.sh
+++ b/raster/test/regress/load_outdb-post.sh
@@ -3,4 +3,4 @@ while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 rm -f "$DIR/$TEST-pre.sql"
-rm -f "$DIR/$TEST-post.sql"
+#rm -f "$DIR/$TEST-post.sql"
diff --git a/raster/test/regress/rt_bytea-pre.pl b/raster/test/regress/load_outdb-pre.pl
similarity index 85%
rename from raster/test/regress/rt_bytea-pre.pl
rename to raster/test/regress/load_outdb-pre.pl
index 772877df5..530c3fb0b 100755
--- a/raster/test/regress/rt_bytea-pre.pl
+++ b/raster/test/regress/load_outdb-pre.pl
@@ -56,6 +56,7 @@ open(PRESQL, '>', $RASTERDIR . '/' . $TEST . '-pre.sql');
 print PRESQL $sql;
 close(PRESQL);
 
-open(POSTSQL, '>', $RASTERDIR . '/' . $TEST . '-post.sql');
-print POSTSQL "DROP TABLE IF EXISTS raster_outdb_template;\n";
-close(POSTSQL);
+# no longer needed as the "clean" test takes care of it
+#open(POSTSQL, '>', $RASTERDIR . '/' . $TEST . '-post.sql');
+#print POSTSQL "DROP TABLE IF EXISTS raster_outdb_template;\n";
+#close(POSTSQL);
diff --git a/raster/test/regress/rt_utility-pre.sh b/raster/test/regress/load_outdb-pre.sh
similarity index 90%
rename from raster/test/regress/rt_utility-pre.sh
rename to raster/test/regress/load_outdb-pre.sh
index 6102ed058..b085761ed 100755
--- a/raster/test/regress/rt_utility-pre.sh
+++ b/raster/test/regress/load_outdb-pre.sh
@@ -52,4 +52,5 @@ SELECT \
 
 echo "$SQL" > "$DIR/$TEST-pre.sql"
 
-echo "DROP TABLE IF EXISTS raster_outdb_template;" > "$DIR/$TEST-post.sql"
+# no longer needed as "clean" test takes care of it
+#echo "DROP TABLE IF EXISTS raster_outdb_template;" > "$DIR/$TEST-post.sql"
diff --git a/raster/test/regress/load_outdb.sql b/raster/test/regress/load_outdb.sql
new file mode 100644
index 000000000..a14a055fb
--- /dev/null
+++ b/raster/test/regress/load_outdb.sql
@@ -0,0 +1 @@
+SELECT count(*) FROM raster_outdb_template;
diff --git a/raster/test/regress/load_outdb_expected b/raster/test/regress/load_outdb_expected
new file mode 100644
index 000000000..b8626c4cf
--- /dev/null
+++ b/raster/test/regress/load_outdb_expected
@@ -0,0 +1 @@
+4
diff --git a/raster/test/regress/rt_addband-post.sh b/raster/test/regress/rt_addband-post.sh
deleted file mode 100755
index e17075809..000000000
--- a/raster/test/regress/rt_addband-post.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
-DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-
-rm -f "$DIR/$TEST-pre.sql"
-rm -f "$DIR/$TEST-post.sql"
diff --git a/raster/test/regress/rt_addband-pre.pl b/raster/test/regress/rt_addband-pre.pl
deleted file mode 100755
index 772877df5..000000000
--- a/raster/test/regress/rt_addband-pre.pl
+++ /dev/null
@@ -1,61 +0,0 @@
-use File::Basename;
-use Cwd 'abs_path';
-
-my $REGDIR = abs_path(dirname($0));
-my $RASTERDIR = abs_path($REGDIR . "/../raster/test/regress");
-my $FILERASTER = $RASTERDIR . "/loader/testraster.tif";
-
-# special handling for msys
-if (lc($^O) eq "msys") {
-	$FILERASTER = `cmd //c echo "$FILERASTER"`;
-	$FILERASTER =~ s/^\s+//;
-	$FILERASTER =~ s/\s+$//;
-}
-
-my $sql = <<"END";
-DROP TABLE IF EXISTS raster_outdb_template;
-CREATE TABLE raster_outdb_template AS
-SELECT
-	1 AS rid,
-	ST_AddBand(
-		ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0),
-		1, '$FILERASTER'::text, NULL::int[]
-	) AS rast
-UNION ALL
-SELECT
-	2 AS rid,
-	ST_AddBand(
-		ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0),
-		'$FILERASTER'::text, NULL::int[]
-	) AS rast
-UNION ALL
-SELECT
-	3 AS rid,
-	ST_AddBand(
-		ST_AddBand(
-			ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0),
-			1, '8BUI', 1, 0
-		),
-		'$FILERASTER'::text, ARRAY[2]::int[]
-	) AS rast
-UNION ALL
-SELECT
-	4 AS rid,
-	ST_AddBand(
-		ST_AddBand(
-			ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0),
-			1, '8BUI', 1, 0
-		),
-		'$FILERASTER'::text, ARRAY[2]::int[],
-		1,
-		255
-	) AS rast
-END
-
-open(PRESQL, '>', $RASTERDIR . '/' . $TEST . '-pre.sql');
-print PRESQL $sql;
-close(PRESQL);
-
-open(POSTSQL, '>', $RASTERDIR . '/' . $TEST . '-post.sql');
-print POSTSQL "DROP TABLE IF EXISTS raster_outdb_template;\n";
-close(POSTSQL);
diff --git a/raster/test/regress/rt_addband-pre.sh b/raster/test/regress/rt_addband-pre.sh
deleted file mode 100755
index 6102ed058..000000000
--- a/raster/test/regress/rt_addband-pre.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
-DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-
-FILERASTER="$DIR/loader/testraster.tif"
-
-# special handling for msys
-CSYS=`uname -o | tr '[:upper:]' '[:lower:]'`
-if [ "$CSYS" == "msys" ]; then
-	FILERASTER=`cmd //c echo "${FILERASTER}"`
-fi
-
-SQL=" \
-DROP TABLE IF EXISTS raster_outdb_template; \
-CREATE TABLE raster_outdb_template AS \
-SELECT \
-	1 AS rid, \
-	ST_AddBand( \
-		ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0), \
-		1, '$FILERASTER'::text, NULL::int[] \
-	) AS rast \
-UNION ALL \
-SELECT \
-	2 AS rid, \
-	ST_AddBand( \
-		ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0), \
-		'$FILERASTER'::text, NULL::int[] \
-	) AS rast \
-UNION ALL \
-SELECT \
-	3 AS rid, \
-	ST_AddBand( \
-		ST_AddBand( \
-			ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0), \
-			1, '8BUI', 1, 0 \
-		), \
-		'$FILERASTER'::text, ARRAY[2]::int[] \
-	) AS rast \
-UNION ALL \
-SELECT \
-	4 AS rid, \
-	ST_AddBand( \
-		ST_AddBand( \
-			ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0), \
-			1, '8BUI', 1, 0 \
-		), \
-		'$FILERASTER'::text, ARRAY[2]::int[], \
-		1, \
-		255 \
-	) AS rast \
-"
-
-echo "$SQL" > "$DIR/$TEST-pre.sql"
-
-echo "DROP TABLE IF EXISTS raster_outdb_template;" > "$DIR/$TEST-post.sql"
diff --git a/raster/test/regress/rt_bytea-post.pl b/raster/test/regress/rt_bytea-post.pl
deleted file mode 100755
index a48c932ff..000000000
--- a/raster/test/regress/rt_bytea-post.pl
+++ /dev/null
@@ -1,8 +0,0 @@
-use File::Basename;
-use Cwd 'abs_path';
-
-my $REGDIR = abs_path(dirname($0));
-my $RASTERDIR = abs_path($REGDIR . "/../raster/test/regress");
-
-unlink $RASTERDIR . '/' . $TEST . '-pre.sql';
-unlink $RASTERDIR . '/' . $TEST . '-post.sql';
diff --git a/raster/test/regress/rt_bytea-post.sh b/raster/test/regress/rt_bytea-post.sh
deleted file mode 100755
index e17075809..000000000
--- a/raster/test/regress/rt_bytea-post.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
-DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-
-rm -f "$DIR/$TEST-pre.sql"
-rm -f "$DIR/$TEST-post.sql"
diff --git a/raster/test/regress/rt_bytea-pre.sh b/raster/test/regress/rt_bytea-pre.sh
deleted file mode 100755
index 6102ed058..000000000
--- a/raster/test/regress/rt_bytea-pre.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
-DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-
-FILERASTER="$DIR/loader/testraster.tif"
-
-# special handling for msys
-CSYS=`uname -o | tr '[:upper:]' '[:lower:]'`
-if [ "$CSYS" == "msys" ]; then
-	FILERASTER=`cmd //c echo "${FILERASTER}"`
-fi
-
-SQL=" \
-DROP TABLE IF EXISTS raster_outdb_template; \
-CREATE TABLE raster_outdb_template AS \
-SELECT \
-	1 AS rid, \
-	ST_AddBand( \
-		ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0), \
-		1, '$FILERASTER'::text, NULL::int[] \
-	) AS rast \
-UNION ALL \
-SELECT \
-	2 AS rid, \
-	ST_AddBand( \
-		ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0), \
-		'$FILERASTER'::text, NULL::int[] \
-	) AS rast \
-UNION ALL \
-SELECT \
-	3 AS rid, \
-	ST_AddBand( \
-		ST_AddBand( \
-			ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0), \
-			1, '8BUI', 1, 0 \
-		), \
-		'$FILERASTER'::text, ARRAY[2]::int[] \
-	) AS rast \
-UNION ALL \
-SELECT \
-	4 AS rid, \
-	ST_AddBand( \
-		ST_AddBand( \
-			ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0), \
-			1, '8BUI', 1, 0 \
-		), \
-		'$FILERASTER'::text, ARRAY[2]::int[], \
-		1, \
-		255 \
-	) AS rast \
-"
-
-echo "$SQL" > "$DIR/$TEST-pre.sql"
-
-echo "DROP TABLE IF EXISTS raster_outdb_template;" > "$DIR/$TEST-post.sql"
diff --git a/raster/test/regress/rt_utility-post.pl b/raster/test/regress/rt_utility-post.pl
deleted file mode 100755
index a48c932ff..000000000
--- a/raster/test/regress/rt_utility-post.pl
+++ /dev/null
@@ -1,8 +0,0 @@
-use File::Basename;
-use Cwd 'abs_path';
-
-my $REGDIR = abs_path(dirname($0));
-my $RASTERDIR = abs_path($REGDIR . "/../raster/test/regress");
-
-unlink $RASTERDIR . '/' . $TEST . '-pre.sql';
-unlink $RASTERDIR . '/' . $TEST . '-post.sql';
diff --git a/raster/test/regress/rt_utility-pre.pl b/raster/test/regress/rt_utility-pre.pl
deleted file mode 100755
index 772877df5..000000000
--- a/raster/test/regress/rt_utility-pre.pl
+++ /dev/null
@@ -1,61 +0,0 @@
-use File::Basename;
-use Cwd 'abs_path';
-
-my $REGDIR = abs_path(dirname($0));
-my $RASTERDIR = abs_path($REGDIR . "/../raster/test/regress");
-my $FILERASTER = $RASTERDIR . "/loader/testraster.tif";
-
-# special handling for msys
-if (lc($^O) eq "msys") {
-	$FILERASTER = `cmd //c echo "$FILERASTER"`;
-	$FILERASTER =~ s/^\s+//;
-	$FILERASTER =~ s/\s+$//;
-}
-
-my $sql = <<"END";
-DROP TABLE IF EXISTS raster_outdb_template;
-CREATE TABLE raster_outdb_template AS
-SELECT
-	1 AS rid,
-	ST_AddBand(
-		ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0),
-		1, '$FILERASTER'::text, NULL::int[]
-	) AS rast
-UNION ALL
-SELECT
-	2 AS rid,
-	ST_AddBand(
-		ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0),
-		'$FILERASTER'::text, NULL::int[]
-	) AS rast
-UNION ALL
-SELECT
-	3 AS rid,
-	ST_AddBand(
-		ST_AddBand(
-			ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0),
-			1, '8BUI', 1, 0
-		),
-		'$FILERASTER'::text, ARRAY[2]::int[]
-	) AS rast
-UNION ALL
-SELECT
-	4 AS rid,
-	ST_AddBand(
-		ST_AddBand(
-			ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0),
-			1, '8BUI', 1, 0
-		),
-		'$FILERASTER'::text, ARRAY[2]::int[],
-		1,
-		255
-	) AS rast
-END
-
-open(PRESQL, '>', $RASTERDIR . '/' . $TEST . '-pre.sql');
-print PRESQL $sql;
-close(PRESQL);
-
-open(POSTSQL, '>', $RASTERDIR . '/' . $TEST . '-post.sql');
-print POSTSQL "DROP TABLE IF EXISTS raster_outdb_template;\n";
-close(POSTSQL);
diff --git a/regress/run_test.pl b/regress/run_test.pl
index dfcfbaec7..38c487782 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -1039,21 +1039,21 @@ sub prepare_spatial
 	
 	if ( $OPT_WITH_TOPO )
 	{
-		print "Loading Topology\n";
+		print "Loading Topology into '${DB}'\n";
 		load_sql_file("${STAGED_SCRIPTS_DIR}/topology.sql", 1);
 		load_sql_file("${STAGED_SCRIPTS_DIR}/topology_comments.sql", 0);
 	}
 	
 	if ( $OPT_WITH_RASTER )
 	{
-		print "Loading Raster\n";
+		print "Loading Raster into '${DB}'\n";
 		load_sql_file("${STAGED_SCRIPTS_DIR}/rtpostgis.sql", 1);
 		load_sql_file("${STAGED_SCRIPTS_DIR}/raster_comments.sql", 0);
 	}
 
 	if ( $OPT_WITH_SFCGAL )
 	{
-		print "Loading sfcgal\n";
+		print "Loading SFCGAL into '${DB}'\n";
 		load_sql_file("${STAGED_SCRIPTS_DIR}/sfcgal.sql", 1);
 		load_sql_file("${STAGED_SCRIPTS_DIR}/sfcgal_comments.sql", 0);
 	}
-- 
2.50.1