New tests for MapServer#6907.

sdlime · Feb 20, 2024 · 4a054e4 · 4a054e4
1 parent 1962564
commit 4a054e4
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 0 deletions.
diff --git a/msautotest/query/6907_01.conf b/msautotest/query/6907_01.conf
@@ -0,0 +1,6 @@
+CONFIG
+  ENV
+    MS_MAP_PATTERN "."
+    MS_EMPTY "http://localhost/6907_01.html"
+  END
+END
diff --git a/msautotest/query/6907_01.map b/msautotest/query/6907_01.map
@@ -0,0 +1,32 @@
+# Test 1: mode=itemquery - matching record
+# RUN_PARMS: 6907_01_test001.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=itemquery&qlayer=bdry_counpy2&qstring=ANOK&qitem=cty_abbr' > [RESULT]
+#
+# Test 2: mode=itemquery - no matching record
+# RUN_PARMS: 6907_01_test002.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=itemquery&qlayer=bdry_counpy2&qstring=ABCD&qitem=cty_abbr' > [RESULT]
+#
+# Test 3: mode=itemquery - no matching record, MS_EMPTY in config
+# RUN_PARMS: 6907_01_test003.txt [MAPSERV] -conf 6907_01.conf QUERY_STRING='map=[MAPFILE]&mode=itemquery&qlayer=bdry_counpy2&qstring=ABCD&qitem=cty_abbr' > [RESULT]
+MAP
+  NAME 'query'
+  EXTENT 125000 4785000 789000 5489000
+  UNITS METERS
+
+  WEB
+    QUERYFORMAT 'tmpl'
+  END
+
+  OUTPUTFORMAT
+    NAME 'tmpl'
+    DRIVER 'TEMPLATE'
+    MIMETYPE 'text/html'
+    FORMATOPTION "FILE=template/6907.tmpl"
+  END
+
+  LAYER
+    NAME 'bdry_counpy2'
+    VALIDATION
+      qstring '^[A-Z]{4}$'
+    END
+    INCLUDE 'include/bdry_counpy2_shapefile.map'
+  END
+END
diff --git a/msautotest/query/6907_02.map b/msautotest/query/6907_02.map
@@ -0,0 +1,30 @@
+# Test 1: mode=itemquery - matching record
+# RUN_PARMS: 6907_02_test001.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=itemquery&qlayer=bdry_counpy2&qstring=ANOK&qitem=cty_abbr' > [RESULT]
+#
+# Test 2: mode=itemquery - no matching record
+# RUN_PARMS: 6907_02_test002.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=itemquery&qlayer=bdry_counpy2&qstring=ABCD&qitem=cty_abbr' > [RESULT]
+MAP
+  NAME 'query'
+  EXTENT 125000 4785000 789000 5489000
+  UNITS METERS
+
+  WEB
+    EMPTY 'http://localhost/6907_02.html'
+    QUERYFORMAT 'tmpl'
+  END
+
+  OUTPUTFORMAT
+    NAME 'tmpl'
+    DRIVER 'TEMPLATE'
+    MIMETYPE 'text/html'
+    FORMATOPTION "FILE=template/6907.tmpl"
+  END
+
+  LAYER
+    NAME 'bdry_counpy2'
+    VALIDATION
+      qstring '^[A-Z]{4}$'
+    END
+    INCLUDE 'include/bdry_counpy2_shapefile.map'
+  END
+END
diff --git a/msautotest/query/expected/6907_01_test001.txt b/msautotest/query/expected/6907_01_test001.txt
@@ -0,0 +1,4 @@
+Content-Type: text/html
+
+Anoka:ANOK 
+
diff --git a/msautotest/query/expected/6907_01_test002.txt b/msautotest/query/expected/6907_01_test002.txt
@@ -0,0 +1,4 @@
+Content-Type: text/html
+
+
+
diff --git a/msautotest/query/expected/6907_01_test003.txt b/msautotest/query/expected/6907_01_test003.txt
@@ -0,0 +1,5 @@
+Status: 302 Found
+Uri: http://localhost/6907_01.html
+Location: http://localhost/6907_01.html
+Content-Type: text/html
+
diff --git a/msautotest/query/expected/6907_02_test001.txt b/msautotest/query/expected/6907_02_test001.txt
@@ -0,0 +1,4 @@
+Content-Type: text/html
+
+Anoka:ANOK 
+
diff --git a/msautotest/query/expected/6907_02_test002.txt b/msautotest/query/expected/6907_02_test002.txt
@@ -0,0 +1,5 @@
+Status: 302 Found
+Uri: http://localhost/6907_02.html
+Location: http://localhost/6907_02.html
+Content-Type: text/html
+