davidw 02/01/22 12:58:48
Modified: . ChangeLog
src TclWeb.h TclWebapache.c
tests get.rvt get.test post.rvt post.test
Log:
* tests/get.test: Added some tests related to [var *].
* tests/post.test: Added some tests related to [var *].
Revision Changes Path
1.24 +4 -0 tcl-rivet/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /home/cvs/tcl-rivet/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChangeLog 22 Jan 2002 01:27:56 -0000 1.23
+++ ChangeLog 22 Jan 2002 20:58:48 -0000 1.24
@@ -1,5 +1,9 @@
2002-01-22 David N. Welton <[EMAIL PROTECTED]>
+ * tests/get.test: Added some tests related to [var *].
+
+ * tests/post.test: Added some tests related to [var *].
+
* src/rivetList.c (Rivet_LassignArrayObjCmd): Use -1 instead of
NULL when doing NewStringObj.
1.5 +2 -1 tcl-rivet/src/TclWeb.h
Index: TclWeb.h
===================================================================
RCS file: /home/cvs/tcl-rivet/src/TclWeb.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TclWeb.h 22 Jan 2002 01:27:56 -0000 1.4
+++ TclWeb.h 22 Jan 2002 20:58:48 -0000 1.5
@@ -5,7 +5,7 @@
* Common API layer.
*/
-/* $Id: TclWeb.h,v 1.4 2002/01/22 01:27:56 davidw Exp $ */
+/* $Id: TclWeb.h,v 1.5 2002/01/22 20:58:48 davidw Exp $ */
#define DEFAULT_TIME_FORMAT "%A, %d-%b-%Y %H:%M:%S %Z"
@@ -13,6 +13,7 @@
Tcl_Interp *interp;
request_rec *req;
ApacheRequest *apachereq;
+ int headers_printed;
} TclWebRequest;
/*
1.5 +2 -1 tcl-rivet/src/TclWebapache.c
Index: TclWebapache.c
===================================================================
RCS file: /home/cvs/tcl-rivet/src/TclWebapache.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TclWebapache.c 22 Jan 2002 01:27:56 -0000 1.4
+++ TclWebapache.c 22 Jan 2002 20:58:48 -0000 1.5
@@ -7,7 +7,7 @@
* operations.
*/
-/* $Id: TclWebapache.c,v 1.4 2002/01/22 01:27:56 davidw Exp $ */
+/* $Id: TclWebapache.c,v 1.5 2002/01/22 20:58:48 davidw Exp $ */
#include <tcl.h>
@@ -26,6 +26,7 @@
req->interp = interp;
req->req = r;
req->apachereq = ApacheRequest_new(r);
+ req->headers_printed = 0;
return TCL_OK;
}
1.2 +12 -5 tcl-rivet/tests/get.rvt
Index: get.rvt
===================================================================
RCS file: /home/cvs/tcl-rivet/tests/get.rvt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- get.rvt 6 Jan 2002 13:30:54 -0000 1.1
+++ get.rvt 22 Jan 2002 20:58:48 -0000 1.2
@@ -1,13 +1,20 @@
<?
-if { [ var number ] > 0 } {
- # get/post variables 1.1
- if { [ var exists foobar ] } {
+if { [var number] > 0 } {
+ if { [var exists foobar] } {
puts "\[var get foobar\] = [var get foobar]\n"
}
- # get/post variables 1.{2,3}
- if { [ var exists M�s ] } {
+ if { [var exists xst] } {
+ puts "\[var exists xst\]\[var exists noxst\] = [var exists xst] [var
exists noxst]\n"
+ }
+ if { [var exists M�s] } {
puts "\[var get M�s\] = [var get M�s]\n"
+ }
+ if { [var exists lstvar1] } {
+ puts "\[var get lstvar1\] = [var get lstvar1]\n"
+ }
+ if { [var exists lstvar2] } {
+ puts "\[var list lstvar2\] = [var list lstvar2]\n"
}
}
1.3 +19 -3 tcl-rivet/tests/get.test
Index: get.test
===================================================================
RCS file: /home/cvs/tcl-rivet/tests/get.test,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- get.test 6 Jan 2002 13:30:54 -0000 1.2
+++ get.test 22 Jan 2002 20:58:48 -0000 1.3
@@ -1,4 +1,4 @@
-# $Id: get.test,v 1.2 2002/01/06 13:30:54 davidw Exp $
+# $Id: get.test,v 1.3 2002/01/22 20:58:48 davidw Exp $
::tcltest::test getvariables-1.1 {GET variables} {
set page [ ::http::geturl "${urlbase}get.rvt?foobar=goober" ]
@@ -6,16 +6,32 @@
set match
} {[var get foobar] = goober}
-::tcltest::test getvariables-1.2 {GET variables + I18N} {
+::tcltest::test getvariables-1.2 {GET variables - exists} {
+ set page [ ::http::geturl "${urlbase}get.rvt?xst=1" ]
+ regexp -line {\[var exists xst\]\[var exists noxst\] = 1 0$} [
::http::data $page ] match
+ set match
+} {[var exists xst][var exists noxst] = 1 0}
+
+::tcltest::test getvariables-2.1 {GET variables + I18N} {
set page [ ::http::geturl "${urlbase}get.rvt?M�s=T�" ]
regexp -line {^\[var get M�s\] = T�$} [ ::http::data $page ] match
set match
} {[var get M�s] = T�}
-::tcltest::test getvariables-1.3 {GET variables + I18N + encoding} {
+::tcltest::test getvariables-2.2 {GET variables + I18N + encoding} {
set page [ ::http::geturl [ format "${urlbase}get.rvt?%s" [
::http::formatQuery M�s T� ] ] ]
regexp -line {^\[var get M�s\] = T�$} [ ::http::data $page ] match
set match
} {[var get M�s] = T�}
+::tcltest::test getvariables-3.1 {GET multi-value variable} {
+ set page [ ::http::geturl
"${urlbase}get.rvt?lstvar1=a&lstvar1=b&lstvar1=c+d" ]
+ regexp -line {\[var get lstvar1\] = a b c d$} [ ::http::data $page ]
match
+ set match
+} {[var get lstvar1] = a b c d}
+::tcltest::test getvariables-3.2 {GET multi-value variable as list} {
+ set page [ ::http::geturl
"${urlbase}get.rvt?lstvar2=a&lstvar2=b&lstvar2=c+d" ]
+ regexp -line {\[var list lstvar2\] = a b {c d}$} [ ::http::data $page ]
match
+ set match
+} {[var list lstvar2] = a b {c d}}
1.2 +6 -0 tcl-rivet/tests/post.rvt
Index: post.rvt
===================================================================
RCS file: /home/cvs/tcl-rivet/tests/post.rvt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- post.rvt 6 Jan 2002 13:30:54 -0000 1.1
+++ post.rvt 22 Jan 2002 20:58:48 -0000 1.2
@@ -9,6 +9,12 @@
if { [ var exists M�s ] } {
puts "\[var get M�s\] = [var get M�s]\n"
}
+ if { [var exists lstvar1] } {
+ puts "\[var get lstvar1\] = [var get lstvar1]\n"
+ }
+ if { [var exists lstvar2] } {
+ puts "\[var list lstvar2\] = [var list lstvar2]\n"
+ }
}
?>
1.3 +13 -7 tcl-rivet/tests/post.test
Index: post.test
===================================================================
RCS file: /home/cvs/tcl-rivet/tests/post.test,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- post.test 6 Jan 2002 13:30:54 -0000 1.2
+++ post.test 22 Jan 2002 20:58:48 -0000 1.3
@@ -1,4 +1,4 @@
-# $Id: post.test,v 1.2 2002/01/06 13:30:54 davidw Exp $
+# $Id: post.test,v 1.3 2002/01/22 20:58:48 davidw Exp $
set testfilename1 post.rvt
@@ -8,20 +8,26 @@
set match
} {[var get foobar] = goober}
-::tcltest::test postvariables-1.2 {POST variables + I18N} {
+::tcltest::test postvariables-2.1 {POST variables + I18N} {
set page [ ::http::geturl "${urlbase}$testfilename1" -query M�s=T� ]
regexp -line {^\[var get M�s\] = T�$} [ ::http::data $page ] match
set match
} {[var get M�s] = T�}
-::tcltest::test postvariables-1.3 {POST variables + I18N + encoding} {
+::tcltest::test postvariables-2.2 {POST variables + I18N + encoding} {
set page [ ::http::geturl "${urlbase}$testfilename1" -query [
::http::formatQuery M�s T� ] ]
regexp -line {^\[var get M�s\] = T�$} [ ::http::data $page ] match
set match
} {[var get M�s] = T�}
-::tcltest::test multivariables-1.1 {multiple variables: foo=1&foo=2} {
- set page [ ::http::geturl
"${urlbase}$testfilename1?foobar=1&foobar=2&foobar=foo+bar" ]
- regexp -line {^\[var get foobar\] = 1 2 foo bar$} [ ::http::data $page ]
match
+::tcltest::test postvariables-3.1 {POST multi-value variable} {
+ set page [ ::http::geturl "${urlbase}get.rvt" -query
[::http::formatQuery lstvar1 a lstvar1 b lstvar1 {c d}]]
+ regexp -line {\[var get lstvar1\] = a b c d$} [ ::http::data $page ]
match
set match
-} {[var get foobar] = 1 2 foo bar}
+} {[var get lstvar1] = a b c d}
+
+::tcltest::test postvariables-3.2 {POST multi-value variable as list} {
+ set page [ ::http::geturl "${urlbase}get.rvt" -query
[::http::formatQuery lstvar2 a lstvar2 b lstvar2 {c d}]]
+ regexp -line {\[var list lstvar2\] = a b {c d}$} [ ::http::data $page ]
match
+ set match
+} {[var list lstvar2] = a b {c d}}
