Changeset 1409 for trunk/lang

Timestamp:

Apr 21, 2009, 11:40:07 AM (16 years ago)

Author:

gah

Message:

Fix encoding Tcl interface and tests.

Location:

trunk/lang/tcl

Files:

• src/RpEncodeTclInterface.cc (modified) (2 diffs)
• tests/encode.test (modified) (8 diffs)

trunk/lang/tcl/src/RpEncodeTclInterface.cc

@@ -146 +146 @@
         *flagsPtr = RPENC_Z;
     } else {
-        Tcl_AppendResult(interp, "bad order \"", string, 
-                 "\": should be breadthfirst, inorder, preorder, or postorder",
-                 (char *)NULL);
+        Tcl_AppendResult(interp, "bad value \"", string, 
+                 "\": should be b64, zb64, or z", (char *)NULL);
         return TCL_ERROR;
     }
@@ -239 +238 @@
     {SWITCH_CUSTOM, "-as", "z|b64|zb64",
         offsetof(DecodeSwitches, flags), 0, 0, &asSwitch},
-    {SWITCH_BITMASK, "-raw", "", 
+    {SWITCH_BITMASK, "-noheader", "", 
         offsetof(DecodeSwitches, flags), 0, RPENC_RAW},
     {SWITCH_END}

trunk/lang/tcl/tests/encode.test

@@ -47 +47 @@
 test is-1.2.0 {Rappture::encoding::is, 1 invalid subcommand} {
     list [catch {Rappture::encoding::is binaryy "hi"} msg] $msg
-} {1 {bad option "binaryy": should be one of binary, encoded}}
+} {1 {bad option "binaryy": should be binary or encoded}}
 
 test is-1.2.1 {Rappture::encoding::is, too many arguments} {
@@ -118 +118 @@
 test encode-2.0.0 {Rappture::encoding::encode, 0 arguments} {
     list [catch {Rappture::encoding::encode} msg] $msg
-} {1 {wrong # args: should be "Rappture::encoding::encode ?-as z|b64|zb64? ?-no-header? ?--? <string>"}}
+} {1 {wrong # args: should be "Rappture::encoding::encode ?-as z|b64|zb64? ?-noheader? ?--? string"}}
 
 test encode-2.1.0 {Rappture::encoding::encode, ascii string argument} {
@@ -134 +134 @@
 }}
 
-test encode-2.2.0 {Rappture::encoding::encode, -as flag blank value} {
+test encode-2.2.0 {Rappture::encoding::encode, -as flag no value} {
     list [catch {Rappture::encoding::encode -as} msg] $msg
-} {1 {bad value "": should be one of z, b64, zb64}}
+} {1 {value for "-as" missing}}
 
 test encode-2.2.1 {Rappture::encoding::encode, -as flag bad value } {
     list [catch {Rappture::encoding::encode -as zz} msg] $msg
-} {1 {bad value "zz": should be one of z, b64, zb64}}
+} {1 {bad value "zz": should be b64, zb64, or z}}
 
 test encode-2.2.2 {Rappture::encoding::encode, -as flag correct value z} {
     list [catch {Rappture::encoding::encode -as z} msg] $msg
-} {1 {wrong # args: should be "Rappture::encoding::encode ?-as z|b64|zb64? ?-no-header? ?--? <string>"}}
+} {1 {wrong # args: should be "Rappture::encoding::encode ?-as z|b64|zb64? ?-noheader? ?--? string"}}
 
 test encode-2.2.3 {Rappture::encoding::encode, -as z w/ string} {
@@ -158 +158 @@
 test encode-2.2.5 {Rappture::encoding::encode with --} {
     list [catch {Rappture::encoding::encode -hi} msg] $msg
-} {1 {bad option "-hi": should be -as, -no-header, --}}
+} {1 {unknown switch "-hi"
+following switches are available:
+   -as z|b64|zb64
+   -noheader }}
 
 test encode-2.2.6 {Rappture::encoding::encode with --} {
@@ -174 +177 @@
 test decode-3.0.0 {Rappture::encoding::decode, 0 arguments} {
     list [catch {Rappture::encoding::decode} msg] $msg
-} {1 {wrong # args: should be "Rappture::encoding::decode ?-as z|b64|zb64? ?--? <string>"}}
+} {1 {wrong # args: should be "Rappture::encoding::decode ?-as z|b64|zb64? ?--? string"}}
 
 test decode-3.1.0 {Rappture::encoding::decode, 1 arg, b64 encoded} {
@@ -188 +191 @@
 test decode-3.1.2 {Rappture::encoding::decode, 2 args} {
     list [catch {Rappture::encoding::decode "hi" "bye"} msg] $msg
-} {1 {wrong # args: should be "Rappture::encoding::decode ?-as z|b64|zb64? ?--? <string>"}}
+} {1 {wrong # args: should be "Rappture::encoding::decode ?-as z|b64|zb64? ?--? string"}}
 
 test decode-3.2.0 {Rappture::encoding::decode, -as flag, no value} {
     list [catch {Rappture::encoding::decode -as} msg] $msg
-} {1 {bad value "": should be one of z, b64, zb64}}
+} {1 {value for "-as" missing}}
 
 test decode-3.2.1 {Rappture::encoding::decode, -as flag, bad value} {
     list [catch {Rappture::encoding::decode -as zz} msg] $msg
-} {1 {bad value "zz": should be one of z, b64, zb64}}
+} {1 {bad value "zz": should be b64, zb64, or z}}
+
+# This test is wrong.  The -as z flag should either 1) be ignored and return
+# "hi" (using the header) or 2) override the header and return an error when
+# attempting to decompress the bogus string (see 3.2.2b)
 
 test decode-3.2.2 {Rappture::encoding::decode, -as flag, zb64 w/ string} {
@@ -203 +210 @@
 } {0 {@@RP-ENC:zb64
 H4sIAAAAAAAAA8vIBACsKpPYAgAAAA==}}
+
+test decode-3.2.2b {Rappture::encoding::decode, -as -noheader, zb64 w/ string} {
+    set h "@@RP-ENC:zb64\nH4sIAAAAAAAAA8vIBACsKpPYAgAAAA=="
+    list [catch {Rappture::encoding::decode -as z -noheader $h} msg] $msg
+} {1 {Rappture::Buffer::do_decompress()
+:
+memory error while inflating data
+Rappture::Buffer::do_decompress()
+}}
 
 test decode-3.2.3 {Rappture::encoding::decode, -as flag, b64 w/ string} {
@@ -216 +232 @@
 test encode-3.2.5 {Rappture::encoding::decode with --} {
     list [catch {Rappture::encoding::decode -hi} msg] $msg
-} {1 {bad option "-hi": should be -as, --}}
+} {1 {unknown switch "-hi"
+following switches are available:
+   -as z|b64|zb64
+   -noheader }}
+
 
 test encode-3.2.6 {Rappture::encoding::decode with --} {