You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by da...@apache.org on 2001/11/16 13:56:45 UTC

cvs commit: tcl-rivet/tests rivet.test

davidw      01/11/16 04:56:45

  Modified:    tests    rivet.test
  Log:
  Updated test to give more meaningful results/comparisons.
  
  Revision  Changes    Path
  1.3       +40 -27    tcl-rivet/tests/rivet.test
  
  Index: rivet.test
  ===================================================================
  RCS file: /home/cvs/tcl-rivet/tests/rivet.test,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- rivet.test	2001/09/23 08:49:46	1.2
  +++ rivet.test	2001/11/16 12:56:45	1.3
  @@ -6,7 +6,7 @@
   
   # See README file for more information.
   
  -# $Id: rivet.test,v 1.2 2001/09/23 08:49:46 davidw Exp $ 
  +# $Id: rivet.test,v 1.3 2001/11/16 12:56:45 davidw Exp $ 
   
   package require tcltest
   package require http 2.1
  @@ -22,68 +22,81 @@
   
   ::tcltest::test hello-1.1 {hello world test} {
       set page [ ::http::geturl "${urlbase}$testfilename1" ]
  -    regexp -line {^Hello, World$} [ ::http::data $page ]
  -} 1
  +    regexp -line {^Hello, World$} [ ::http::data $page ] match
  +    set match
  +} {Hello, World}
   
   ::tcltest::test i18n-1.1 {I18N test} {
       set page [ ::http::geturl "${urlbase}$testfilename1" ]
  -    regexp -line {^� � � � � � - El Burro Sabe M�s Que T�!$} [ ::http::data $page ]
  -} 1
  +    regexp -line {^� � � � � � - El Burro Sabe M�s Que T�!$} [ ::http::data $page ] match
  +    set match
  +} {� � � � � � - El Burro Sabe M�s Que T�!}
   
   ::tcltest::test getvariables-1.1 {GET variables} {
       set page [ ::http::geturl "${urlbase}$testfilename1?foobar=goober" ]
  -    regexp -line {^VARS\(foobar\) = goober$} [ ::http::data $page ]
  -} 1
  +    regexp -line {\[var get foobar\] = goober$} [ ::http::data $page ] match
  +    set match
  +} {[var get foobar] = goober}
   
   ::tcltest::test getvariables-1.2 {GET variables + I18N} {
       set page [ ::http::geturl "${urlbase}$testfilename1?M�s=T�" ]
  -    regexp -line {^VARS\(M�s\) = T�$} [ ::http::data $page ]
  -} 1
  +    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} {
       set page [ ::http::geturl [ format "${urlbase}$testfilename1?%s" [ ::http::formatQuery M�s T� ] ] ]
  -    regexp -line {^VARS\(M�s\) = T�$} [ ::http::data $page ]
  -} 1
  +    regexp -line {^\[var get M�s\] = T�$} [ ::http::data $page ] match
  +    set match
  +} {[var get M�s] = T�}
   
   ::tcltest::test postvariables-1.1 {POST variables} {
       set page [ ::http::geturl "${urlbase}$testfilename1" -query foobar=goober ]
  -    regexp -line {^VARS\(foobar\) = goober$} [ ::http::data $page ]
  -} 1
  +    regexp -line {^\[var get foobar\] = goober$} [ ::http::data $page ] match
  +    set match
  +} {[var get foobar] = goober}
   
   ::tcltest::test postvariables-1.2 {POST variables + I18N} {
       set page [ ::http::geturl "${urlbase}$testfilename1" -query M�s=T� ]
  -    regexp -line {^VARS\(M�s\) = T�$} [ ::http::data $page ]
  -} 1
  +    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} {
       set page [ ::http::geturl "${urlbase}$testfilename1" -query [ ::http::formatQuery M�s T� ] ]
  -    regexp -line {^VARS\(M�s\) = T�$} [ ::http::data $page ]
  -} 1
  +    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 {^VARS\(foobar\) = 1 2 foo bar$} [ ::http::data $page ]
  -} 1
  +    regexp -line {^\[var get foobar\] = 1 2 foo bar$} [ ::http::data $page ] match
  +    set match
  +} {[var get foobar] = 1 2 foo bar}
   
   ::tcltest::test env-1.1 {Environment variable} {
       set page [ ::http::geturl "${urlbase}$testfilename1" ]
  -    regexp -line "^ENVS\\(DOCUMENT_NAME\\) = $testfilename1\$" [ ::http::data $page ]
  -} 1
  +    regexp -line "^ENVS\\(DOCUMENT_NAME\\) = $testfilename1\$" [ ::http::data $page ] match
  +    set match
  +} "ENVS(DOCUMENT_NAME) = $testfilename1"
   
   ::tcltest::test cookies-1.1 {Cookies} {
       set page [ ::http::geturl "${urlbase}$testfilename1" -headers {Cookie "foo=bar"} ]
  -    regexp -line {^COOKIES\(foo\) = bar$} [ ::http::data $page ]
  -} 1
  +    regexp -line {^COOKIES\(foo\) = bar$} [ ::http::data $page ] match
  +    set match
  +} {COOKIES(foo) = bar}
   
   ::tcltest::test cookies-1.2 {Cookies + I18N} {
       set page [ ::http::geturl "${urlbase}$testfilename1" -headers {Cookie "M�s=T�"} ]
  -    regexp -line {^COOKIES\(M�s\) = T�$} [ ::http::data $page ]
  -} 1
  +    regexp -line {^COOKIES\(M�s\) = T�$} [ ::http::data $page ] match
  +    set match
  +} {COOKIES(M�s) = T�}
   
   ::tcltest::test cookies-1.3 {Cookies + I18N + encoding} {
       set page [ ::http::geturl "${urlbase}$testfilename1" -headers [ list Cookie [ ::http::formatQuery M�s T� ] ] ]
  -    regexp -line {^COOKIES\(M�s\) = T�$} [ ::http::data $page ]
  -} 1
  +    regexp -line {^COOKIES\(M�s\) = T�$} [ ::http::data $page ] match
  +    set match
  +} {COOKIES(M�s) = T�}
   
   ::tcltest::test cookies-1.4 {Multiple Cookies} {
       set rslt 0