diff options
84 files changed, 419 insertions, 409 deletions
diff --git a/generic/tclAssembly.c b/generic/tclAssembly.c index d1866c8..f09a70e 100644 --- a/generic/tclAssembly.c +++ b/generic/tclAssembly.c @@ -1592,7 +1592,7 @@ AssembleOneLine( if (opnd < 2) { if (assemEnvPtr->flags & TCL_EVAL_DIRECT) { Tcl_SetObjResult(interp, - Tcl_NewStringObj("operand must be >=2", -1)); + Tcl_NewStringObj("operand should be >=2", -1)); Tcl_SetErrorCode(interp, "TCL", "ASSEM", "OPERAND>=2", NULL); } goto cleanup; @@ -2435,7 +2435,7 @@ CheckNonNegative( Tcl_Obj* result; /* Error message */ if (value < 0) { - result = Tcl_NewStringObj("operand must be nonnegative", -1); + result = Tcl_NewStringObj("operand should be nonnegative", -1); Tcl_SetObjResult(interp, result); Tcl_SetErrorCode(interp, "TCL", "ASSEM", "NONNEGATIVE", NULL); return TCL_ERROR; @@ -2468,7 +2468,7 @@ CheckStrictlyPositive( Tcl_Obj* result; /* Error message */ if (value <= 0) { - result = Tcl_NewStringObj("operand must be positive", -1); + result = Tcl_NewStringObj("operand should be positive", -1); Tcl_SetObjResult(interp, result); Tcl_SetErrorCode(interp, "TCL", "ASSEM", "POSITIVE", NULL); return TCL_ERROR; diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c index db216e5..34c1db5 100644 --- a/generic/tclCmdIL.c +++ b/generic/tclCmdIL.c @@ -2612,7 +2612,7 @@ Tcl_LrepeatObjCmd( } if (elementCount < 0) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "bad count \"%d\": must be integer >= 0", elementCount)); + "bad count \"%d\": should be integer >= 0", elementCount)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LREPEAT", "NEGARG", NULL); return TCL_ERROR; @@ -3053,7 +3053,7 @@ Tcl_LsearchObjCmd( Tcl_DecrRefCount(startPtr); } Tcl_SetObjResult(interp, Tcl_NewStringObj( - "\"-index\" option must be followed by list index", + "\"-index\" option should be followed by list index", -1)); Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL); return TCL_ERROR; @@ -3691,7 +3691,7 @@ Tcl_LsortObjCmd( case LSORT_COMMAND: if (i == objc-2) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "\"-command\" option must be followed " + "\"-command\" option should be followed " "by comparison command", -1)); Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL); sortInfo.resultCode = TCL_ERROR; @@ -3716,7 +3716,7 @@ Tcl_LsortObjCmd( if (i == objc-2) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "\"-index\" option must be followed by list index", + "\"-index\" option should be followed by list index", -1)); Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL); sortInfo.resultCode = TCL_ERROR; @@ -3767,7 +3767,7 @@ Tcl_LsortObjCmd( case LSORT_STRIDE: if (i == objc-2) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "\"-stride\" option must be " + "\"-stride\" option should be " "followed by stride length", -1)); Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL); sortInfo.resultCode = TCL_ERROR; @@ -3779,7 +3779,7 @@ Tcl_LsortObjCmd( } if (groupSize < 2) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "stride length must be at least 2", -1)); + "stride length should be at least 2", -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSORT", "BADSTRIDE", NULL); sortInfo.resultCode = TCL_ERROR; @@ -3876,7 +3876,7 @@ Tcl_LsortObjCmd( if (group) { if (length % groupSize) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "list size must be a multiple of the stride length", + "list size should be a multiple of the stride length", -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSORT", "BADSTRIDE", NULL); @@ -3897,7 +3897,7 @@ Tcl_LsortObjCmd( if (groupOffset < 0 || groupOffset >= groupSize) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "when used with \"-stride\", the leading \"-index\"" - " value must be within the group", -1)); + " value should be within the group", -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSORT", "BADINDEX", NULL); sortInfo.resultCode = TCL_ERROR; diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c index bb5fa42..c409c24 100644 --- a/generic/tclCmdMZ.c +++ b/generic/tclCmdMZ.c @@ -4014,7 +4014,7 @@ Tcl_ThrowObjCmd( return TCL_ERROR; } else if (len < 1) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "type must be non-empty list", -1)); + "type should be non-empty list", -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "THROW", "BADEXCEPTION", NULL); return TCL_ERROR; @@ -4199,14 +4199,14 @@ TclNRTryObjCmd( case TryFinally: /* finally script */ if (i < objc-2) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "finally clause must be last", -1)); + "finally clause should be last", -1)); Tcl_DecrRefCount(handlersObj); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRY", "FINALLY", "NONTERMINAL", NULL); return TCL_ERROR; } else if (i == objc-1) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "wrong # args to finally clause: must be" + "wrong # args to finally clause: should be" " \"... finally script\"", -1)); Tcl_DecrRefCount(handlersObj); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRY", "FINALLY", @@ -4219,7 +4219,7 @@ TclNRTryObjCmd( case TryOn: /* on code variableList script */ if (i > objc-4) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "wrong # args to on clause: must be \"... on code" + "wrong # args to on clause: should be \"... on code" " variableList script\"", -1)); Tcl_DecrRefCount(handlersObj); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRY", "ON", @@ -4238,7 +4238,7 @@ TclNRTryObjCmd( if (i > objc-4) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "wrong # args to trap clause: " - "must be \"... trap pattern variableList script\"", + "should be \"... trap pattern variableList script\"", -1)); Tcl_DecrRefCount(handlersObj); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRY", "TRAP", @@ -4248,7 +4248,7 @@ TclNRTryObjCmd( code = 1; if (Tcl_ListObjLength(NULL, objv[i+1], &dummy) != TCL_OK) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "bad prefix '%s': must be a list", + "bad prefix '%s': should be a list", Tcl_GetString(objv[i+1]))); Tcl_DecrRefCount(handlersObj); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRY", "TRAP", diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c index e6ec0a6..643b533 100644 --- a/generic/tclCompCmdsSZ.c +++ b/generic/tclCompCmdsSZ.c @@ -2581,7 +2581,7 @@ TclCompileThrowCmd( OP( POP); OP( POP); issueErrorForEmptyCode: - PUSH( "type must be non-empty list"); + PUSH( "type should be non-empty list"); PUSH( "-errorcode {TCL OPERATION THROW BADEXCEPTION}"); } OP44( RETURN_IMM, TCL_ERROR, 0); diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c index 022dafa..92b4bab 100644 --- a/generic/tclEnsemble.c +++ b/generic/tclEnsemble.c @@ -259,7 +259,7 @@ TclNamespaceEnsembleCmd( if (len < 1) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "ensemble subcommand implementations " - "must be non-empty lists", -1)); + "should be non-empty lists", -1)); Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "EMPTY_TARGET", NULL); Tcl_DictObjDone(&search); @@ -538,7 +538,7 @@ TclNamespaceEnsembleCmd( if (len < 1) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "ensemble subcommand implementations " - "must be non-empty lists", -1)); + "should be non-empty lists", -1)); Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "EMPTY_TARGET", NULL); Tcl_DictObjDone(&search); @@ -1945,7 +1945,7 @@ NsEnsembleImplementationCmdNR( TclGetString(objv[1+ensemblePtr->numParameters]), NULL); return TCL_ERROR; } - errorObj = Tcl_ObjPrintf("unknown%s subcommand \"%s\": must be ", + errorObj = Tcl_ObjPrintf("unknown%s subcommand \"%s\": should be ", (ensemblePtr->flags & TCL_ENSEMBLE_PREFIX ? " or ambiguous" : ""), TclGetString(objv[1+ensemblePtr->numParameters])); if (ensemblePtr->subcommandTable.numEntries == 1) { diff --git a/generic/tclFileName.c b/generic/tclFileName.c index 5d4702b..e155d95 100644 --- a/generic/tclFileName.c +++ b/generic/tclFileName.c @@ -1337,7 +1337,7 @@ Tcl_GlobObjCmd( endOfForLoop: if ((globFlags & TCL_GLOBMODE_TAILS) && (pathOrDir == NULL)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "\"-tails\" must be used with either " + "\"-tails\" should be used with either " "\"-directory\" or \"-path\"", -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB", "BADOPTIONCOMBINATION", NULL); diff --git a/generic/tclIO.c b/generic/tclIO.c index f0da2e8..cebf588 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -7346,7 +7346,8 @@ Tcl_BadChannelOption( const char *genericopt = "blocking buffering buffersize encoding eofchar translation"; const char **argv; - int argc, i; + char *problemType = "bad"; + int argc, i, len = strlen(optionName); Tcl_DString ds; Tcl_Obj *errObj; @@ -7361,10 +7362,14 @@ Tcl_BadChannelOption( Tcl_Panic("malformed option list in channel driver"); } Tcl_ResetResult(interp); - // FIXME - errObj = Tcl_ObjPrintf( - "unknown or ambiguous option \"%s\": should be one of ", - optionName); + for (i = 0; i < argc; i++) { + if (optionName[0]=='-' && strncmp(argv[i], optionName, len)==0) { + problemType = "ambiguous"; + break; + } + } + errObj = Tcl_ObjPrintf("%s option \"%s\": should be one of ", + problemType, optionName); argc--; for (i = 0; i < argc; i++) { Tcl_AppendPrintfToObj(errObj, "-%s, ", argv[i]); @@ -7700,7 +7705,7 @@ Tcl_SetChannelOption( SetFlag(statePtr, CHANNEL_UNBUFFERED); } else if (interp) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "bad value for -buffering: must be one of" + "bad value for -buffering: should be one of" " full, line, or none", -1)); Tcl_SetErrorCode(interp, "TCL", "VALUE", "BUFFERING", NULL); return TCL_ERROR; @@ -7761,7 +7766,7 @@ Tcl_SetChannelOption( if (inValue & 0x80 || outValue & 0x80) { if (interp) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "bad value for -eofchar: must be non-NUL ASCII" + "bad value for -eofchar: should be non-NUL ASCII" " character", -1)); Tcl_SetErrorCode(interp, "TCL", "VALUE", "EOFCHAR", NULL); } @@ -7812,7 +7817,7 @@ Tcl_SetChannelOption( } else { if (interp) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "bad value for -translation: must be a one or two" + "bad value for -translation: should be a one or two" " element list", -1)); Tcl_SetErrorCode(interp, "TCL", "VALUE", "TRANSLATION", NULL); } @@ -7893,7 +7898,7 @@ Tcl_SetChannelOption( badTranslation: if (interp) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "bad value for -translation: must be one of " + "bad value for -translation: should be one of " "auto, binary, cr, lf, crlf, or platform", -1)); Tcl_SetErrorCode(interp, "TCL", "VALUE", "TRANSLATION", NULL); } diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c index bcd9307..d7ca217 100644 --- a/generic/tclIOCmd.c +++ b/generic/tclIOCmd.c @@ -705,7 +705,7 @@ Tcl_CloseObjCmd( if (!(dir & Tcl_GetChannelMode(chan))) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "Half-close of %s-side not possible, side not opened" + "half-close of %s-side not possible, side not opened" " or already closed", dirOptions[index])); return TCL_ERROR; } diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c index d2919fc..cf64daa 100644 --- a/generic/tclIOUtil.c +++ b/generic/tclIOUtil.c @@ -1659,9 +1659,9 @@ TclGetOpenModeEx( if (interp != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "invalid access mode \"%s\": must be RDONLY, WRONLY, " - "RDWR, APPEND, BINARY, CREAT, EXCL, NOCTTY, NONBLOCK," - " or TRUNC", flag)); + "invalid access mode \"%s\": should be RDONLY, " + "WRONLY, RDWR, APPEND, BINARY, CREAT, EXCL, NOCTTY, " + "NONBLOCK, or TRUNC", flag)); } ckfree(modeArgv); return -1; @@ -1673,7 +1673,7 @@ TclGetOpenModeEx( if (!gotRW) { if (interp != NULL) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "access mode must include either RDONLY, WRONLY, or RDWR", + "access mode should include either RDONLY, WRONLY, or RDWR", -1)); } return -1; diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c index 4697129..a023866 100644 --- a/generic/tclIndexObj.c +++ b/generic/tclIndexObj.c @@ -91,7 +91,7 @@ typedef struct { * proper match, then TCL_ERROR is returned and an error message is left * in interp's result (unless interp is NULL). The msg argument is used * in the error message; for example, if msg has the value "option" then - * the error message will say something flag 'bad option "foo": must be + * the error message will say something flag 'bad option "foo": should be * ...' * * Side effects: @@ -370,12 +370,12 @@ Tcl_GetIndexFromObjStruct( entryPtr = NEXT_ENTRY(entryPtr, offset); } Tcl_AppendStringsToObj(resultPtr, - (numAbbrev>1 && !(flags & TCL_EXACT) ? "ambiguous " : "bad "), + (numAbbrev>0 && !(flags & TCL_EXACT) ? "ambiguous " : "bad "), msg, " \"", key, NULL); if (*entryPtr == NULL) { Tcl_AppendStringsToObj(resultPtr, "\": no valid options", NULL); } else { - Tcl_AppendStringsToObj(resultPtr, "\": must be ", + Tcl_AppendStringsToObj(resultPtr, "\": should be ", *entryPtr, NULL); entryPtr = NEXT_ENTRY(entryPtr, offset); while (*entryPtr != NULL) { @@ -845,7 +845,7 @@ PrefixLongestObjCmd( * An error message is generated in interp's result object to indicate * that a command was invoked with the wrong number of arguments. The * message has the form - * wrong # args: should be "foo bar additional stuff" + * wrong # args: must be "foo bar additional stuff" * where "foo" and "bar" are the initial objects in objv (objc determines * how many of these are printed) and "additional stuff" is the contents * of the message argument. @@ -1476,7 +1476,7 @@ TclGetCompletionCodeFromObj( if (interp != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "bad completion code \"%s\": must be" + "bad completion code \"%s\": should be" " ok, error, return, break, continue, or an integer", TclGetString(value))); Tcl_SetErrorCode(interp, "TCL", "RESULT", "ILLEGAL_CODE", NULL); diff --git a/generic/tclInterp.c b/generic/tclInterp.c index 0da5d47..d1abdcc 100644 --- a/generic/tclInterp.c +++ b/generic/tclInterp.c @@ -2309,7 +2309,7 @@ SlaveBgerror( if (TCL_ERROR == TclListObjLength(NULL, objv[0], &length) || (length < 1)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "cmdPrefix must be list of length >= 1", -1)); + "cmdPrefix should be list of length >= 1", -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "BGERRORFORMAT", NULL); return TCL_ERROR; @@ -2934,7 +2934,7 @@ SlaveRecursionLimit( } if (limit <= 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "recursion limit must be > 0", -1)); + "recursion limit should be > 0", -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "BADLIMIT", NULL); return TCL_ERROR; @@ -4536,7 +4536,7 @@ SlaveCommandLimitCmd( } if (gran < 1) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "granularity must be at least 1", -1)); + "granularity should be at least 1", -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "BADVALUE", NULL); return TCL_ERROR; @@ -4553,7 +4553,7 @@ SlaveCommandLimitCmd( } if (limit < 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "command limit value must be at least 0", -1)); + "command limit value should be at least 0", -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "BADVALUE", NULL); return TCL_ERROR; @@ -4745,7 +4745,7 @@ SlaveTimeLimitCmd( } if (gran < 1) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "granularity must be at least 1", -1)); + "granularity should be at least 1", -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "BADVALUE", NULL); return TCL_ERROR; @@ -4762,7 +4762,7 @@ SlaveTimeLimitCmd( } if (tmp < 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "milliseconds must be at least 0", -1)); + "milliseconds should be at least 0", -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "BADVALUE", NULL); return TCL_ERROR; @@ -4780,7 +4780,7 @@ SlaveTimeLimitCmd( } if (tmp < 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "seconds must be at least 0", -1)); + "seconds should be at least 0", -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "BADVALUE", NULL); return TCL_ERROR; diff --git a/generic/tclOOBasic.c b/generic/tclOOBasic.c index 0b0516b..b2f52dd 100644 --- a/generic/tclOOBasic.c +++ b/generic/tclOOBasic.c @@ -546,7 +546,7 @@ TclOO_Object_Unknown( return TCL_ERROR; } - errorMsg = Tcl_ObjPrintf("unknown method \"%s\": must be ", + errorMsg = Tcl_ObjPrintf("unknown method \"%s\": should be ", TclGetString(objv[skip])); for (i=0 ; i<numMethodNames-1 ; i++) { if (i) { diff --git a/generic/tclOODefineCmds.c b/generic/tclOODefineCmds.c index 5a6c0ad..00c89f5 100644 --- a/generic/tclOODefineCmds.c +++ b/generic/tclOODefineCmds.c @@ -1186,7 +1186,7 @@ TclOODefineClassObjCmd( return TCL_ERROR; } clsPtr = GetClassInOuterContext(interp, objv[1], - "the class of an object must be a class"); + "the class of an object should be a class"); if (clsPtr == NULL) { return TCL_ERROR; } diff --git a/generic/tclOOMethod.c b/generic/tclOOMethod.c index 61215de..6fc84fc 100644 --- a/generic/tclOOMethod.c +++ b/generic/tclOOMethod.c @@ -1376,7 +1376,7 @@ TclOONewForwardInstanceMethod( } if (prefixLen < 1) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "method forward prefix must be non-empty", -1)); + "method forward prefix should be non-empty", -1)); Tcl_SetErrorCode(interp, "TCL", "OO", "BAD_FORWARD", NULL); return NULL; } @@ -1417,7 +1417,7 @@ TclOONewForwardMethod( } if (prefixLen < 1) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "method forward prefix must be non-empty", -1)); + "method forward prefix should be non-empty", -1)); Tcl_SetErrorCode(interp, "TCL", "OO", "BAD_FORWARD", NULL); return NULL; } diff --git a/generic/tclTest.c b/generic/tclTest.c index a27c95a..078c26e 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -909,12 +909,12 @@ TestasyncCmd( Tcl_MutexUnlock(&asyncTestMutex); } else { Tcl_AppendResult(interp, "bad option \"", argv[1], - "\": must be create, delete, int, mark, or marklater", NULL); + "\": should be create, delete, int, mark, or marklater", NULL); return TCL_ERROR; #else /* !TCL_THREADS */ } else { Tcl_AppendResult(interp, "bad option \"", argv[1], - "\": must be create, delete, int, or mark", NULL); + "\": should be create, delete, int, or mark", NULL); return TCL_ERROR; #endif } @@ -1087,7 +1087,7 @@ TestcmdinfoCmd( } } else { Tcl_AppendResult(interp, "bad option \"", argv[1], - "\": must be create, delete, get, or modify", NULL); + "\": should be create, delete, get, or modify", NULL); return TCL_ERROR; } return TCL_OK; @@ -1192,7 +1192,7 @@ TestcmdtokenCmd( Tcl_DecrRefCount(objPtr); } else { Tcl_AppendResult(interp, "bad option \"", argv[1], - "\": must be create or name", NULL); + "\": should be create or name", NULL); return TCL_ERROR; } return TCL_OK; @@ -1300,7 +1300,7 @@ TestcmdtraceCmd( Tcl_DStringFree(&buffer); } else { Tcl_AppendResult(interp, "bad option \"", argv[1], - "\": must be tracetest, deletetest, doubletest or resulttest", NULL); + "\": should be tracetest, deletetest, doubletest or resulttest", NULL); return TCL_ERROR; } return TCL_OK; @@ -1436,7 +1436,7 @@ TestcreatecommandCmd( Tcl_DeleteCommand(interp, "value:at:"); } else { Tcl_AppendResult(interp, "bad option \"", argv[1], - "\": must be create, delete, create2, or delete2", NULL); + "\": should be create, delete, create2, or delete2", NULL); return TCL_ERROR; } return TCL_OK; @@ -1833,7 +1833,7 @@ TestdstringCmd( Tcl_SetResult(interp, s, SpecialFree); } else { Tcl_AppendResult(interp, "bad gresult option \"", argv[2], - "\": must be staticsmall, staticlarge, free, or special", + "\": should be staticsmall, staticlarge, free, or special", NULL); return TCL_ERROR; } @@ -1864,7 +1864,7 @@ TestdstringCmd( Tcl_DStringStartSublist(&dstring); } else { Tcl_AppendResult(interp, "bad option \"", argv[1], - "\": must be append, element, end, free, get, length, " + "\": should be append, element, end, free, get, length, " "result, trunc, or start", NULL); return TCL_ERROR; } @@ -2072,7 +2072,7 @@ TestevalexObjCmd( const char *global = Tcl_GetStringFromObj(objv[2], &length); if (strcmp(global, "global") != 0) { Tcl_AppendResult(interp, "bad value \"", global, - "\": must be global", NULL); + "\": should be global", NULL); return TCL_ERROR; } flags = TCL_EVAL_GLOBAL; @@ -2355,7 +2355,7 @@ TestexithandlerCmd( (ClientData) INT2PTR(value)); } else { Tcl_AppendResult(interp, "bad option \"", argv[1], - "\": must be create or delete", NULL); + "\": should be create or delete", NULL); return TCL_ERROR; } return TCL_OK; @@ -5813,7 +5813,7 @@ TestChannelEventCmd( mask = 0; } else { Tcl_AppendResult(interp, "bad event name \"", argv[3], - "\": must be readable, writable, or none", NULL); + "\": should be readable, writable, or none", NULL); return TCL_ERROR; } @@ -5844,7 +5844,7 @@ TestChannelEventCmd( } if (index < 0) { Tcl_AppendResult(interp, "bad event index: ", argv[3], - ": must be nonnegative", NULL); + ": should be nonnegative", NULL); return TCL_ERROR; } for (i = 0, esPtr = statePtr->scriptRecordPtr; @@ -5932,7 +5932,7 @@ TestChannelEventCmd( } if (index < 0) { Tcl_AppendResult(interp, "bad event index: ", argv[3], - ": must be nonnegative", NULL); + ": should be nonnegative", NULL); return TCL_ERROR; } for (i = 0, esPtr = statePtr->scriptRecordPtr; @@ -5954,7 +5954,7 @@ TestChannelEventCmd( mask = 0; } else { Tcl_AppendResult(interp, "bad event name \"", argv[4], - "\": must be readable, writable, or none", NULL); + "\": should be readable, writable, or none", NULL); return TCL_ERROR; } esPtr->mask = mask; @@ -5962,7 +5962,7 @@ TestChannelEventCmd( TclChannelEventScriptInvoker, (ClientData) esPtr); return TCL_OK; } - Tcl_AppendResult(interp, "bad command ", cmd, ", must be one of " + Tcl_AppendResult(interp, "bad command ", cmd, ", should be one of " "add, delete, list, set, or removeall", NULL); return TCL_ERROR; } diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c index f36b07f..a0425e8 100644 --- a/generic/tclTestObj.c +++ b/generic/tclTestObj.c @@ -379,7 +379,7 @@ TestbooleanobjCmd( } else { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad option \"", Tcl_GetString(objv[1]), - "\": must be set, get, or not", NULL); + "\": should be set, get, or not", NULL); return TCL_ERROR; } return TCL_OK; @@ -498,7 +498,7 @@ TestdoubleobjCmd( } else { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad option \"", Tcl_GetString(objv[1]), - "\": must be set, get, mult10, or div10", NULL); + "\": should be set, get, mult10, or div10", NULL); return TCL_ERROR; } return TCL_OK; @@ -805,7 +805,7 @@ TestintobjCmd( } else { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad option \"", Tcl_GetString(objv[1]), - "\": must be set, get, get2, mult10, or div10", NULL); + "\": should be set, get, get2, mult10, or div10", NULL); return TCL_ERROR; } return TCL_OK; @@ -1105,7 +1105,7 @@ TestobjCmd( } else { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad option \"", Tcl_GetString(objv[1]), - "\": must be assign, convert, duplicate, freeallvars, " + "\": should be assign, convert, duplicate, freeallvars, " "newobj, objcount, objtype, refcount, type, or types", NULL); return TCL_ERROR; } diff --git a/generic/tclTimer.c b/generic/tclTimer.c index e1012b4..5be2a5f 100644 --- a/generic/tclTimer.c +++ b/generic/tclTimer.c @@ -830,7 +830,7 @@ Tcl_AfterObjCmd( const char *arg = Tcl_GetString(objv[1]); Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "unknown or ambiguous argument \"%s\": must be" + "bad argument \"%s\": should be" " cancel, idle, info, or an integer", arg)); Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "INDEX", "argument", arg, NULL); diff --git a/generic/tclTrace.c b/generic/tclTrace.c index c0cde49..762b74d 100644 --- a/generic/tclTrace.c +++ b/generic/tclTrace.c @@ -367,7 +367,7 @@ Tcl_TraceObjCmd( badVarOps: Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "bad operations \"%s\": should be one or more of rwua", + "bad operations \"%s\": should be one or more character of rwua", flagOps)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRACE", "BADOPS", NULL); return TCL_ERROR; @@ -436,7 +436,7 @@ TraceExecutionObjCmd( } if (listLen == 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "bad operation list \"\": must be one or more of" + "bad operation list \"\": should be one or more of" " enter, leave, enterstep, or leavestep", -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRACE", "NOOPS", NULL); @@ -679,7 +679,7 @@ TraceCommandObjCmd( } if (listLen == 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "bad operation list \"\": must be one or more of" + "bad operation list \"\": should be one or more of" " delete or rename", -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRACE", "NOOPS", NULL); @@ -878,7 +878,7 @@ TraceVariableObjCmd( } if (listLen == 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "bad operation list \"\": must be one or more of" + "bad operation list \"\": should be one or more of" " array, read, unset, or write", -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRACE", "NOOPS", NULL); diff --git a/generic/tclUtil.c b/generic/tclUtil.c index ae3adae..4c5bc51 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -3612,7 +3612,7 @@ TclGetIntForIndex( if (interp != NULL) { bytes = Tcl_GetString(objPtr); Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "bad index \"%s\": must be integer?[+-]integer? or" + "bad index \"%s\": should be integer?[+-]integer? or" " end?[+-]integer?", bytes)); if (!strncmp(bytes, "end-", 4)) { bytes += 4; @@ -3705,7 +3705,7 @@ SetEndOffsetFromAny( (size_t)((length > 3) ? 3 : length)) != 0)) { if (interp != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "bad index \"%s\": must be end?[+-]integer?", bytes)); + "bad index \"%s\": should be end?[+-]integer?", bytes)); Tcl_SetErrorCode(interp, "TCL", "VALUE", "INDEX", NULL); } return TCL_ERROR; @@ -3740,7 +3740,7 @@ SetEndOffsetFromAny( badIndexFormat: if (interp != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "bad index \"%s\": must be end?[+-]integer?", bytes)); + "bad index \"%s\": should be end?[+-]integer?", bytes)); Tcl_SetErrorCode(interp, "TCL", "VALUE", "INDEX", NULL); } return TCL_ERROR; diff --git a/generic/tclZlib.c b/generic/tclZlib.c index 2e27303..99aad31 100644 --- a/generic/tclZlib.c +++ b/generic/tclZlib.c @@ -2125,7 +2125,7 @@ ZlibCmd( return TCL_ERROR; badLevel: - Tcl_SetObjResult(interp, Tcl_NewStringObj("level must be 0 to 9", -1)); + Tcl_SetObjResult(interp, Tcl_NewStringObj("level should be 0 to 9", -1)); Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMPRESSIONLEVEL", NULL); if (extraInfoStr) { Tcl_AddErrorInfo(interp, extraInfoStr); @@ -2133,7 +2133,7 @@ ZlibCmd( return TCL_ERROR; badBuffer: Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "buffer size must be %d to %d", + "buffer size should be %d to %d", MIN_NONSTREAM_BUFFER_SIZE, MAX_BUFFER_SIZE)); Tcl_SetErrorCode(interp, "TCL", "VALUE", "BUFFERSIZE", NULL); return TCL_ERROR; @@ -2269,7 +2269,7 @@ ZlibStreamSubcmd( } else if (Tcl_GetIntFromObj(interp, levelObj, &level) != TCL_OK) { return TCL_ERROR; } else if (level < 0 || level > 9) { - Tcl_SetObjResult(interp, Tcl_NewStringObj("level must be 0 to 9",-1)); + Tcl_SetObjResult(interp, Tcl_NewStringObj("level should be 0 to 9",-1)); Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMPRESSIONLEVEL", NULL); Tcl_AddErrorInfo(interp, "\n (in -level option)"); return TCL_ERROR; @@ -2421,7 +2421,7 @@ ZlibPushSubcmd( } if (level < 0 || level > 9) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "level must be 0 to 9", -1)); + "level should be 0 to 9", -1)); Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMPRESSIONLEVEL", NULL); goto genericOptionError; @@ -2433,7 +2433,7 @@ ZlibPushSubcmd( } if (limit < 1 || limit > MAX_BUFFER_SIZE) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "read ahead limit must be 1 to %d", + "read ahead limit should be 1 to %d", MAX_BUFFER_SIZE)); Tcl_SetErrorCode(interp, "TCL", "VALUE", "BUFFERSIZE", NULL); goto genericOptionError; @@ -2650,7 +2650,7 @@ ZlibStreamAddCmd( case ao_buffer: /* -buffer */ if (i == objc-2) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "\"-buffer\" option must be followed by integer " + "\"-buffer\" option should be followed by integer " "decompression buffersize", -1)); Tcl_SetErrorCode(interp, "TCL", "ZIP", "NOVAL", NULL); return TCL_ERROR; @@ -2660,7 +2660,7 @@ ZlibStreamAddCmd( } if (buffersize < 1 || buffersize > MAX_BUFFER_SIZE) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "buffer size must be 1 to %d", + "buffer size should be 1 to %d", MAX_BUFFER_SIZE)); Tcl_SetErrorCode(interp, "TCL", "VALUE", "BUFFERSIZE", NULL); return TCL_ERROR; @@ -2669,7 +2669,7 @@ ZlibStreamAddCmd( case ao_dictionary: if (i == objc-2) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "\"-dictionary\" option must be followed by" + "\"-dictionary\" option should be followed by" " compression dictionary bytes", -1)); Tcl_SetErrorCode(interp, "TCL", "ZIP", "NOVAL", NULL); return TCL_ERROR; @@ -2774,7 +2774,7 @@ ZlibStreamPutCmd( case po_dictionary: if (i == objc-2) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "\"-dictionary\" option must be followed by" + "\"-dictionary\" option should be followed by" " compression dictionary bytes", -1)); Tcl_SetErrorCode(interp, "TCL", "ZIP", "NOVAL", NULL); return TCL_ERROR; @@ -3164,7 +3164,7 @@ ZlibTransformSetOption( /* not used */ flushType = Z_SYNC_FLUSH; } else { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "unknown -flush type \"%s\": must be full or sync", + "bad -flush type \"%s\": should be full or sync", value)); Tcl_SetErrorCode(interp, "TCL", "VALUE", "FLUSH", NULL); return TCL_ERROR; @@ -3209,7 +3209,7 @@ ZlibTransformSetOption( /* not used */ return TCL_ERROR; } else if (newLimit < 1 || newLimit > MAX_BUFFER_SIZE) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "-limit must be between 1 and 65536", -1)); + "-limit should be between 1 and 65536", -1)); Tcl_SetErrorCode(interp, "TCL", "VALUE", "READLIMIT", NULL); return TCL_ERROR; } diff --git a/library/clock.tcl b/library/clock.tcl index 67d15b1..936759c 100644 --- a/library/clock.tcl +++ b/library/clock.tcl @@ -1229,7 +1229,7 @@ proc ::tcl::clock::scan { args } { return -code error \ -errorcode [list CLOCK badOption $flag] \ "bad option \"$flag\",\ - must be -base, -format, -gmt, -locale or -timezone" + should be -base, -format, -gmt, -locale or -timezone" } } } @@ -4235,7 +4235,7 @@ proc ::tcl::clock::BSearch { list key } { # Parameters: # clockval -- Starting time value # count -- Amount of a unit of time to add -# unit -- Unit of time to add, must be one of: +# unit -- Unit of time to add, should be one of: # years year months month weeks week # days day hours hour minutes minute # seconds second @@ -4297,7 +4297,7 @@ proc ::tcl::clock::add { clockval args } { default { throw [list CLOCK badOption $a] \ "bad option \"$a\",\ - must be -gmt, -locale or -timezone" + should be -gmt, -locale or -timezone" } } } @@ -4361,7 +4361,7 @@ proc ::tcl::clock::add { clockval args } { default { throw [list CLOCK badUnit $unit] \ - "unknown unit \"$unit\", must be \ + "unknown unit \"$unit\", should be \ years, months, weeks, days, hours, minutes or seconds" } } diff --git a/library/http/http.tcl b/library/http/http.tcl index a6b2bfd..f0674d7 100644 --- a/library/http/http.tcl +++ b/library/http/http.tcl @@ -161,13 +161,13 @@ proc http::config {args} { if {[llength $args] == 1} { set flag [lindex $args 0] if {![regexp -- $pat $flag]} { - return -code error "Unknown option $flag, must be: $usage" + return -code error "unknown option $flag, should be: $usage" } return $http($flag) } else { foreach {flag value} $args { if {![regexp -- $pat $flag]} { - return -code error "Unknown option $flag, must be: $usage" + return -code error "unknown option $flag, should be: $usage" } set http($flag) $value } @@ -342,6 +342,7 @@ proc http::geturl {url args} { } set state(-keepalive) $defaultKeepalive set state(-strict) $strict + set state(accepttypes) $http(-accept) # These flags have their types verified [Bug 811170] array set type { -binary boolean @@ -369,12 +370,12 @@ proc http::geturl {url args} { } { unset $token return -code error \ - "Bad value for $flag ($value), must be $type($flag)" + "bad value for $flag ($value), should be $type($flag)" } set state($flag) $value } else { unset $token - return -code error "Unknown option $flag, can be: $usage" + return -code error "unknown option $flag, should be: $usage" } } @@ -384,7 +385,7 @@ proc http::geturl {url args} { set isQuery [info exists state(-query)] if {$isQuery && $isQueryChannel} { unset $token - return -code error "Can't combine -query and -querychannel options!" + return -code error "can't combine -query and -querychannel options!" } # Validate URL, determine the server host and port, and check proxy case @@ -449,7 +450,7 @@ proc http::geturl {url args} { # Phase one: parse if {![regexp -- $URLmatcher $url -> proto user host port srvurl]} { unset $token - return -code error "Unsupported URL: $url" + return -code error "unsupported URL: $url" } # Phase two: validate set host [string trim $host {[]}]; # strip square brackets from IPv6 address @@ -457,13 +458,13 @@ proc http::geturl {url args} { # Caller has to provide a host name; we do not have a "default host" # that would enable us to handle relative URLs. unset $token - return -code error "Missing host part: $url" + return -code error "missing host part: $url" # Note that we don't check the hostname for validity here; if it's # invalid, we'll simply fail to resolve it later on. } if {$port ne "" && $port > 65535} { unset $token - return -code error "Invalid port number: $port" + return -code error "invalid port number: $port" } # The user identification and resource identification parts of the URL can # have encoded characters in them; take care! @@ -479,9 +480,9 @@ proc http::geturl {url args} { # Provide a better error message in this error case if {[regexp {(?i)%(?![0-9a-f][0-9a-f]).?.?} $user bad]} { return -code error \ - "Illegal encoding character usage \"$bad\" in URL user" + "illegal encoding character usage \"$bad\" in URL user" } - return -code error "Illegal characters in URL user" + return -code error "illegal characters in URL user" } } if {$srvurl ne ""} { @@ -505,9 +506,9 @@ proc http::geturl {url args} { # Provide a better error message in this error case if {[regexp {(?i)%(?![0-9a-f][0-9a-f])..} $srvurl bad]} { return -code error \ - "Illegal encoding character usage \"$bad\" in URL path" + "illegal encoding character usage \"$bad\" in URL path" } - return -code error "Illegal characters in URL path" + return -code error "illegal characters in URL path" } } else { set srvurl / @@ -518,7 +519,7 @@ proc http::geturl {url args} { set lower [string tolower $proto] if {![info exists urlTypes($lower)]} { unset $token - return -code error "Unsupported URL type \"$proto\"" + return -code error "unsupported URL type \"$proto\"" } set defport [lindex $urlTypes($lower) 0] set defcmd [lindex $urlTypes($lower) 1] @@ -693,7 +694,7 @@ proc http::Connected { token proto phost srvurl} { } if {[catch { puts $sock "$how $srvurl HTTP/$state(-protocol)" - puts $sock "Accept: $http(-accept)" + puts $sock "Accept: $state(accepttypes)" array set hdrs $state(-headers) if {[info exists hdrs(Host)]} { # Allow Host spoofing. [Bug 928154] @@ -1489,9 +1490,13 @@ proc http::make-transformation-chunked {chan command} { yield while {1} { chan configure $chan -translation {crlf binary} - while {[gets $chan line] < 1} { yield } + while {[gets $chan line] < 1} { + yield + } chan configure $chan -translation {binary binary} - if {[scan $line %x size] != 1} { return -code error "invalid size: \"$line\"" } + if {[scan $line %x size] != 1} { + return -code error "invalid size: \"$line\"" + } set chunk "" while {$size && ![chan eof $chan]} { set part [chan read $chan $size] diff --git a/library/opt/optparse.tcl b/library/opt/optparse.tcl index fc77fa1..3eafa1f 100644 --- a/library/opt/optparse.tcl +++ b/library/opt/optparse.tcl @@ -165,7 +165,7 @@ proc ::tcl::OptKeyRegister {desc {key ""}} { foreach item $desc { if {$state == "args"} { # more items after 'args'... - return -code error "'args' special argument must be the last one" + return -code error "'args' special argument should be the last one" } set res [OptNormalizeOne $item] set state [lindex $res 0] @@ -829,7 +829,7 @@ proc ::tcl::OptCheckType {arg type {typeArgs ""}} { OptError "ambigous option \"$arg\", choose from:" [OptSelection $desc] } proc OptFlagUsage {desc arg} { - OptError "bad flag \"$arg\", must be one of" $desc + OptError "bad flag \"$arg\", should be one of" $desc } proc OptTooManyArgs {desc arguments} { OptError "too many arguments (unexpected argument(s): $arguments),\ diff --git a/library/package.tcl b/library/package.tcl index 52daa0e..db0741e 100644 --- a/library/package.tcl +++ b/library/package.tcl @@ -668,7 +668,7 @@ proc ::tcl::Pkg::Create {args} { set err(wrongNumArgs) "wrong # args: should be \"$err(usage)\"" set err(valueMissing) "value for \"%s\" missing: should be \"$err(usage)\"" set err(unknownOpt) "unknown option \"%s\": should be \"$err(usage)\"" - set err(noLoadOrSource) "at least one of -load and -source must be given" + set err(noLoadOrSource) "at least one of -load and -source should be given" # process arguments set len [llength $args] diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl index 8e43859..d5b9141 100644 --- a/library/tcltest/tcltest.tcl +++ b/library/tcltest/tcltest.tcl @@ -1135,7 +1135,7 @@ proc tcltest::ConstraintInitializer {constraint {script ""}} { } # Check for boolean values if {![info complete $script]} { - return -code error "ConstraintInitializer must be complete script" + return -code error "ConstraintInitializer should be complete script" } set ConstraintInitializer($constraint) $script } @@ -1909,7 +1909,7 @@ proc tcltest::test {name description args} { set sorted [lsort $validFlags] set options [join [lrange $sorted 0 end-1] ", "] append options ", or [lindex $sorted end]" - return -code error "bad option \"$flag\": must be $options" + return -code error "bad option \"$flag\": should be $options" } } @@ -1926,7 +1926,7 @@ proc tcltest::test {name description args} { set values [join [lrange $sorted 0 end-1] ", "] append values ", or [lindex $sorted end]" return -code error "bad -match value \"$match\":\ - must be $values" + should be $values" } # Replace symbolic valies supplied for -returnCodes diff --git a/tests/assemble.test b/tests/assemble.test index b0487e6..510baa3 100644 --- a/tests/assemble.test +++ b/tests/assemble.test @@ -1112,7 +1112,7 @@ test assemble-9.7 {concat} { -body { list [catch {assemble {concat 0}} result] $result $::errorCode } - -result {1 {operand must be positive} {TCL ASSEM POSITIVE}} + -result {1 {operand should be positive} {TCL ASSEM POSITIVE}} -cleanup {unset result} } @@ -1621,7 +1621,7 @@ test assemble-16.4 {invokeStk - no operands} { } list [catch x result] $result $::errorCode } - -result {1 {operand must be positive} {TCL ASSEM POSITIVE}} + -result {1 {operand should be positive} {TCL ASSEM POSITIVE}} -cleanup {rename x {}; unset result} } test assemble-16.5 {invokeStk1} { @@ -1942,7 +1942,7 @@ test assemble-18.5 {lindexMulti - bad operand count} { } list [catch x result] $result $::errorCode } - -result {1 {operand must be positive} {TCL ASSEM POSITIVE}} + -result {1 {operand should be positive} {TCL ASSEM POSITIVE}} -cleanup {rename x {}; unset result} } test assemble-18.6 {lindexMulti} { @@ -2008,7 +2008,7 @@ test assemble-19.5 {list - negative operand count} { } list [catch x result] $result $::errorCode } - -result {1 {operand must be nonnegative} {TCL ASSEM NONNEGATIVE}} + -result {1 {operand should be nonnegative} {TCL ASSEM NONNEGATIVE}} -cleanup {rename x {}; unset result} } test assemble-19.6 {list - no args} { @@ -2074,7 +2074,7 @@ test assemble-20.5 {lsetFlat - negative operand count} { } list [catch x result] $result $::errorCode } - -result {1 {operand must be >=2} {TCL ASSEM OPERAND>=2}} + -result {1 {operand should be >=2} {TCL ASSEM OPERAND>=2}} -cleanup {rename x {}; unset result} } test assemble-20.6 {lsetFlat} { @@ -2134,7 +2134,7 @@ test assemble-21.5 {over - negative operand count} { } list [catch x result] $result $::errorCode } - -result {1 {operand must be nonnegative} {TCL ASSEM NONNEGATIVE}} + -result {1 {operand should be nonnegative} {TCL ASSEM NONNEGATIVE}} -cleanup {rename x {}; unset result} } test assemble-21.6 {over} { @@ -2226,7 +2226,7 @@ test assemble-22.5 {reverse - negative operand count} { } list [catch x result] $result $::errorCode } - -result {1 {operand must be nonnegative} {TCL ASSEM NONNEGATIVE}} + -result {1 {operand should be nonnegative} {TCL ASSEM NONNEGATIVE}} -cleanup {rename x {}; unset result} } test assemble-22.6 {reverse - zero operand count} { @@ -2565,7 +2565,7 @@ test assemble-25.5 {dictGet - negative operand count} { } list [catch x result] $result $::errorCode } - -result {1 {operand must be positive} {TCL ASSEM POSITIVE}} + -result {1 {operand should be positive} {TCL ASSEM POSITIVE}} -cleanup {rename x {}; unset result} } test assemble-25.6 {dictGet - 1 index} { @@ -2619,7 +2619,7 @@ test assemble-26.5 {dictSet - zero operand count} { } list [catch x result] $result $::errorCode } - -result {1 {operand must be positive} {TCL ASSEM POSITIVE}} + -result {1 {operand should be positive} {TCL ASSEM POSITIVE}} -cleanup {rename x {}; unset result} } test assemble-26.6 {dictSet - bad local} { @@ -2688,7 +2688,7 @@ test assemble-27.5 {dictUnset - zero operand count} { } list [catch x result] $result $::errorCode } - -result {1 {operand must be positive} {TCL ASSEM POSITIVE}} + -result {1 {operand should be positive} {TCL ASSEM POSITIVE}} -cleanup {rename x {}; unset result} } test assemble-27.6 {dictUnset - bad local} { diff --git a/tests/binary.test b/tests/binary.test index 40b1315..3dff3d8 100644 --- a/tests/binary.test +++ b/tests/binary.test @@ -2734,7 +2734,7 @@ test binary-74.9 {binary encode uuencode} -body { } test binary-74.10 {binary encode uuencode} -returnCodes error -body { binary encode uuencode -foo 30 abcabcabc -} -result {bad option "-foo": must be -maxlen or -wrapchar} +} -result {bad option "-foo": should be -maxlen or -wrapchar} test binary-74.11 {binary encode uuencode} -returnCodes error -body { binary encode uuencode -maxlen 1 abcabcabc } -result {line length out of range} diff --git a/tests/chan.test b/tests/chan.test index d8390e2..3b4bd44 100644 --- a/tests/chan.test +++ b/tests/chan.test @@ -22,7 +22,7 @@ test chan-1.1 {chan command general syntax} -body { } -returnCodes error -result "wrong # args: should be \"chan subcommand ?arg ...?\"" test chan-1.2 {chan command general syntax} -body { chan FOOBAR -} -returnCodes error -match glob -result "unknown or ambiguous subcommand \"FOOBAR\": must be *" +} -returnCodes error -match glob -result "unknown or ambiguous subcommand \"FOOBAR\": should be *" test chan-2.1 {chan command: blocked subcommand} -body { chan blocked foo bar @@ -36,14 +36,14 @@ test chan-3.2 {chan command: close subcommand} -setup { chan close $chan bar } -cleanup { close $chan -} -returnCodes error -result "bad direction \"bar\": must be read or write" +} -returnCodes error -result "bad direction \"bar\": should be read or write" test chan-3.3 {chan command: close subcommand} -setup { set chan [open [info script] r] } -body { chan close $chan write } -cleanup { close $chan -} -returnCodes error -result "Half-close of write-side not possible, side not opened or already closed" +} -returnCodes error -result "half-close of write-side not possible, side not opened or already closed" test chan-4.1 {chan command: configure subcommand} -body { chan configure } -returnCodes error -result "wrong # args: should be \"chan configure channelId ?-option value ...?\"" @@ -133,7 +133,7 @@ test chan-16.3 {chan command: pending subcommand} -body { } -returnCodes error -result "wrong # args: should be \"chan pending mode channelId\"" test chan-16.4 {chan command: pending subcommand} -body { chan pending {input output} stdout -} -returnCodes error -result "bad mode \"input output\": must be input or output" +} -returnCodes error -result "bad mode \"input output\": should be input or output" test chan-16.5 {chan command: pending input subcommand} -body { chan pending input stdout } -result -1 diff --git a/tests/chanio.test b/tests/chanio.test index e53f059..9d115ed 100644 --- a/tests/chanio.test +++ b/tests/chanio.test @@ -5017,7 +5017,7 @@ test chan-io-39.5 {Tcl_GetChannelOption, invariance} -setup { lappend l [chan configure $f1 -buffering] } -cleanup { chan close $f1 -} -result {full {1 {bad value for -buffering: must be one of full, line, or none}} full} +} -result {full {1 {bad value for -buffering: should be one of full, line, or none}} full} test chan-io-39.6 {Tcl_SetChannelOption, multiple options} -setup { file delete $path(test1) } -body { @@ -5491,7 +5491,7 @@ test chan-io-41.4 {Tcl_FileeventCmd: errors} -constraints fileevent -body { } -returnCodes error -result {can not find channel named "gorp"} test chan-io-41.5 {Tcl_FileeventCmd: errors} -constraints fileevent -body { chan event gorp who-knows -} -returnCodes error -result {bad event name "who-knows": must be readable or writable} +} -returnCodes error -result {bad event name "who-knows": should be readable or writable} # # Test chan event on a file diff --git a/tests/clock.test b/tests/clock.test index 2abeab9..45efe3c 100644 --- a/tests/clock.test +++ b/tests/clock.test @@ -273,7 +273,7 @@ test clock-1.4 "clock format - bad flag" {*}{ list [catch {clock format 0 -oops badflag} msg] $msg $::errorCode } -match glob - -result {1 {bad option "-oops": must be -format, -gmt, -locale, or -timezone} {CLOCK badOption -oops}} + -result {1 {bad option "-oops": should be -format, -gmt, -locale, or -timezone} {CLOCK badOption -oops}} } test clock-1.5 "clock format - bad timezone" { @@ -35450,7 +35450,7 @@ test clock-33.2 {clock clicks tests} { } {1} test clock-33.3 {clock clicks tests} { list [catch {clock clicks foo} msg] $msg -} {1 {bad option "foo": must be -milliseconds or -microseconds}} +} {1 {bad option "foo": should be -milliseconds or -microseconds}} test clock-33.4 {clock clicks tests} { expr [clock clicks -milliseconds]+1 concat {} @@ -35485,10 +35485,10 @@ test clock-33.5a {clock tests, millisecond timing test} { } {ok} test clock-33.6 {clock clicks, milli with too much abbreviation} { list [catch { clock clicks ? } msg] $msg -} {1 {bad option "?": must be -milliseconds or -microseconds}} +} {1 {bad option "?": should be -milliseconds or -microseconds}} test clock-33.7 {clock clicks, milli with too much abbreviation} { list [catch { clock clicks - } msg] $msg -} {1 {ambiguous option "-": must be -milliseconds or -microseconds}} +} {1 {ambiguous option "-": should be -milliseconds or -microseconds}} test clock-33.8 {clock clicks test, microsecond timing test} { # This test can fail on a system that is so heavily loaded that @@ -35607,7 +35607,7 @@ test clock-34.8 {clock scan tests} { } {Oct 23,1992 15:00 GMT} test clock-34.9 {clock scan tests} { list [catch {clock scan "Jan 12" -bad arg} msg] $msg -} {1 {bad option "-bad", must be -base, -format, -gmt, -locale or -timezone}} +} {1 {bad option "-bad", should be -base, -format, -gmt, -locale or -timezone}} # The following two two tests test the two year date policy test clock-34.10 {clock scan tests} { set time [clock scan "1/1/71" -gmt true] diff --git a/tests/cmdAH.test b/tests/cmdAH.test index 04a86fa..da84308 100644 --- a/tests/cmdAH.test +++ b/tests/cmdAH.test @@ -166,7 +166,7 @@ test cmdAH-4.1 {Tcl_EncodingObjCmd} -returnCodes error -body { } -result {wrong # args: should be "encoding option ?arg ...?"} test cmdAH-4.2 {Tcl_EncodingObjCmd} -returnCodes error -body { encoding foo -} -result {bad option "foo": must be convertfrom, convertto, dirs, names, or system} +} -result {bad option "foo": should be convertfrom, convertto, dirs, names, or system} test cmdAH-4.3 {Tcl_EncodingObjCmd} -returnCodes error -body { encoding convertto } -result {wrong # args: should be "encoding convertto ?encoding? data"} @@ -231,7 +231,7 @@ test cmdAH-5.1 {Tcl_FileObjCmd} -returnCodes error -body { } -result {wrong # args: should be "file subcommand ?arg ...?"} test cmdAH-5.2 {Tcl_FileObjCmd} -returnCodes error -body { file x -} -result {unknown or ambiguous subcommand "x": must be atime, attributes, channels, copy, delete, dirname, executable, exists, extension, isdirectory, isfile, join, link, lstat, mkdir, mtime, nativename, normalize, owned, pathtype, readable, readlink, rename, rootname, separator, size, split, stat, system, tail, tempfile, type, volumes, or writable} +} -result {unknown or ambiguous subcommand "x": should be atime, attributes, channels, copy, delete, dirname, executable, exists, extension, isdirectory, isfile, join, link, lstat, mkdir, mtime, nativename, normalize, owned, pathtype, readable, readlink, rename, rootname, separator, size, split, stat, system, tail, tempfile, type, volumes, or writable} test cmdAH-5.3 {Tcl_FileObjCmd} -returnCodes error -body { file exists } -result {wrong # args: should be "file exists name"} @@ -1442,25 +1442,25 @@ test cmdAH-29.5 {Tcl_FileObjCmd: type} { # Error conditions test cmdAH-30.1 {Tcl_FileObjCmd: error conditions} -returnCodes error -body { file gorp x -} -result {unknown or ambiguous subcommand "gorp": must be atime, attributes, channels, copy, delete, dirname, executable, exists, extension, isdirectory, isfile, join, link, lstat, mkdir, mtime, nativename, normalize, owned, pathtype, readable, readlink, rename, rootname, separator, size, split, stat, system, tail, tempfile, type, volumes, or writable} +} -result {unknown or ambiguous subcommand "gorp": should be atime, attributes, channels, copy, delete, dirname, executable, exists, extension, isdirectory, isfile, join, link, lstat, mkdir, mtime, nativename, normalize, owned, pathtype, readable, readlink, rename, rootname, separator, size, split, stat, system, tail, tempfile, type, volumes, or writable} test cmdAH-30.2 {Tcl_FileObjCmd: error conditions} -returnCodes error -body { file ex x -} -match glob -result {unknown or ambiguous subcommand "ex": must be *} +} -match glob -result {unknown or ambiguous subcommand "ex": should be *} test cmdAH-30.3 {Tcl_FileObjCmd: error conditions} -returnCodes error -body { file is x -} -match glob -result {unknown or ambiguous subcommand "is": must be *} +} -match glob -result {unknown or ambiguous subcommand "is": should be *} test cmdAH-30.4 {Tcl_FileObjCmd: error conditions} -returnCodes error -body { file z x -} -match glob -result {unknown or ambiguous subcommand "z": must be *} +} -match glob -result {unknown or ambiguous subcommand "z": should be *} test cmdAH-30.5 {Tcl_FileObjCmd: error conditions} -returnCodes error -body { file read x -} -match glob -result {unknown or ambiguous subcommand "read": must be *} +} -match glob -result {unknown or ambiguous subcommand "read": should be *} test cmdAH-30.6 {Tcl_FileObjCmd: error conditions} -returnCodes error -body { file s x -} -match glob -result {unknown or ambiguous subcommand "s": must be *} +} -match glob -result {unknown or ambiguous subcommand "s": should be *} test cmdAH-30.7 {Tcl_FileObjCmd: error conditions} -returnCodes error -body { file t x -} -match glob -result {unknown or ambiguous subcommand "t": must be *} +} -match glob -result {unknown or ambiguous subcommand "t": should be *} test cmdAH-30.8 {Tcl_FileObjCmd: error conditions} -returnCodes error -body { file dirname ~woohgy } -result {user "woohgy" doesn't exist} diff --git a/tests/cmdIL.test b/tests/cmdIL.test index 23a5f96..291e1e7 100644 --- a/tests/cmdIL.test +++ b/tests/cmdIL.test @@ -25,7 +25,7 @@ test cmdIL-1.1 {Tcl_LsortObjCmd procedure} -returnCodes error -body { } -result {wrong # args: should be "lsort ?-option value ...? list"} test cmdIL-1.2 {Tcl_LsortObjCmd procedure} -returnCodes error -body { lsort -foo {1 3 2 5} -} -result {bad option "-foo": must be -ascii, -command, -decreasing, -dictionary, -increasing, -index, -indices, -integer, -nocase, -real, -stride, or -unique} +} -result {bad option "-foo": should be -ascii, -command, -decreasing, -dictionary, -increasing, -index, -indices, -integer, -nocase, -real, -stride, or -unique} test cmdIL-1.3 {Tcl_LsortObjCmd procedure, default options} { lsort {d e c b a \{ d35 d300} } {a b c d d300 d35 e \{} @@ -34,7 +34,7 @@ test cmdIL-1.4 {Tcl_LsortObjCmd procedure, -ascii option} { } {a b c d d300 d35 e} test cmdIL-1.5 {Tcl_LsortObjCmd procedure, -command option} -body { lsort -command {1 3 2 5} -} -returnCodes error -result {"-command" option must be followed by comparison command} +} -returnCodes error -result {"-command" option should be followed by comparison command} test cmdIL-1.6 {Tcl_LsortObjCmd procedure, -command option} -setup { proc cmp {a b} { expr {[string match x* $b] - [string match x* $a]} @@ -58,10 +58,10 @@ test cmdIL-1.10 {Tcl_LsortObjCmd procedure, -increasing option} { } {a b c d d300 d35 e} test cmdIL-1.11 {Tcl_LsortObjCmd procedure, -index option} -body { lsort -index {1 3 2 5} -} -returnCodes error -result {"-index" option must be followed by list index} +} -returnCodes error -result {"-index" option should be followed by list index} test cmdIL-1.12 {Tcl_LsortObjCmd procedure, -index option} -body { lsort -index foo {1 3 2 5} -} -returnCodes error -result {bad index "foo": must be integer?[+-]integer? or end?[+-]integer?} +} -returnCodes error -result {bad index "foo": should be integer?[+-]integer? or end?[+-]integer?} test cmdIL-1.13 {Tcl_LsortObjCmd procedure, -index option} { lsort -index end -integer {{2 25} {10 20 50 100} {3 16 42} 1} } {1 {2 25} {3 16 42} {10 20 50 100}} @@ -134,13 +134,13 @@ test cmdIL-1.32 {lsort -stride errors} -returnCodes error -body { } -result {expected integer but got "foo"} test cmdIL-1.33 {lsort -stride errors} -returnCodes error -body { lsort -stride 1 bar -} -result {stride length must be at least 2} +} -result {stride length should be at least 2} test cmdIL-1.34 {lsort -stride errors} -returnCodes error -body { lsort -stride 2 {a b c} -} -result {list size must be a multiple of the stride length} +} -result {list size should be a multiple of the stride length} test cmdIL-1.35 {lsort -stride errors} -returnCodes error -body { lsort -stride 2 -index 3 {a b c d} -} -result {when used with "-stride", the leading "-index" value must be within the group} +} -result {when used with "-stride", the leading "-index" value should be within the group} test cmdIL-1.36 {lsort -stride and -index: Bug 2918962} { lsort -stride 2 -index {0 1} { {{c o d e} 54321} {{b l a h} 94729} diff --git a/tests/cmdMZ.test b/tests/cmdMZ.test index 2d68138..a3bdcae 100644 --- a/tests/cmdMZ.test +++ b/tests/cmdMZ.test @@ -95,10 +95,10 @@ test cmdMZ-return-1.0 {return checks for bad option values} -body { } -returnCodes error -match glob -result {bad -options value:*} test cmdMZ-return-1.1 {return checks for bad option values} -body { return -code err -} -returnCodes error -match glob -result {bad completion code "err": must be ok, error, return, break, continue*, or an integer} +} -returnCodes error -match glob -result {bad completion code "err": should be ok, error, return, break, continue*, or an integer} test cmdMZ-return-1.2 {return checks for bad option values} -body { return -code 0x100000000 -} -returnCodes error -match glob -result {bad completion code "0x100000000": must be ok, error, return, break, continue*, or an integer} +} -returnCodes error -match glob -result {bad completion code "0x100000000": should be ok, error, return, break, continue*, or an integer} test cmdMZ-return-1.3 {return checks for bad option values} -body { return -level foo } -returnCodes error -match glob -result {bad -level value: *} @@ -160,7 +160,7 @@ test cmdMZ-return-2.12 {return option handling} -body { } -returnCodes ok -result {} test cmdMZ-return-2.13 {return option handling} -body { return -level 0 -code error -options {-code err} -} -returnCodes error -match glob -result {bad completion code "err": must be ok, error, return, break, continue*, or an integer} +} -returnCodes error -match glob -result {bad completion code "err": should be ok, error, return, break, continue*, or an integer} test cmdMZ-return-2.14 {return option handling} -body { return -level 0 -code error -options {-code foo -options {-code break}} } -returnCodes break -result {} diff --git a/tests/compile.test b/tests/compile.test index 2852bf2..a3cb8b5 100644 --- a/tests/compile.test +++ b/tests/compile.test @@ -306,10 +306,10 @@ test compile-11.1 {Tcl_Append*: ensure Tcl_ResetResult is used properly} -body { # command that will add error to result lindex a bogus }} -} -returnCodes error -result {bad index "bogus": must be integer?[+-]integer? or end?[+-]integer?} +} -returnCodes error -result {bad index "bogus": should be integer?[+-]integer? or end?[+-]integer?} test compile-11.2 {Tcl_Append*: ensure Tcl_ResetResult is used properly} -body { apply {{} { set r [list foobar] ; string index a bogus }} -} -returnCodes error -result {bad index "bogus": must be integer?[+-]integer? or end?[+-]integer?} +} -returnCodes error -result {bad index "bogus": should be integer?[+-]integer? or end?[+-]integer?} test compile-11.3 {Tcl_Append*: ensure Tcl_ResetResult is used properly} -body { apply {{} { set r [list foobar] ; string index a 0o9 }} } -returnCodes error -match glob -result {*invalid octal number*} @@ -663,7 +663,7 @@ test compile-18.1 {disassembler - basics} -returnCodes error -body { } -match glob -result {wrong # args: should be "*"} test compile-18.2 {disassembler - basics} -returnCodes error -body { tcl::unsupported::disassemble ? -} -match glob -result {bad type "?": must be *} +} -match glob -result {bad type "?": should be *} test compile-18.3 {disassembler - basics} -returnCodes error -body { tcl::unsupported::disassemble lambda } -match glob -result {wrong # args: should be "* lambda lambdaTerm"} diff --git a/tests/config.test b/tests/config.test index d14837e..e2fb280 100644 --- a/tests/config.test +++ b/tests/config.test @@ -37,7 +37,7 @@ test pkgconfig-2.0 {error: missing subcommand} { test pkgconfig-2.1 {error: illegal subcommand} { catch {::tcl::pkgconfig foo} msg set msg -} {bad subcommand "foo": must be get or list} +} {bad subcommand "foo": should be get or list} test pkgconfig-2.2 {error: list with arguments} { catch {::tcl::pkgconfig list foo} msg set msg diff --git a/tests/dict.test b/tests/dict.test index d5406d0..c525cb2 100644 --- a/tests/dict.test +++ b/tests/dict.test @@ -33,7 +33,7 @@ test dict-1.1 {dict command basic syntax} -returnCodes error -body { } -result {wrong # args: should be "dict subcommand ?arg ...?"} test dict-1.2 {dict command basic syntax} -returnCodes error -body { dict ? -} -match glob -result {unknown or ambiguous subcommand "?": must be *} +} -match glob -result {unknown or ambiguous subcommand "?": should be *} test dict-2.1 {dict create command} { dict create @@ -1064,7 +1064,7 @@ test dict-17.21 {dict filter command} -returnCodes error -body { } -result {wrong # args: should be "dict filter dictionary filterType ?arg ...?"} test dict-17.22 {dict filter command} -returnCodes error -body { dict filter {a b} JUNK -} -result {bad filterType "JUNK": must be key, script, or value} +} -result {bad filterType "JUNK": should be key, script, or value} test dict-17.23 {dict filter command} -returnCodes error -body { dict filter a key * } -result {missing value to go with key} diff --git a/tests/error.test b/tests/error.test index 0de644c..36c2b41 100644 --- a/tests/error.test +++ b/tests/error.test @@ -326,10 +326,10 @@ test error-8.8 {throw syntax checks} -returnCodes error -body { } -result {unmatched open brace in list} test error-8.9 {throw syntax checks} -returnCodes error -body { throw {} foo -} -result {type must be non-empty list} +} -result {type should be non-empty list} test error-8.10 {Bug 33b7abb8a2: throw stack usage} -returnCodes error -body { apply {code {throw $code foo}} {} -} -result {type must be non-empty list} +} -result {type should be non-empty list} test error-8.11 {Bug 7174354ecb: throw error message} -returnCodes error -body { throw {not {}a list} x[]y } -result {list element in braces followed by "a" instead of space} @@ -1130,10 +1130,10 @@ rename addmsg {} test error-20.1 {bad code name in on handler} -body { try { list a b c } on err {} {} -} -returnCodes error -match glob -result {bad completion code "err": must be ok, error, return, break, continue*, or an integer} +} -returnCodes error -match glob -result {bad completion code "err": should be ok, error, return, break, continue*, or an integer} test error-20.2 {bad code value in on handler} -body { try { list a b c } on 34985723094872345 {} {} -} -returnCodes error -match glob -result {bad completion code "34985723094872345": must be ok, error, return, break, continue*, or an integer} +} -returnCodes error -match glob -result {bad completion code "34985723094872345": should be ok, error, return, break, continue*, or an integer} test error-21.1 {memory leaks in try: Bug 2910044} memory { leaktest { diff --git a/tests/event.test b/tests/event.test index 0d1b06c..36f8d3b 100644 --- a/tests/event.test +++ b/tests/event.test @@ -589,7 +589,7 @@ test event-12.1 {Tcl_UpdateCmd procedure} -returnCodes error -body { } -result {wrong # args: should be "update ?idletasks?"} test event-12.2 {Tcl_UpdateCmd procedure} -returnCodes error -body { update bogus -} -result {bad option "bogus": must be idletasks} +} -result {bad option "bogus": should be idletasks} test event-12.3 {Tcl_UpdateCmd procedure} -setup { foreach i [after info] { after cancel $i diff --git a/tests/exec.test b/tests/exec.test index 16a8320..9cab491 100644 --- a/tests/exec.test +++ b/tests/exec.test @@ -548,7 +548,7 @@ test exec-14.2 {-keepnewline switch} -constraints {exec} -body { } -returnCodes error -result {wrong # args: should be "exec ?-option ...? arg ?arg ...?"} test exec-14.3 {unknown switch} -constraints {exec} -body { exec -gorp -} -returnCodes error -result {bad option "-gorp": must be -ignorestderr, -keepnewline, or --} +} -returnCodes error -result {bad option "-gorp": should be -ignorestderr, -keepnewline, or --} test exec-14.4 {-- switch} -constraints {exec} -body { exec -- -gorp } -returnCodes error -result {couldn't execute "-gorp": no such file or directory} diff --git a/tests/fCmd.test b/tests/fCmd.test index 5836e00..93ac47f 100644 --- a/tests/fCmd.test +++ b/tests/fCmd.test @@ -196,7 +196,7 @@ test fCmd-2.1 {TclFileCopyCmd} -constraints {notRoot} -setup { test fCmd-3.1 {FileCopyRename: FileForceOption fails} -constraints {notRoot} -body { file rename -xyz -} -returnCodes error -result {bad option "-xyz": must be -force or --} +} -returnCodes error -result {bad option "-xyz": should be -force or --} test fCmd-3.2 {FileCopyRename: not enough args} -constraints {notRoot} -body { file rename xyz } -returnCodes error -result {wrong # args: should be "file rename ?-option value ...? source ?source ...? target"} @@ -394,7 +394,7 @@ test fCmd-4.16 {TclFileMakeDirsCmd: TclpCreateDirectory succeeds} -setup { test fCmd-5.1 {TclFileDeleteCmd: FileForceOption fails} -constraints {notRoot} -body { file delete -xyz -} -returnCodes error -result {bad option "-xyz": must be -force or --} +} -returnCodes error -result {bad option "-xyz": should be -force or --} test fCmd-5.2 {TclFileDeleteCmd: accept 0 files (TIP 323)} -body { file delete -force -force } -result {} @@ -736,7 +736,7 @@ test fCmd-7.4 {FileForceOption: bad option} -constraints {notRoot} -setup { file delete -tf1 } -returnCodes error -cleanup { file delete -- -tf1 -} -result {bad option "-tf1": must be -force or --} +} -result {bad option "-tf1": should be -force or --} test fCmd-7.5 {FileForceOption: multiple times through loop} -setup { cleanup } -constraints {notRoot} -returnCodes error -body { @@ -2324,10 +2324,10 @@ test fCmd-28.2 {file link} -returnCodes error -body { } -result {wrong # args: should be "file link ?-linktype? linkname ?target?"} test fCmd-28.3 {file link} -returnCodes error -body { file link abc b c -} -result {bad option "abc": must be -symbolic or -hard} +} -result {bad option "abc": should be -symbolic or -hard} test fCmd-28.4 {file link} -returnCodes error -body { file link -abc b c -} -result {bad option "-abc": must be -symbolic or -hard} +} -result {bad option "-abc": should be -symbolic or -hard} cd [workingDirectory] makeDirectory abc.dir makeDirectory abc2.dir diff --git a/tests/fileName.test b/tests/fileName.test index 51f00d1..4227017 100644 --- a/tests/fileName.test +++ b/tests/fileName.test @@ -701,7 +701,7 @@ test filename-11.1 {Tcl_GlobCmd} -returnCodes error -body { } -result {no files matched glob patterns ""} test filename-11.2 {Tcl_GlobCmd} -returnCodes error -body { glob -gorp -} -result {bad option "-gorp": must be -directory, -join, -nocomplain, -path, -tails, -types, or --} +} -result {bad option "-gorp": should be -directory, -join, -nocomplain, -path, -tails, -types, or --} test filename-11.3 {Tcl_GlobCmd} -body { glob -nocomplai } -result {} @@ -1014,11 +1014,11 @@ test filename-11.34 {Tcl_GlobCmd} -returnCodes error -body { } -result {missing argument to "-directory"} test filename-11.35 {Tcl_GlobCmd} -returnCodes error -body { glob -paths * -} -result {bad option "-paths": must be -directory, -join, -nocomplain, -path, -tails, -types, or --} +} -result {bad option "-paths": should be -directory, -join, -nocomplain, -path, -tails, -types, or --} # Test '-tails' flag to glob. test filename-11.36 {Tcl_GlobCmd} -returnCodes error -body { glob -tails * -} -result {"-tails" must be used with either "-directory" or "-path"} +} -result {"-tails" should be used with either "-directory" or "-path"} test filename-11.37 {Tcl_GlobCmd} { glob -type d -tails -path $globname * } [list $globname] @@ -1043,7 +1043,7 @@ test filename-11.42 {Tcl_GlobCmd} -body { } -match compareWords -result equal test filename-11.43 {Tcl_GlobCmd} -returnCodes error -body { glob -t * -} -result {ambiguous option "-t": must be -directory, -join, -nocomplain, -path, -tails, -types, or --} +} -result {ambiguous option "-t": should be -directory, -join, -nocomplain, -path, -tails, -types, or --} test filename-11.44 {Tcl_GlobCmd} -returnCodes error -body { glob -tails -path hello -directory hello * } -result {"-directory" cannot be used with "-path"} diff --git a/tests/history.test b/tests/history.test index c562796..b19e861 100644 --- a/tests/history.test +++ b/tests/history.test @@ -243,7 +243,7 @@ test history-9.1 {miscellaneous} history {catch {history gorp} msg} 1 test history-9.2 {miscellaneous} history { catch {history gorp} msg set msg -} {unknown or ambiguous subcommand "gorp": must be add, change, clear, event, info, keep, nextid, or redo} +} {unknown or ambiguous subcommand "gorp": should be add, change, clear, event, info, keep, nextid, or redo} # cleanup ::tcltest::cleanupTests diff --git a/tests/http.test b/tests/http.test index a0a26de..89d58ab 100644 --- a/tests/http.test +++ b/tests/http.test @@ -97,7 +97,7 @@ test http-1.4 {http::config} { } {-accept */* -proxyfilter myFilter -proxyhost nowhere.come -proxyport 8080 -urlencoding iso8859-1 -useragent {Tcl Test Suite}} test http-1.5 {http::config} -returnCodes error -body { http::config -proxyhost {} -junk 8080 -} -result {Unknown option -junk, must be: -accept, -proxyfilter, -proxyhost, -proxyport, -urlencoding, -useragent} +} -result {unknown option -junk, should be: -accept, -proxyfilter, -proxyhost, -proxyport, -urlencoding, -useragent} test http-1.6 {http::config} -setup { set oldenc [http::config -urlencoding] } -body { @@ -114,10 +114,10 @@ test http-2.1 {http::reset} { test http-3.1 {http::geturl} -returnCodes error -body { http::geturl -bogus flag -} -result {Unknown option flag, can be: -binary, -blocksize, -channel, -command, -handler, -headers, -keepalive, -method, -myaddr, -progress, -protocol, -query, -queryblocksize, -querychannel, -queryprogress, -strict, -timeout, -type, -validate} +} -result {unknown option flag, should be: -binary, -blocksize, -channel, -command, -handler, -headers, -keepalive, -method, -myaddr, -progress, -protocol, -query, -queryblocksize, -querychannel, -queryprogress, -strict, -timeout, -type, -validate} test http-3.2 {http::geturl} -returnCodes error -body { http::geturl http:junk -} -result {Unsupported URL: http:junk} +} -result {unsupported URL: http:junk} set url //[info hostname]:$port set badurl //[info hostname]:[expr $port+1] test http-3.3 {http::geturl} -body { @@ -318,34 +318,34 @@ test http-3.14 "http::geturl $fullurl" -body { } -result "HTTP/1.0 200 OK" test http-3.15 {http::geturl parse failures} -body { http::geturl "{invalid}:url" -} -returnCodes error -result {Unsupported URL: {invalid}:url} +} -returnCodes error -result {unsupported URL: {invalid}:url} test http-3.16 {http::geturl parse failures} -body { http::geturl http:relative/url -} -returnCodes error -result {Unsupported URL: http:relative/url} +} -returnCodes error -result {unsupported URL: http:relative/url} test http-3.17 {http::geturl parse failures} -body { http::geturl /absolute/url -} -returnCodes error -result {Missing host part: /absolute/url} +} -returnCodes error -result {missing host part: /absolute/url} test http-3.18 {http::geturl parse failures} -body { http::geturl http://somewhere:123456789/ -} -returnCodes error -result {Invalid port number: 123456789} +} -returnCodes error -result {invalid port number: 123456789} test http-3.19 {http::geturl parse failures} -body { http::geturl http://{user}@somewhere -} -returnCodes error -result {Illegal characters in URL user} +} -returnCodes error -result {illegal characters in URL user} test http-3.20 {http::geturl parse failures} -body { http::geturl http://%user@somewhere -} -returnCodes error -result {Illegal encoding character usage "%us" in URL user} +} -returnCodes error -result {illegal encoding character usage "%us" in URL user} test http-3.21 {http::geturl parse failures} -body { http::geturl http://somewhere/{path} -} -returnCodes error -result {Illegal characters in URL path} +} -returnCodes error -result {illegal characters in URL path} test http-3.22 {http::geturl parse failures} -body { http::geturl http://somewhere/%path -} -returnCodes error -result {Illegal encoding character usage "%pa" in URL path} +} -returnCodes error -result {illegal encoding character usage "%pa" in URL path} test http-3.23 {http::geturl parse failures} -body { http::geturl http://somewhere/path?{query}? -} -returnCodes error -result {Illegal characters in URL path} +} -returnCodes error -result {illegal characters in URL path} test http-3.24 {http::geturl parse failures} -body { http::geturl http://somewhere/path?%query -} -returnCodes error -result {Illegal encoding character usage "%qu" in URL path} +} -returnCodes error -result {illegal encoding character usage "%qu" in URL path} test http-3.25 {http::meta} -setup { unset -nocomplain m token } -body { diff --git a/tests/indexObj.test b/tests/indexObj.test index 646cb02..d4adf56 100644 --- a/tests/indexObj.test +++ b/tests/indexObj.test @@ -49,35 +49,35 @@ test indexObj-1.9 {exact match of empty values} testindexobj { test indexObj-2.1 {no match} testindexobj { list [catch {testindexobj 1 1 dddd abc def xalb xyz alm x} msg] $msg -} {1 {bad token "dddd": must be abc, def, xalb, xyz, alm, or x}} +} {1 {bad token "dddd": should be abc, def, xalb, xyz, alm, or x}} test indexObj-2.2 {no match} testindexobj { list [catch {testindexobj 1 1 dddd abc} msg] $msg -} {1 {bad token "dddd": must be abc}} +} {1 {bad token "dddd": should be abc}} test indexObj-2.3 {no match: no abbreviations} testindexobj { list [catch {testindexobj 1 0 xy abc def xalb xyz alm} msg] $msg -} {1 {bad token "xy": must be abc, def, xalb, xyz, or alm}} +} {1 {bad token "xy": should be abc, def, xalb, xyz, or alm}} test indexObj-2.4 {ambiguous value} testindexobj { list [catch {testindexobj 1 1 d dumb daughter a c} msg] $msg -} {1 {ambiguous token "d": must be dumb, daughter, a, or c}} +} {1 {ambiguous token "d": should be dumb, daughter, a, or c}} test indexObj-2.5 {omit error message} testindexobj { list [catch {testindexobj 0 1 d x} msg] $msg } {1 {}} test indexObj-2.6 {TCL_EXACT => no "ambiguous" error message} testindexobj { list [catch {testindexobj 1 0 d dumb daughter a c} msg] $msg -} {1 {bad token "d": must be dumb, daughter, a, or c}} +} {1 {bad token "d": should be dumb, daughter, a, or c}} test indexObj-2.7 {exact match of empty values} testindexobj { list [catch {testindexobj 1 1 {} a b c} msg] $msg -} {1 {ambiguous token "": must be a, b, or c}} +} {1 {ambiguous token "": should be a, b, or c}} test indexObj-2.8 {exact match of empty values: singleton case} testindexobj { list [catch {testindexobj 1 0 {} a} msg] $msg -} {1 {bad token "": must be a}} +} {1 {bad token "": should be a}} test indexObj-2.9 {non-exact match of empty values: singleton case} testindexobj { # NOTE this is a special case. Although the empty string is a # unique prefix, we have an established history of rejecting # empty lookup keys, requiring any unique prefix match to have # at least one character. list [catch {testindexobj 1 1 {} a} msg] $msg -} {1 {bad token "": must be a}} +} {1 {ambiguous token "": should be a}} test indexObj-3.1 {cache result to skip next lookup} testindexobj { testindexobj check 42 diff --git a/tests/info.test b/tests/info.test index 3057dd2..20b56b5 100644 --- a/tests/info.test +++ b/tests/info.test @@ -678,16 +678,16 @@ test info-21.1 {miscellaneous error conditions} -returnCodes error -body { } -result {wrong # args: should be "info subcommand ?arg ...?"} test info-21.2 {miscellaneous error conditions} -returnCodes error -body { info gorp -} -result {unknown or ambiguous subcommand "gorp": must be args, body, class, cmdcount, commands, complete, coroutine, default, errorstack, exists, frame, functions, globals, hostname, level, library, loaded, locals, nameofexecutable, object, patchlevel, procs, script, sharedlibextension, tclversion, or vars} +} -result {unknown or ambiguous subcommand "gorp": should be args, body, class, cmdcount, commands, complete, coroutine, default, errorstack, exists, frame, functions, globals, hostname, level, library, loaded, locals, nameofexecutable, object, patchlevel, procs, script, sharedlibextension, tclversion, or vars} test info-21.3 {miscellaneous error conditions} -returnCodes error -body { info c -} -result {unknown or ambiguous subcommand "c": must be args, body, class, cmdcount, commands, complete, coroutine, default, errorstack, exists, frame, functions, globals, hostname, level, library, loaded, locals, nameofexecutable, object, patchlevel, procs, script, sharedlibextension, tclversion, or vars} +} -result {unknown or ambiguous subcommand "c": should be args, body, class, cmdcount, commands, complete, coroutine, default, errorstack, exists, frame, functions, globals, hostname, level, library, loaded, locals, nameofexecutable, object, patchlevel, procs, script, sharedlibextension, tclversion, or vars} test info-21.4 {miscellaneous error conditions} -returnCodes error -body { info l -} -result {unknown or ambiguous subcommand "l": must be args, body, class, cmdcount, commands, complete, coroutine, default, errorstack, exists, frame, functions, globals, hostname, level, library, loaded, locals, nameofexecutable, object, patchlevel, procs, script, sharedlibextension, tclversion, or vars} +} -result {unknown or ambiguous subcommand "l": should be args, body, class, cmdcount, commands, complete, coroutine, default, errorstack, exists, frame, functions, globals, hostname, level, library, loaded, locals, nameofexecutable, object, patchlevel, procs, script, sharedlibextension, tclversion, or vars} test info-21.5 {miscellaneous error conditions} -returnCodes error -body { info s -} -result {unknown or ambiguous subcommand "s": must be args, body, class, cmdcount, commands, complete, coroutine, default, errorstack, exists, frame, functions, globals, hostname, level, library, loaded, locals, nameofexecutable, object, patchlevel, procs, script, sharedlibextension, tclversion, or vars} +} -result {unknown or ambiguous subcommand "s": should be args, body, class, cmdcount, commands, complete, coroutine, default, errorstack, exists, frame, functions, globals, hostname, level, library, loaded, locals, nameofexecutable, object, patchlevel, procs, script, sharedlibextension, tclversion, or vars} ## # ### ### ### ######### ######### ######### diff --git a/tests/interp.test b/tests/interp.test index ad99fac..8849668 100644 --- a/tests/interp.test +++ b/tests/interp.test @@ -32,7 +32,7 @@ test interp-1.1 {options for interp command} -returnCodes error -body { } -result {wrong # args: should be "interp cmd ?arg ...?"} test interp-1.2 {options for interp command} -returnCodes error -body { interp frobox -} -result {bad option "frobox": must be alias, aliases, bgerror, cancel, create, debug, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, limit, marktrusted, recursionlimit, slaves, share, target, or transfer} +} -result {bad option "frobox": should be alias, aliases, bgerror, cancel, create, debug, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, limit, marktrusted, recursionlimit, slaves, share, target, or transfer} test interp-1.3 {options for interp command} { interp delete } "" @@ -50,13 +50,13 @@ test interp-1.6 {options for interp command} -returnCodes error -body { } -result {wrong # args: should be "interp slaves ?path?"} test interp-1.7 {options for interp command} -returnCodes error -body { interp hello -} -result {bad option "hello": must be alias, aliases, bgerror, cancel, create, debug, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, limit, marktrusted, recursionlimit, slaves, share, target, or transfer} +} -result {bad option "hello": should be alias, aliases, bgerror, cancel, create, debug, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, limit, marktrusted, recursionlimit, slaves, share, target, or transfer} test interp-1.8 {options for interp command} -returnCodes error -body { interp -froboz -} -result {bad option "-froboz": must be alias, aliases, bgerror, cancel, create, debug, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, limit, marktrusted, recursionlimit, slaves, share, target, or transfer} +} -result {bad option "-froboz": should be alias, aliases, bgerror, cancel, create, debug, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, limit, marktrusted, recursionlimit, slaves, share, target, or transfer} test interp-1.9 {options for interp command} -returnCodes error -body { interp -froboz -safe -} -result {bad option "-froboz": must be alias, aliases, bgerror, cancel, create, debug, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, limit, marktrusted, recursionlimit, slaves, share, target, or transfer} +} -result {bad option "-froboz": should be alias, aliases, bgerror, cancel, create, debug, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, limit, marktrusted, recursionlimit, slaves, share, target, or transfer} test interp-1.10 {options for interp command} -returnCodes error -body { interp target } -result {wrong # args: should be "interp target path alias"} @@ -82,7 +82,7 @@ test interp-2.6 {basic interpreter creation} { } d test interp-2.7 {basic interpreter creation} { list [catch {interp create -froboz} msg] $msg -} {1 {bad option "-froboz": must be -safe or --}} +} {1 {bad option "-froboz": should be -safe or --}} test interp-2.8 {basic interpreter creation} { interp create -- -froboz } -froboz @@ -2387,13 +2387,13 @@ test interp-29.1.5 {interp recursionlimit argument checking} { set result [catch {interp recursionlimit moo 0} msg] interp delete moo list $result $msg -} {1 {recursion limit must be > 0}} +} {1 {recursion limit should be > 0}} test interp-29.1.6 {interp recursionlimit argument checking} { interp create moo set result [catch {interp recursionlimit moo -1} msg] interp delete moo list $result $msg -} {1 {recursion limit must be > 0}} +} {1 {recursion limit should be > 0}} test interp-29.1.7 {interp recursionlimit argument checking} { interp create moo set result [catch {interp recursionlimit moo [expr {wide(1)<<32}]} msg] @@ -2417,13 +2417,13 @@ test interp-29.1.10 {slave recursionlimit argument checking} { set result [catch {moo recursionlimit 0} msg] interp delete moo list $result $msg -} {1 {recursion limit must be > 0}} +} {1 {recursion limit should be > 0}} test interp-29.1.11 {slave recursionlimit argument checking} { interp create moo set result [catch {moo recursionlimit -1} msg] interp delete moo list $result $msg -} {1 {recursion limit must be > 0}} +} {1 {recursion limit should be > 0}} test interp-29.1.12 {slave recursionlimit argument checking} { interp create moo set result [catch {moo recursionlimit [expr {wide(1)<<32}]} msg] @@ -3386,7 +3386,7 @@ test interp-35.2 {interp limit syntax} -body { } -returnCodes error -result {wrong # args: should be "interp limit path limitType ?-option value ...?"} test interp-35.3 {interp limit syntax} -body { interp limit {} foo -} -returnCodes error -result {bad limit type "foo": must be commands or time} +} -returnCodes error -result {bad limit type "foo": should be commands or time} test interp-35.4 {interp limit syntax} -body { set i [interp create] set dict [interp limit $i commands] @@ -3415,7 +3415,7 @@ test interp-35.7 {interp limit syntax} -body { interp limit $i commands -foobar } -cleanup { interp delete $i -} -returnCodes error -result {bad option "-foobar": must be -command, -granularity, or -value} +} -returnCodes error -result {bad option "-foobar": should be -command, -granularity, or -value} test interp-35.8 {interp limit syntax} -body { set i [interp create] interp limit $i commands -granularity foobar @@ -3427,7 +3427,7 @@ test interp-35.9 {interp limit syntax} -body { interp limit $i commands -granularity 0 } -cleanup { interp delete $i -} -returnCodes error -result {granularity must be at least 1} +} -returnCodes error -result {granularity should be at least 1} test interp-35.10 {interp limit syntax} -body { set i [interp create] interp limit $i commands -value foobar @@ -3439,7 +3439,7 @@ test interp-35.11 {interp limit syntax} -body { interp limit $i commands -value -1 } -cleanup { interp delete $i -} -returnCodes error -result {command limit value must be at least 0} +} -returnCodes error -result {command limit value should be at least 0} test interp-35.12 {interp limit syntax} -body { set i [interp create] set dict [interp limit $i time] @@ -3468,7 +3468,7 @@ test interp-35.15 {interp limit syntax} -body { interp limit $i time -foobar } -cleanup { interp delete $i -} -returnCodes error -result {bad option "-foobar": must be -command, -granularity, -milliseconds, or -seconds} +} -returnCodes error -result {bad option "-foobar": should be -command, -granularity, -milliseconds, or -seconds} test interp-35.16 {interp limit syntax} -body { set i [interp create] interp limit $i time -granularity foobar @@ -3480,7 +3480,7 @@ test interp-35.17 {interp limit syntax} -body { interp limit $i time -granularity 0 } -cleanup { interp delete $i -} -returnCodes error -result {granularity must be at least 1} +} -returnCodes error -result {granularity should be at least 1} test interp-35.18 {interp limit syntax} -body { set i [interp create] interp limit $i time -seconds foobar @@ -3492,7 +3492,7 @@ test interp-35.19 {interp limit syntax} -body { interp limit $i time -seconds -1 } -cleanup { interp delete $i -} -returnCodes error -result {seconds must be at least 0} +} -returnCodes error -result {seconds should be at least 0} test interp-35.20 {interp limit syntax} -body { set i [interp create] interp limit $i time -millis foobar @@ -3504,7 +3504,7 @@ test interp-35.21 {interp limit syntax} -body { interp limit $i time -millis -1 } -cleanup { interp delete $i -} -returnCodes error -result {milliseconds must be at least 0} +} -returnCodes error -result {milliseconds should be at least 0} test interp-35.22 {interp time limits normalize milliseconds} -body { set i [interp create] interp limit $i time -seconds 1 -millis 1500 @@ -3539,14 +3539,14 @@ test interp-36.4 {SlaveBgerror syntax} -setup { slave bgerror \{ } -cleanup { interp delete slave -} -returnCodes error -result {cmdPrefix must be list of length >= 1} +} -returnCodes error -result {cmdPrefix should be list of length >= 1} test interp-36.5 {SlaveBgerror syntax} -setup { interp create slave } -body { slave bgerror {} } -cleanup { interp delete slave -} -returnCodes error -result {cmdPrefix must be list of length >= 1} +} -returnCodes error -result {cmdPrefix should be list of length >= 1} test interp-36.6 {SlaveBgerror returns handler} -setup { interp create slave } -body { @@ -3626,7 +3626,7 @@ test interp-38.6 {interp debug basic setup} -body { } -returnCodes error -result {could not find interpreter "-frames"} test interp-38.7 {interp debug basic setup} -body { interp debug {} -frames -} -returnCodes error -result {bad debug option "-frames": must be -frame} +} -returnCodes error -result {bad debug option "-frames": should be -frame} test interp-38.8 {interp debug basic setup} -body { interp debug {} -frame 0 bogus } -returnCodes { diff --git a/tests/io.test b/tests/io.test index cf38a1b..26be64e 100644 --- a/tests/io.test +++ b/tests/io.test @@ -5148,7 +5148,7 @@ test io-39.5 {Tcl_GetChannelOption, invariance} { lappend l [fconfigure $f1 -buffering] close $f1 set l -} {full {1 {bad value for -buffering: must be one of full, line, or none}} full} +} {full {1 {bad value for -buffering: should be one of full, line, or none}} full} test io-39.6 {Tcl_SetChannelOption, multiple options} { file delete $path(test1) set f1 [open $path(test1) w] @@ -5599,7 +5599,7 @@ test io-41.4 {Tcl_FileeventCmd: errors} {fileevent} { } {1 {can not find channel named "gorp"}} test io-41.5 {Tcl_FileeventCmd: errors} {fileevent} { list [catch {fileevent gorp who-knows} msg] $msg -} {1 {bad event name "who-knows": must be readable or writable}} +} {1 {bad event name "who-knows": should be readable or writable}} # # Test fileevent on a file diff --git a/tests/ioCmd.test b/tests/ioCmd.test index 9b2bbad..a142e22 100644 --- a/tests/ioCmd.test +++ b/tests/ioCmd.test @@ -170,10 +170,10 @@ test iocmd-5.3 {seek command} -returnCodes error -body { } -result {expected integer but got "gugu"} test iocmd-5.4 {seek command} -returnCodes error -body { seek stdin 100 gugu -} -result {bad origin "gugu": must be start, current, or end} +} -result {bad origin "gugu": should be start, current, or end} test iocmd-5.5 {seek command} -returnCodes error -body { seek stdin 100 "" -} -result {ambiguous origin "": must be start, current, or end} +} -result {ambiguous origin "": should be start, current, or end} test iocmd-6.1 {tell command} { list [catch {tell} msg] $msg @@ -200,21 +200,21 @@ test iocmd-7.4 {close command} -setup { chan close $chan bar } -cleanup { close $chan -} -returnCodes error -result "bad direction \"bar\": must be read or write" +} -returnCodes error -result "bad direction \"bar\": should be read or write" test iocmd-7.4a {close command} -setup { set chan [open [info script] r] } -body { chan close $chan "" } -cleanup { close $chan -} -returnCodes error -result "ambiguous direction \"\": must be read or write" +} -returnCodes error -result "ambiguous direction \"\": should be read or write" test iocmd-7.5 {close command} -setup { set chan [open [info script] r] } -body { chan close $chan write } -cleanup { close $chan -} -returnCodes error -result "Half-close of write-side not possible, side not opened or already closed" +} -returnCodes error -result "half-close of write-side not possible, side not opened or already closed" test iocmd-8.1 {fconfigure command} { list [catch {fconfigure} msg] $msg @@ -231,13 +231,13 @@ test iocmd-8.4 {fconfigure command} { set x [list [catch {fconfigure $f1 froboz} msg] $msg] close $f1 set x -} {1 {unknown or ambiguous option "froboz": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, or -translation}} +} {1 {bad option "froboz": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, or -translation}} test iocmd-8.5 {fconfigure command} { list [catch {fconfigure stdin -buffering froboz} msg] $msg -} {1 {bad value for -buffering: must be one of full, line, or none}} +} {1 {bad value for -buffering: should be one of full, line, or none}} test iocmd-8.6 {fconfigure command} { list [catch {fconfigure stdin -translation froboz} msg] $msg -} {1 {bad value for -translation: must be one of auto, binary, cr, lf, crlf, or platform}} +} {1 {bad value for -translation: should be one of auto, binary, cr, lf, crlf, or platform}} test iocmd-8.7 {fconfigure command} { file delete $path(test1) set f1 [open $path(test1) w] @@ -275,19 +275,19 @@ test iocmd-8.11 {fconfigure command} { set res [list [catch {fconfigure $chan -froboz blarfo} msg] $msg] close $chan set res -} {1 {unknown or ambiguous option "-froboz": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, or -translation}} +} {1 {bad option "-froboz": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, or -translation}} test iocmd-8.12 {fconfigure command} { set chan [open $path(fconfigure.dummy) r] set res [list [catch {fconfigure $chan -b blarfo} msg] $msg] close $chan set res -} {1 {unknown or ambiguous option "-b": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, or -translation}} +} {1 {bad option "-b": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, or -translation}} test iocmd-8.13 {fconfigure command} { set chan [open $path(fconfigure.dummy) r] set res [list [catch {fconfigure $chan -buffer blarfo} msg] $msg] close $chan set res -} {1 {unknown or ambiguous option "-buffer": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, or -translation}} +} {1 {bad option "-buffer": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, or -translation}} removeFile fconfigure.dummy test iocmd-8.14 {fconfigure command} { fconfigure stdin -buffers @@ -304,7 +304,7 @@ test iocmd-8.15.1 {fconfigure command / tcp channel} -constraints {socket unixOr close $srv unset cli srv port rename iocmdSRV {} -} -returnCodes error -result {unknown or ambiguous option "-blah": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -translation, -peername, or -sockname} +} -returnCodes error -result {bad option "-blah": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -translation, -peername, or -sockname} test iocmd-8.16 {fconfigure command / tcp channel} -constraints socket -setup { set srv [socket -server iocmdSRV -myaddr 127.0.0.1 0] set port [lindex [fconfigure $srv -sockname] 2] @@ -465,14 +465,14 @@ unmatched open brace in list \"open \$path(test3) \"FOO \\{BAR BAZ\"\"" test iocmd-12.7 {POSIX open access modes: errors} { list [catch {open $path(test3) {FOO BAR BAZ}} msg] $msg -} {1 {invalid access mode "FOO": must be RDONLY, WRONLY, RDWR, APPEND, BINARY, CREAT, EXCL, NOCTTY, NONBLOCK, or TRUNC}} +} {1 {invalid access mode "FOO": should be RDONLY, WRONLY, RDWR, APPEND, BINARY, CREAT, EXCL, NOCTTY, NONBLOCK, or TRUNC}} test iocmd-12.8 {POSIX open access modes: errors} { list [catch {open $path(test3) {TRUNC CREAT}} msg] $msg -} {1 {access mode must include either RDONLY, WRONLY, or RDWR}} +} {1 {access mode should include either RDONLY, WRONLY, or RDWR}} close [open $path(test3) w] test iocmd-12.9 {POSIX open access modes: BINARY} { list [catch {open $path(test1) BINARY} msg] $msg -} {1 {access mode must include either RDONLY, WRONLY, or RDWR}} +} {1 {access mode should include either RDONLY, WRONLY, or RDWR}} test iocmd-12.10 {POSIX open access modes: BINARY} { set f [open $path(test1) {WRONLY BINARY TRUNC}] puts $f a @@ -649,10 +649,10 @@ test iocmd-15.9 {Tcl_FcopyObjCmd} {fcopy} { } "1 {channel \"$rfile\" wasn't opened for writing}" test iocmd-15.10 {Tcl_FcopyObjCmd} {fcopy} { list [catch {fcopy $rfile $wfile foo bar} msg] $msg -} {1 {bad option "foo": must be -command or -size}} +} {1 {bad option "foo": should be -command or -size}} test iocmd-15.10a {Tcl_FcopyObjCmd} {fcopy} { list [catch {fcopy $rfile $wfile - bar} msg] $msg -} {1 {ambiguous option "-": must be -command or -size}} +} {1 {ambiguous option "-": should be -command or -size}} test iocmd-15.11 {Tcl_FcopyObjCmd} {fcopy} { list [catch {fcopy $rfile $wfile -size foo} msg] $msg } {1 {expected integer but got "foo"}} @@ -672,7 +672,7 @@ test iocmd-20.0 {chan, wrong#args} { } {wrong # args: should be "chan subcommand ?arg ...?"} test iocmd-20.1 {chan, unknown method} -body { chan foo -} -returnCodes error -match glob -result {unknown or ambiguous subcommand "foo": must be *} +} -returnCodes error -match glob -result {unknown or ambiguous subcommand "foo": should be *} # --- --- --- --------- --------- --------- # chan create, and method "initalize" @@ -696,7 +696,7 @@ test iocmd-21.3 {chan create, invalid r/w mode, bad string} { catch {chan create {c} foo} msg rename foo {} set msg -} {bad mode "c": must be read or write} +} {bad mode "c": should be read or write} test iocmd-21.4 {chan create, bad handler, not a list} { catch {chan create {r w} "foo \{"} msg set msg @@ -740,13 +740,13 @@ test iocmd-21.11 {chan create, initialize failed, bad result, bogus method name} catch {chan create {r w} foo} msg rename foo {} set msg -} -match glob -result {*bad method "1": must be *} +} -match glob -result {*bad method "1": should be *} test iocmd-21.12 {chan create, initialize failed, bad result, bogus method name} -body { proc foo {args} {return {a b c}} catch {chan create {r w} foo} msg rename foo {} set msg -} -match glob -result {*bad method "c": must be *} +} -match glob -result {*bad method "c": should be *} test iocmd-21.13 {chan create, initialize failed, bad result, required methods missing} -body { proc foo {args} {return {initialize finalize}} catch {chan create {r w} foo} msg @@ -1984,7 +1984,7 @@ test iocmd-31.4 {chan postevent, bad input, illlegal keyword} -match glob -body close $c rename foo {} set res -} -result {{bad event "goo": must be read or write}} +} -result {{bad event "goo": should be read or write}} test iocmd-31.5 {chan postevent, bad input, not a list} -match glob -body { set res {} proc foo {args} {oninit; onfinal; track; return} diff --git a/tests/ioTrans.test b/tests/ioTrans.test index c40621b..05d0d33 100644 --- a/tests/ioTrans.test +++ b/tests/ioTrans.test @@ -111,7 +111,7 @@ test iortrans-1.0 {chan, wrong#args} -returnCodes error -body { } -result {wrong # args: should be "chan subcommand ?arg ...?"} test iortrans-1.1 {chan, unknown method} -returnCodes error -body { chan foo -} -match glob -result {unknown or ambiguous subcommand "foo": must be*} +} -match glob -result {unknown or ambiguous subcommand "foo": should be*} # --- --- --- --------- --------- --------- # chan push, and method "initalize" @@ -181,14 +181,14 @@ test iortrans-2.10 {chan push, initialize failed, bad result, bogus method name} } -returnCodes error -cleanup { tempdone rename foo {} -} -match glob -result {*bad method "1": must be *} +} -match glob -result {*bad method "1": should be *} test iortrans-2.11 {chan push, initialize failed, bad result, bogus method name} -body { proc foo {args} {return {a b c}} chan push [tempchan] foo } -returnCodes error -cleanup { tempdone rename foo {} -} -match glob -result {*bad method "c": must be *} +} -match glob -result {*bad method "c": should be *} test iortrans-2.12 {chan push, initialize failed, bad result, required methods missing} -body { # Required: initialize, and finalize. proc foo {args} {return {initialize}} @@ -203,7 +203,7 @@ test iortrans-2.13 {chan push, initialize failed, bad result, illegal method nam } -returnCodes error -cleanup { tempdone rename foo {} -} -match glob -result {*returned bad method "BOGUS": must be clear, drain, finalize, flush, initialize, limit?, read, or write} +} -match glob -result {*returned bad method "BOGUS": should be clear, drain, finalize, flush, initialize, limit?, read, or write} test iortrans-2.14 {chan push, initialize failed, bad result, mode/handler mismatch} -body { proc foo {args} {return {initialize finalize}} chan push [tempchan] foo diff --git a/tests/lindex.test b/tests/lindex.test index b86e2e0..e38253d 100644 --- a/tests/lindex.test +++ b/tests/lindex.test @@ -47,7 +47,7 @@ test lindex-2.3 {multiple indices in list} testevalex { test lindex-2.4 {malformed index list} testevalex { set x \{ list [catch { testevalex {lindex {a b c} $x} } result] $result -} {1 bad\ index\ \"\{\":\ must\ be\ integer?\[+-\]integer?\ or\ end?\[+-\]integer?} +} {1 bad\ index\ \"\{\":\ should\ be\ integer?\[+-\]integer?\ or\ end?\[+-\]integer?} # Indices that are integers or convertible to integers @@ -113,7 +113,7 @@ test lindex-4.7 {bad octal} -constraints testevalex -body { test lindex-4.8 {bad integer, not octal} testevalex { set x end-0a2 list [catch { testevalex {lindex {a b c} $x} } result] $result -} {1 {bad index "end-0a2": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "end-0a2": should be integer?[+-]integer? or end?[+-]integer?}} test lindex-4.9 {obsolete test} testevalex { set x end list [testevalex {lindex {a b c} $x}] [testevalex {lindex {a b c} $x}] @@ -121,11 +121,11 @@ test lindex-4.9 {obsolete test} testevalex { test lindex-4.10 {incomplete end-} testevalex { set x end- list [catch { testevalex {lindex {a b c} $x} } result] $result -} {1 {bad index "end-": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "end-": should be integer?[+-]integer? or end?[+-]integer?}} test lindex-5.1 {bad second index} testevalex { list [catch { testevalex {lindex {a b c} 0 0a2} } result] $result -} {1 {bad index "0a2": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "0a2": should be integer?[+-]integer? or end?[+-]integer?}} test lindex-5.2 {good second index} testevalex { testevalex {lindex {{a b c} {d e f} {g h i}} 1 2} } f @@ -226,7 +226,7 @@ test lindex-10.3 {multiple indices in list} { test lindex-10.4 {malformed index list} { set x \{ list [catch { lindex {a b c} $x } result] $result -} {1 bad\ index\ \"\{\":\ must\ be\ integer?\[+-\]integer?\ or\ end?\[+-\]integer?} +} {1 bad\ index\ \"\{\":\ should\ be\ integer?\[+-\]integer?\ or\ end?\[+-\]integer?} # Indices that are integers or convertible to integers @@ -315,7 +315,7 @@ test lindex-12.7 {bad octal} -body { test lindex-12.8 {bad integer, not octal} { set x end-0a2 list [catch { lindex {a b c} $x } result] $result -} {1 {bad index "end-0a2": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "end-0a2": should be integer?[+-]integer? or end?[+-]integer?}} test lindex-12.9 {obsolete test} { set x end catch { @@ -326,11 +326,11 @@ test lindex-12.9 {obsolete test} { test lindex-12.10 {incomplete end-} { set x end- list [catch { lindex {a b c} $x } result] $result -} {1 {bad index "end-": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "end-": should be integer?[+-]integer? or end?[+-]integer?}} test lindex-13.1 {bad second index} { list [catch { lindex {a b c} 0 0a2 } result] $result -} {1 {bad index "0a2": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "0a2": should be integer?[+-]integer? or end?[+-]integer?}} test lindex-13.2 {good second index} { catch { lindex {{a b c} {d e f} {g h i}} 1 2 diff --git a/tests/linsert.test b/tests/linsert.test index 4939e5c..4ba6a23 100644 --- a/tests/linsert.test +++ b/tests/linsert.test @@ -85,10 +85,10 @@ test linsert-2.1 {linsert errors} { } {1 {wrong # args: should be "linsert list index ?element ...?"}} test linsert-2.2 {linsert errors} { list [catch {linsert a b} msg] $msg -} {1 {bad index "b": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "b": should be integer?[+-]integer? or end?[+-]integer?}} test linsert-2.3 {linsert errors} { list [catch {linsert a 12x 2} msg] $msg -} {1 {bad index "12x": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "12x": should be integer?[+-]integer? or end?[+-]integer?}} test linsert-2.4 {linsert errors} { list [catch {linsert \{ 12 2} msg] $msg } {1 {unmatched open brace in list}} diff --git a/tests/load.test b/tests/load.test index 9536271..9e93915 100644 --- a/tests/load.test +++ b/tests/load.test @@ -65,7 +65,7 @@ test load-1.6 {basic errors} {} { } {1 {package "Unknown" isn't loaded statically}} test load-1.7 {basic errors} {} { list [catch {load -abc foo} msg] $msg -} "1 {bad option \"-abc\": must be -global, -lazy, or --}" +} "1 {bad option \"-abc\": should be -global, -lazy, or --}" test load-1.8 {basic errors} {} { list [catch {load -global} msg] $msg } "1 {couldn't figure out package name for -global}" diff --git a/tests/lrange.test b/tests/lrange.test index 17a757e..f792f6a 100644 --- a/tests/lrange.test +++ b/tests/lrange.test @@ -74,10 +74,10 @@ test lrange-2.2 {error conditions} { } {1 {wrong # args: should be "lrange list first last"}} test lrange-2.3 {error conditions} { list [catch {lrange a b 6} msg] $msg -} {1 {bad index "b": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "b": should be integer?[+-]integer? or end?[+-]integer?}} test lrange-2.4 {error conditions} { list [catch {lrange a 0 enigma} msg] $msg -} {1 {bad index "enigma": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "enigma": should be integer?[+-]integer? or end?[+-]integer?}} test lrange-2.5 {error conditions} { list [catch {lrange "a \{b c" 3 4} msg] $msg } {1 {unmatched open brace in list}} diff --git a/tests/lrepeat.test b/tests/lrepeat.test index 788bb9b..bfb5ea6 100644 --- a/tests/lrepeat.test +++ b/tests/lrepeat.test @@ -40,7 +40,7 @@ test lrepeat-1.4 {error cases} { lrepeat -3 1 } -returnCodes 1 - -result {bad count "-3": must be integer >= 0} + -result {bad count "-3": should be integer >= 0} } test lrepeat-1.5 {Accept zero repetitions (TIP 323)} { -body { diff --git a/tests/lreplace.test b/tests/lreplace.test index 5f675bc..e4bf881 100644 --- a/tests/lreplace.test +++ b/tests/lreplace.test @@ -108,13 +108,13 @@ test lreplace-2.2 {lreplace errors} { } {1 {wrong # args: should be "lreplace list first last ?element ...?"}} test lreplace-2.3 {lreplace errors} { list [catch {lreplace x a 10} msg] $msg -} {1 {bad index "a": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "a": should be integer?[+-]integer? or end?[+-]integer?}} test lreplace-2.4 {lreplace errors} { list [catch {lreplace x 10 x} msg] $msg -} {1 {bad index "x": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "x": should be integer?[+-]integer? or end?[+-]integer?}} test lreplace-2.5 {lreplace errors} { list [catch {lreplace x 10 1x} msg] $msg -} {1 {bad index "1x": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "1x": should be integer?[+-]integer? or end?[+-]integer?}} test lreplace-2.6 {lreplace errors} { list [catch {lreplace x 3 2} msg] $msg } {1 {list doesn't contain element 3}} diff --git a/tests/lsearch.test b/tests/lsearch.test index f36e987..123daf0 100644 --- a/tests/lsearch.test +++ b/tests/lsearch.test @@ -59,7 +59,7 @@ test lsearch-2.9 {search modes} { } 1 test lsearch-2.10 {search modes} -returnCodes error -body { lsearch -glib {b.x bx xy bcx} b.x -} -result {bad option "-glib": must be -all, -ascii, -bisect, -decreasing, -dictionary, -exact, -glob, -increasing, -index, -inline, -integer, -nocase, -not, -real, -regexp, -sorted, -start, or -subindices} +} -result {bad option "-glib": should be -all, -ascii, -bisect, -decreasing, -dictionary, -exact, -glob, -increasing, -index, -inline, -integer, -nocase, -not, -real, -regexp, -sorted, -start, or -subindices} test lsearch-2.11 {search modes with -nocase} { lsearch -exact -nocase {a b c A B C} A } 0 @@ -87,16 +87,16 @@ test lsearch-3.2 {lsearch errors} -returnCodes error -body { } -result {wrong # args: should be "lsearch ?-option value ...? list pattern"} test lsearch-3.3 {lsearch errors} -returnCodes error -body { lsearch a b c -} -result {bad option "a": must be -all, -ascii, -bisect, -decreasing, -dictionary, -exact, -glob, -increasing, -index, -inline, -integer, -nocase, -not, -real, -regexp, -sorted, -start, or -subindices} +} -result {bad option "a": should be -all, -ascii, -bisect, -decreasing, -dictionary, -exact, -glob, -increasing, -index, -inline, -integer, -nocase, -not, -real, -regexp, -sorted, -start, or -subindices} test lsearch-3.4 {lsearch errors} -returnCodes error -body { lsearch a b c d -} -result {bad option "a": must be -all, -ascii, -bisect, -decreasing, -dictionary, -exact, -glob, -increasing, -index, -inline, -integer, -nocase, -not, -real, -regexp, -sorted, -start, or -subindices} +} -result {bad option "a": should be -all, -ascii, -bisect, -decreasing, -dictionary, -exact, -glob, -increasing, -index, -inline, -integer, -nocase, -not, -real, -regexp, -sorted, -start, or -subindices} test lsearch-3.5 {lsearch errors} -returnCodes error -body { lsearch "\{" b } -result {unmatched open brace in list} test lsearch-3.6 {lsearch errors} -returnCodes error -body { lsearch -index a b -} -result {"-index" option must be followed by list index} +} -result {"-index" option should be followed by list index} test lsearch-3.7 {lsearch errors} -returnCodes error -body { lsearch -subindices -exact a b } -result {-subindices cannot be used without -index option} @@ -300,7 +300,7 @@ test lsearch-10.3 {offset searching} { } 3 test lsearch-10.4 {offset searching} -returnCodes error -body { lsearch -start foobar {a b c a b c} a -} -result {bad index "foobar": must be integer?[+-]integer? or end?[+-]integer?} +} -result {bad index "foobar": should be integer?[+-]integer? or end?[+-]integer?} test lsearch-10.5 {offset searching} -returnCodes error -body { lsearch -start 1 2 } -result {missing starting index} @@ -456,7 +456,7 @@ test lsearch-20.1 {lsearch -index option, index larger than sublists} -body { } -returnCodes error -result {element 2 missing from sublist "a c"} test lsearch-20.2 {lsearch -index option, malformed index} -body { lsearch -index foo {{a c} {a b} {a a}} a -} -returnCodes error -result {bad index "foo": must be integer?[+-]integer? or end?[+-]integer?} +} -returnCodes error -result {bad index "foo": should be integer?[+-]integer? or end?[+-]integer?} test lsearch-20.3 {lsearch -index option, malformed index} -body { lsearch -index \{ {{a c} {a b} {a a}} a } -returnCodes error -result {unmatched open brace in list} diff --git a/tests/lset.test b/tests/lset.test index 1c1300b..36d3379 100644 --- a/tests/lset.test +++ b/tests/lset.test @@ -49,7 +49,7 @@ test lset-2.2 {lset, not compiled, 3 args, second arg neither index nor list} te list [catch { testevalex {lset x {{bad}1} 3} } msg] $msg -} {1 {bad index "{bad}1": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "{bad}1": should be integer?[+-]integer? or end?[+-]integer?}} test lset-3.1 {lset, not compiled, 3 args, data duplicated} testevalex { set x {0 1 2} @@ -91,7 +91,7 @@ test lset-4.2 {lset, not compiled, 3 args, bad index} testevalex { list [catch { testevalex {lset a [list 2a2] w} } msg] $msg -} {1 {bad index "2a2": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "2a2": should be integer?[+-]integer? or end?[+-]integer?}} test lset-4.3 {lset, not compiled, 3 args, index out of range} testevalex { set a {x y z} list [catch { @@ -133,7 +133,7 @@ test lset-4.8 {lset, not compiled, 3 args, bad index} testevalex { list [catch { testevalex {lset a 2a2 w} } msg] $msg -} {1 {bad index "2a2": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "2a2": should be integer?[+-]integer? or end?[+-]integer?}} test lset-4.9 {lset, not compiled, 3 args, index out of range} testevalex { set a {x y z} list [catch { @@ -273,11 +273,11 @@ test lset-8.2 {lset, not compiled, malformed sublist} testevalex { test lset-8.3 {lset, not compiled, bad second index} testevalex { set a {{b c} {d e}} list [catch {testevalex {lset a 0 2a2 f}} msg] $msg -} {1 {bad index "2a2": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "2a2": should be integer?[+-]integer? or end?[+-]integer?}} test lset-8.4 {lset, not compiled, bad second index} testevalex { set a {{b c} {d e}} list [catch {testevalex {lset a {0 2a2} f}} msg] $msg -} {1 {bad index "2a2": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "2a2": should be integer?[+-]integer? or end?[+-]integer?}} test lset-8.5 {lset, not compiled, second index out of range} testevalex { set a {{b c} {d e} {f g}} list [catch {testevalex {lset a 2 -1 h}} msg] $msg diff --git a/tests/namespace.test b/tests/namespace.test index cded1f4..a65afb5 100644 --- a/tests/namespace.test +++ b/tests/namespace.test @@ -908,7 +908,7 @@ test namespace-20.1 {Tcl_NamespaceObjCmd, bad subcommand} { } {1 {wrong # args: should be "namespace subcommand ?arg ...?"}} test namespace-20.2 {Tcl_NamespaceObjCmd, bad subcommand} -body { namespace wombat {} -} -returnCodes error -match glob -result {unknown or ambiguous subcommand "wombat": must be *} +} -returnCodes error -match glob -result {unknown or ambiguous subcommand "wombat": should be *} test namespace-20.3 {Tcl_NamespaceObjCmd, abbreviations are okay} { namespace ch :: test_ns_* } {} @@ -1025,7 +1025,7 @@ test namespace-25.1 {NamespaceEvalCmd, bad args} { } {1 {wrong # args: should be "namespace eval name arg ?arg...?"}} test namespace-25.2 {NamespaceEvalCmd, bad args} -body { namespace test_ns_1 -} -returnCodes error -match glob -result {unknown or ambiguous subcommand "test_ns_1": must be *} +} -returnCodes error -match glob -result {unknown or ambiguous subcommand "test_ns_1": should be *} catch {unset v} test namespace-25.3 {NamespaceEvalCmd, new namespace} { set v 123 @@ -1530,7 +1530,7 @@ test namespace-42.3 {ensembles: basic} { lappend result [info command ns::x1] namespace delete ns lappend result [info command ns::x1] -} {1 2 1 {unknown or ambiguous subcommand "x": must be x1, or x2} ::ns::x1 {}} +} {1 2 1 {unknown or ambiguous subcommand "x": should be x1, or x2} ::ns::x1 {}} test namespace-42.4 {ensembles: basic} -body { namespace eval ns { namespace export y* @@ -1553,7 +1553,7 @@ test namespace-42.5 {ensembles: basic} -body { list [catch {ns x} msg] $msg } -cleanup { namespace delete ns -} -result {1 {unknown or ambiguous subcommand "x": must be x1, x2, or x3}} +} -result {1 {unknown or ambiguous subcommand "x": should be x1, x2, or x3}} test namespace-42.6 {ensembles: nested} -body { namespace eval ns { namespace export x* @@ -1613,7 +1613,7 @@ test namespace-43.1 {ensembles: dict-driven} { set result [list [catch {ns c} msg] $msg [namespace ensemble exists ns]] rename ns {} lappend result [namespace ensemble exists ns] -} {1 {unknown or ambiguous subcommand "c": must be a, or b} 1 0} +} {1 {unknown or ambiguous subcommand "c": should be a, or b} 1 0} test namespace-43.2 {ensembles: dict-driven} -body { namespace eval ns { namespace export x* @@ -1642,7 +1642,7 @@ test namespace-43.3 {ensembles: list-driven} -setup $SETUP -body { } -result {} test namespace-43.4 {ensembles: list-driven} -setup $SETUP -body { ns a foo bar boo spong wibble -} -cleanup {namespace delete ns} -returnCodes error -result {unknown or ambiguous subcommand "a": must be b, or c} +} -cleanup {namespace delete ns} -returnCodes error -result {unknown or ambiguous subcommand "a": should be b, or c} test namespace-43.5 {ensembles: list-driven} -setup $SETUP -body { ns b foo bar boo spong wibble } -cleanup {namespace delete ns} -result 2,5 @@ -1651,7 +1651,7 @@ test namespace-43.6 {ensembles: list-driven} -setup $SETUP -body { } -cleanup {namespace delete ns} -result 3,5 test namespace-43.7 {ensembles: list-driven} -setup $SETUP -body { ns d foo bar boo spong wibble -} -cleanup {namespace delete ns} -returnCodes error -result {unknown or ambiguous subcommand "d": must be b, or c} +} -cleanup {namespace delete ns} -returnCodes error -result {unknown or ambiguous subcommand "d": should be b, or c} set SETUP { namespace eval ns { namespace export a b @@ -1667,7 +1667,7 @@ test namespace-43.8 {ensembles: list-and-map-driven} -setup $SETUP -body { } -result {} test namespace-43.9 {ensembles: list-and-map-driven} -setup $SETUP -body { ns a foo bar boo spong wibble -} -cleanup {namespace delete ns} -returnCodes error -result {unknown or ambiguous subcommand "a": must be b, or c} +} -cleanup {namespace delete ns} -returnCodes error -result {unknown or ambiguous subcommand "a": should be b, or c} test namespace-43.10 {ensembles: list-and-map-driven} -setup $SETUP -body { ns b foo bar boo spong wibble } -cleanup {namespace delete ns} -result 2,5 @@ -1676,7 +1676,7 @@ test namespace-43.11 {ensembles: list-and-map-driven} -setup $SETUP -body { } -cleanup {namespace delete ns} -result 4,5 test namespace-43.12 {ensembles: list-and-map-driven} -setup $SETUP -body { ns d foo bar boo spong wibble -} -cleanup {namespace delete ns} -returnCodes error -result {unknown or ambiguous subcommand "d": must be b, or c} +} -cleanup {namespace delete ns} -returnCodes error -result {unknown or ambiguous subcommand "d": should be b, or c} set SETUP { namespace eval ns { namespace export * @@ -1690,13 +1690,13 @@ test namespace-43.13 {ensembles: turn off prefixes} -setup $SETUP -body { } -result {} test namespace-43.14 {ensembles: turn off prefixes} -setup $SETUP -body { ns fo -} -cleanup {namespace delete ns} -returnCodes error -result {unknown subcommand "fo": must be foo, or spong} +} -cleanup {namespace delete ns} -returnCodes error -result {unknown subcommand "fo": should be foo, or spong} test namespace-43.15 {ensembles: turn off prefixes} -setup $SETUP -body { ns foo } -cleanup {namespace delete ns} -result bar test namespace-43.16 {ensembles: turn off prefixes} -setup $SETUP -body { ns s -} -cleanup {namespace delete ns} -returnCodes error -result {unknown subcommand "s": must be foo, or spong} +} -cleanup {namespace delete ns} -returnCodes error -result {unknown subcommand "s": should be foo, or spong} test namespace-43.17 {ensembles: turn off prefixes} -setup $SETUP -body { ns spong } -cleanup {namespace delete ns} -result wibble @@ -1706,7 +1706,7 @@ test namespace-44.1 {ensemble: errors} { } {1 {wrong # args: should be "namespace ensemble subcommand ?arg ...?"}} test namespace-44.2 {ensemble: errors} { list [catch {namespace ensemble ?} msg] $msg -} {1 {bad subcommand "?": must be configure, create, or exists}} +} {1 {bad subcommand "?": should be configure, create, or exists}} test namespace-44.3 {ensemble: errors} { namespace eval ns { list [catch {namespace ensemble create -map x} msg] $msg @@ -1716,7 +1716,7 @@ test namespace-44.4 {ensemble: errors} { namespace eval ns { list [catch {namespace ensemble create -map {x {}}} msg] $msg } -} {1 {ensemble subcommand implementations must be non-empty lists}} +} {1 {ensemble subcommand implementations should be non-empty lists}} test namespace-44.5 {ensemble: errors} -setup { namespace ensemble create -command foobar -subcommands {foobarcget foobarconfigure} } -body { @@ -1780,7 +1780,7 @@ test namespace-46.2 {ensemble: ensembles really use current export list} { catch {ns ?} msg; lappend result $msg namespace delete ns set result -} {{unknown or ambiguous subcommand "?": must be x1} {unknown or ambiguous subcommand "?": must be x1, or x2} {unknown or ambiguous subcommand "?": must be x2}} +} {{unknown or ambiguous subcommand "?": should be x1} {unknown or ambiguous subcommand "?": should be x1, or x2} {unknown or ambiguous subcommand "?": should be x2}} test namespace-46.3 {ensemble: implementation errors} { namespace eval ns { variable count 0 @@ -1857,7 +1857,7 @@ test namespace-46.9 {ensemble: configuring really configures things} { lappend result [catch {ns x} msg] $msg namespace delete ns set result -} {1 {unknown subcommand "x": must be a} 1 {unknown subcommand "x": must be b}} +} {1 {unknown subcommand "x": should be a} 1 {unknown subcommand "x": should be b}} test namespace-47.1 {ensemble: unknown handler} { set log {} @@ -1920,7 +1920,7 @@ test namespace-47.3 {ensemble: unknown handler} { namespace ensemble create -unknown ::ns::Magic } list [catch {ns spong} msg] $msg $ns::count [namespace delete ns] -} {1 {unknown or ambiguous subcommand "spong": must be a, b, or c} 1 {}} +} {1 {unknown or ambiguous subcommand "spong": should be a, b, or c} 1 {}} test namespace-47.4 {ensemble: unknown handler} { namespace eval ns { namespace export {[a-z]*} @@ -2762,7 +2762,7 @@ test namespace-53.3 {ensembles: parameters} -setup { } -result\ {{1 x2} {2 x1}\ 1 {wrong # args: should be "ns param1 subcommand ?arg ...?"}\ - 1 {unknown or ambiguous subcommand "x": must be x1, or x2}\ + 1 {unknown or ambiguous subcommand "x": should be x1, or x2}\ ::ns::x1 {}} test namespace-53.4 {ensembles: parameters} -setup { namespace eval ns { @@ -2799,9 +2799,9 @@ test namespace-53.5 {ensembles: parameters} -setup { } -cleanup { namespace delete ns } -result\ - {1 {unknown or ambiguous subcommand "x": must be x1, x2, or x3}\ + {1 {unknown or ambiguous subcommand "x": should be x1, x2, or x3}\ 0 {1 x}\ - 1 {unknown or ambiguous subcommand "x": must be x1, x2, or x3}\ + 1 {unknown or ambiguous subcommand "x": should be x1, x2, or x3}\ 0 {1 x}} test namespace-53.6 {ensembles: nested} -setup { namespace eval ns { @@ -2867,7 +2867,7 @@ test namespace-53.8 {ensemble: unknown handler changing -parameters} -setup { } -result\ {0 {1 x2} {}\ 0 {1 x2} p1\ - 1 {unknown or ambiguous subcommand "x2": must be x1} {}} + 1 {unknown or ambiguous subcommand "x2": should be x1} {}} test namespace-53.9 {ensemble: unknown handler changing -parameters,\ thereby eating all args} -setup { namespace eval ns { diff --git a/tests/obj.test b/tests/obj.test index 151abfb..6dccc4d 100644 --- a/tests/obj.test +++ b/tests/obj.test @@ -57,10 +57,10 @@ test obj-3.1 {Tcl_ConvertToType error} testobj { list [testdoubleobj set 1 12.34] \ [catch {testobj convert 1 end-offset} msg] \ $msg -} {12.34 1 {bad index "12.34": must be end?[+-]integer?}} +} {12.34 1 {bad index "12.34": should be end?[+-]integer?}} test obj-3.2 {Tcl_ConvertToType error, "empty string" object} testobj { list [testobj newobj 1] [catch {testobj convert 1 end-offset} msg] $msg -} {{} 1 {bad index "": must be end?[+-]integer?}} +} {{} 1 {bad index "": should be end?[+-]integer?}} test obj-4.1 {Tcl_NewObj and AllocateFreeObjects} testobj { set result "" diff --git a/tests/oo.test b/tests/oo.test index d63e931..5042ded 100644 --- a/tests/oo.test +++ b/tests/oo.test @@ -130,7 +130,7 @@ test oo-1.4 {basic test of OO functionality} -body { } -returnCodes 1 -result {object name must not be empty} test oo-1.5 {basic test of OO functionality} -body { oo::object doesnotexist -} -returnCodes 1 -result {unknown method "doesnotexist": must be create, destroy or new} +} -returnCodes 1 -result {unknown method "doesnotexist": should be create, destroy or new} test oo-1.5.1 {basic test of OO functionality} -setup { oo::object create aninstance } -returnCodes error -body { @@ -581,7 +581,7 @@ test oo-4.1 {basic test of OO functionality: export} { lappend result [catch {$o Foo} msg] $msg oo::objdefine $o export Foo lappend result [$o Foo] [$o destroy] -} {1 {unknown method "Foo": must be destroy} Foo {} {}} +} {1 {unknown method "Foo": should be destroy} Foo {} {}} test oo-4.2 {basic test of OO functionality: unexport} { set o [oo::object new] set result {} @@ -589,7 +589,7 @@ test oo-4.2 {basic test of OO functionality: unexport} { lappend result [$o foo] oo::objdefine $o unexport foo lappend result [catch {$o foo} msg] $msg [$o destroy] -} {foo {} 1 {unknown method "foo": must be destroy} {}} +} {foo {} 1 {unknown method "foo": should be destroy} {}} test oo-4.3 {exporting and error messages, Bug 1824958} -setup { oo::class create testClass } -cleanup { @@ -597,7 +597,7 @@ test oo-4.3 {exporting and error messages, Bug 1824958} -setup { } -body { oo::define testClass self export Bad testClass Bad -} -returnCodes 1 -result {unknown method "Bad": must be create, destroy or new} +} -returnCodes 1 -result {unknown method "Bad": should be create, destroy or new} test oo-4.4 {exporting a class method from an object} -setup { oo::class create testClass testClass create testObject @@ -640,7 +640,7 @@ test oo-5.1 {OO: manipulation of classes as objects} -setup { } -cleanup { oo::objdefine oo::object deletemethod foo $obj destroy -} -result {1 {unknown method "foo": must be destroy} {in object}} +} -result {1 {unknown method "foo": should be destroy} {in object}} test oo-5.2 {OO: manipulation of classes as objects} -setup { set obj [oo::object new] } -body { @@ -650,7 +650,7 @@ test oo-5.2 {OO: manipulation of classes as objects} -setup { } -cleanup { oo::objdefine oo::object deletemethod foo $obj destroy -} -result {1 {unknown method "foo": must be destroy} {in object}} +} -result {1 {unknown method "foo": should be destroy} {in object}} test oo-5.3 {OO: manipulation of classes as objects} -setup { set obj [oo::object new] } -body { @@ -662,7 +662,7 @@ test oo-5.3 {OO: manipulation of classes as objects} -setup { } -cleanup { oo::objdefine oo::object deletemethod foo $obj destroy -} -result {1 {unknown method "foo": must be destroy} {in object}} +} -result {1 {unknown method "foo": should be destroy} {in object}} test oo-5.4 {OO: manipulation of classes as objects} -setup { set obj [oo::object new] } -body { @@ -674,7 +674,7 @@ test oo-5.4 {OO: manipulation of classes as objects} -setup { } -cleanup { oo::objdefine oo::object deletemethod foo $obj destroy -} -result {1 {unknown method "foo": must be destroy} {in object}} +} -result {1 {unknown method "foo": should be destroy} {in object}} test oo-5.5 {OO: manipulation of classes as objects} -setup { set obj [oo::object new] } -body { @@ -688,7 +688,7 @@ test oo-5.5 {OO: manipulation of classes as objects} -setup { } -cleanup { oo::objdefine oo::object deletemethod foo $obj destroy -} -result {1 {unknown method "foo": must be destroy} {in object}} +} -result {1 {unknown method "foo": should be destroy} {in object}} test oo-6.1 {OO: forward} { oo::object create foo @@ -1013,7 +1013,7 @@ test oo-7.1 {OO: inheritance 101} -setup { } -cleanup { subClass destroy superClass destroy -} -result {1 {unknown method "doit": must be create, destroy or new} ok} +} -result {1 {unknown method "doit": should be create, destroy or new} ok} test oo-7.2 {OO: inheritance 101} -setup { oo::class create superClass oo::class create subClass @@ -1082,7 +1082,7 @@ test oo-7.4 {OO: inheritance from oo::class} -body { } -cleanup { catch {classinstance destroy} catch {meta destroy} -} -result {1 {unknown method "create": must be destroy or make} {made ::classinstance} {in definition script in ::oo::define} ::classinstance ::instance} +} -result {1 {unknown method "create": should be destroy or make} {made ::classinstance} {in definition script in ::oo::define} ::classinstance ::instance} test oo-7.5 {OO: inheritance from oo::class in the secondary chain} -body { oo::class create other oo::class create meta { @@ -1110,7 +1110,7 @@ test oo-7.5 {OO: inheritance from oo::class in the secondary chain} -body { catch {classinstance destroy} catch {meta destroy} catch {other destroy} -} -result {1 {unknown method "create": must be destroy or make} {made ::classinstance} {in definition script in ::oo::define} ::classinstance ::instance} +} -result {1 {unknown method "create": should be destroy or make} {made ::classinstance} {in definition script in ::oo::define} ::classinstance ::instance} test oo-7.6 {OO: inheritance 101 - overridden methods should be oblivious} -setup { oo::class create Aclass oo::class create Bclass @@ -1158,7 +1158,7 @@ test oo-7.7 {OO: inheritance and errorInfo} -setup { lappend result $msg $errorInfo } -cleanup { A destroy -} -result {{unknown method "?": must be destroy or foo} foo! {foo! +} -result {{unknown method "?": should be destroy or foo} foo! {foo! while executing "error foo!" (class "::A" method "foo" line 1) @@ -1561,7 +1561,7 @@ test oo-14.1 {OO: mixins} { fooTest2 boo oo::objdefine fooTest2 mixin lappend result [Bclass destroy] [info command fooTest*] [Aclass destroy] -} {1 {unknown method "?": must be bar, boo or destroy} {::fooTest in bar} {::fooTest in boo} {::fooTest2 in bar} {::fooTest2 in boo} {} fooTest2 {}} +} {1 {unknown method "?": should be bar, boo or destroy} {::fooTest in bar} {::fooTest in boo} {::fooTest2 in bar} {::fooTest2 in boo} {} fooTest2 {}} test oo-14.2 {OO: mixins} { oo::class create Aclass { method bar {} {return "[self object] in bar"} @@ -1575,7 +1575,7 @@ test oo-14.2 {OO: mixins} { lappend result [catch {fooTest bar} msg] $msg lappend result [catch {fooTest boo} msg] $msg lappend result [Bclass destroy] [info commands Aclass] -} {1 {unknown method "?": must be bar, boo or destroy} 0 {::fooTest in bar} 0 {::fooTest in boo} {} {}} +} {1 {unknown method "?": should be bar, boo or destroy} 0 {::fooTest in bar} 0 {::fooTest in boo} {} {}} test oo-14.3 {OO and mixins and filters - advanced case} -setup { oo::class create mix oo::class create c { @@ -1878,7 +1878,7 @@ test oo-16.2 {OO: object introspection} -body { } -returnCodes 1 -result {NOTANOBJECT does not refer to an object} test oo-16.3 {OO: object introspection} -body { info object gorp oo::object -} -returnCodes 1 -result {unknown or ambiguous subcommand "gorp": must be call, class, definition, filters, forward, isa, methods, methodtype, mixins, namespace, variables, or vars} +} -returnCodes 1 -result {unknown or ambiguous subcommand "gorp": should be call, class, definition, filters, forward, isa, methods, methodtype, mixins, namespace, variables, or vars} test oo-16.4 {OO: object introspection} -setup { oo::class create meta { superclass oo::class } [meta create instance1] create instance2 @@ -2000,7 +2000,7 @@ test oo-17.3 {OO: class introspection} -setup { } -result {"foo" is not a class} test oo-17.4 {OO: class introspection} -body { info class gorp oo::object -} -returnCodes 1 -result {unknown or ambiguous subcommand "gorp": must be call, constructor, definition, destructor, filters, forward, instances, methods, methodtype, mixins, subclasses, superclasses, or variables} +} -returnCodes 1 -result {unknown or ambiguous subcommand "gorp": should be call, constructor, definition, destructor, filters, forward, instances, methods, methodtype, mixins, subclasses, superclasses, or variables} test oo-17.5 {OO: class introspection} -setup { oo::class create testClass } -body { @@ -2759,7 +2759,7 @@ test oo-24.1 {unknown method method - Bug 1965063} -setup { method unknown args {next {*}$args} } [cls new] foo bar -} -result {unknown method "foo": must be destroy, dummy or unknown} +} -result {unknown method "foo": should be destroy, dummy or unknown} test oo-24.2 {unknown method method - Bug 1965063} -setup { oo::class create cls } -cleanup { @@ -2775,7 +2775,7 @@ test oo-24.2 {unknown method method - Bug 1965063} -setup { method unknown args {next {*}$args} } obj foo bar -} -result {unknown method "foo": must be destroy, dummy, dummy2 or unknown} +} -result {unknown method "foo": should be destroy, dummy, dummy2 or unknown} test oo-24.3 {unknown method method - absent method name} -setup { set o [oo::object new] } -cleanup { @@ -3157,7 +3157,7 @@ test oo-27.18 {variables declaration - multiple use} -setup { } foo create bar list [bar boo] [bar boo] -} -returnCodes error -match glob -result {unknown method "-?": must be *} +} -returnCodes error -match glob -result {unknown method "-?": should be *} test oo-27.19 {variables declaration and [info vars]: Bug 2712377} -setup { oo::class create Foo set result {} @@ -3416,7 +3416,7 @@ test oo-33.4 {TIP 380: slots - errors} -setup { $s -grill q } -returnCodes error -cleanup { rename $s {} -} -result {unknown method "-grill": must be -append, -clear, -set, contents or ops} +} -result {unknown method "-grill": should be -append, -clear, -set, contents or ops} SampleSlot destroy diff --git a/tests/package.test b/tests/package.test index da778f1..5ae638c 100644 --- a/tests/package.test +++ b/tests/package.test @@ -45,7 +45,7 @@ test package-1.5 {pkg::create gives error on no version given} -body { } -returnCodes error -match glob -result {value for "-version" missing: *} test package-1.6 {pkg::create gives error on no source or load options} -body { ::pkg::create -name foo -version 1.0 -version 2.0 -} -returnCodes error -result {at least one of -load and -source must be given} +} -returnCodes error -result {at least one of -load and -source should be given} test package-1.7 {pkg::create gives correct output for 1 direct source} { ::pkg::create -name foo -version 1.0 -source test.tcl } {package ifneeded foo 1.0 [list source [file join $dir test.tcl]]} @@ -826,7 +826,7 @@ test package-4.52 {Tcl_PackageCmd procedure, "vsatisfies" option} { } {0} test package-4.53 {Tcl_PackageCmd procedure, "versions" option} -body { package foo -} -returnCodes error -result {bad option "foo": must be forget, ifneeded, names, prefer, present, provide, require, unknown, vcompare, versions, or vsatisfies} +} -returnCodes error -result {bad option "foo": should be forget, ifneeded, names, prefer, present, provide, require, unknown, vcompare, versions, or vsatisfies} test package-4.54 {Tcl_PackageCmd procedure, "vsatisfies" option} -body { package vsatisfies 2.1 2.1-3.2-4.5 } -returnCodes error -result {expected versionMin-versionMax but got "2.1-3.2-4.5"} @@ -1248,7 +1248,7 @@ test package-14.0 {wrong\#args} -returnCodes error -body { } -result {wrong # args: should be "package prefer ?latest|stable?"} test package-14.1 {bogus argument} -returnCodes error -body { package prefer foo -} -result {bad preference "foo": must be latest or stable} +} -result {bad preference "foo": should be latest or stable} test package-15.0 {set, keep} {package prefer stable} stable test package-15.1 {set stable, keep} {prefer stable} {stable stable} diff --git a/tests/proc-old.test b/tests/proc-old.test index e45cf5c..41a9282 100644 --- a/tests/proc-old.test +++ b/tests/proc-old.test @@ -408,10 +408,10 @@ test proc-old-7.6 {return with special completion code} { } {-14 abc} test proc-old-7.7 {return with special completion code} -body { tproc err -} -returnCodes error -match glob -result {bad completion code "err": must be ok, error, return, break, continue*, or an integer} +} -returnCodes error -match glob -result {bad completion code "err": should be ok, error, return, break, continue*, or an integer} test proc-old-7.8 {return with special completion code} -body { tproc 10b -} -returnCodes error -match glob -result {bad completion code "10b": must be ok, error, return, break, continue*, or an integer} +} -returnCodes error -match glob -result {bad completion code "10b": should be ok, error, return, break, continue*, or an integer} test proc-old-7.9 {return with special completion code} { proc tproc2 {} { tproc return diff --git a/tests/regexp.test b/tests/regexp.test index a83c99b..1f6db61 100644 --- a/tests/regexp.test +++ b/tests/regexp.test @@ -247,7 +247,7 @@ test regexp-6.2 {regexp errors} { } {1 {wrong # args: should be "regexp ?-option ...? exp string ?matchVar? ?subMatchVar ...?"}} test regexp-6.3 {regexp errors} { list [catch {regexp -gorp a} msg] $msg -} {1 {bad option "-gorp": must be -all, -about, -indices, -inline, -expanded, -line, -linestop, -lineanchor, -nocase, -start, or --}} +} {1 {bad option "-gorp": should be -all, -about, -indices, -inline, -expanded, -line, -linestop, -lineanchor, -nocase, -start, or --}} test regexp-6.4 {regexp errors} { list [catch {regexp a( b} msg] $msg } {1 {couldn't compile regular expression pattern: parentheses () not balanced}} @@ -268,7 +268,7 @@ test regexp-6.8 {regexp errors} -setup { } -returnCodes error -result {can't set "f1(f2)": variable isn't array} test regexp-6.9 {regexp errors, -start bad int check} { list [catch {regexp -start bogus {^$} {}} msg] $msg -} {1 {bad index "bogus": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "bogus": should be integer?[+-]integer? or end?[+-]integer?}} test regexp-6.10 {regexp errors} { list [catch {regexp {a[} b} msg] $msg } {1 {couldn't compile regular expression pattern: brackets [] not balanced}} @@ -453,7 +453,7 @@ test regexp-11.4 {regsub errors} { } {1 {wrong # args: should be "regsub ?-option ...? exp string subSpec ?varName?"}} test regexp-11.5 {regsub errors} { list [catch {regsub -gorp a b c} msg] $msg -} {1 {bad option "-gorp": must be -all, -nocase, -expanded, -line, -linestop, -lineanchor, -start, or --}} +} {1 {bad option "-gorp": should be -all, -nocase, -expanded, -line, -linestop, -lineanchor, -start, or --}} test regexp-11.6 {regsub errors} { list [catch {regsub -nocase a( b c d} msg] $msg } {1 {couldn't compile regular expression pattern: parentheses () not balanced}} @@ -465,7 +465,7 @@ test regexp-11.7 {regsub errors} -setup { } -returnCodes error -result {can't set "f1(f2)": variable isn't array} test regexp-11.8 {regsub errors, -start bad int check} { list [catch {regsub -start bogus pattern string rep var} msg] $msg -} {1 {bad index "bogus": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "bogus": should be integer?[+-]integer? or end?[+-]integer?}} test regexp-11.9 {regsub without final variable name returns value} { regsub b abaca X } {aXaca} diff --git a/tests/regexpComp.test b/tests/regexpComp.test index 7be1195..60fad6d 100644 --- a/tests/regexpComp.test +++ b/tests/regexpComp.test @@ -326,7 +326,7 @@ test regexpComp-6.3 {regexp errors} { evalInProc { list [catch {regexp -gorp a} msg] $msg } -} {1 {bad option "-gorp": must be -all, -about, -indices, -inline, -expanded, -line, -linestop, -lineanchor, -nocase, -start, or --}} +} {1 {bad option "-gorp": should be -all, -about, -indices, -inline, -expanded, -line, -linestop, -lineanchor, -nocase, -start, or --}} test regexpComp-6.4 {regexp errors} { evalInProc { list [catch {regexp a( b} msg] $msg @@ -358,7 +358,7 @@ test regexpComp-6.9 {regexp errors, -start bad int check} { evalInProc { list [catch {regexp -start bogus {^$} {}} msg] $msg } -} {1 {bad index "bogus": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "bogus": should be integer?[+-]integer? or end?[+-]integer?}} test regexpComp-7.1 {basic regsub operation} { evalInProc { @@ -582,7 +582,7 @@ test regexpComp-11.5 {regsub errors} { evalInProc { list [catch {regsub -gorp a b c} msg] $msg } -} {1 {bad option "-gorp": must be -all, -nocase, -expanded, -line, -linestop, -lineanchor, -start, or --}} +} {1 {bad option "-gorp": should be -all, -nocase, -expanded, -line, -linestop, -lineanchor, -start, or --}} test regexpComp-11.6 {regsub errors} { evalInProc { list [catch {regsub -nocase a( b c d} msg] $msg @@ -599,7 +599,7 @@ test regexpComp-11.8 {regsub errors, -start bad int check} { evalInProc { list [catch {regsub -start bogus pattern string rep var} msg] $msg } -} {1 {bad index "bogus": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "bogus": should be integer?[+-]integer? or end?[+-]integer?}} # This test crashes on the Mac unless you increase the Stack Space to about 1 # Meg. This is probably bigger than most users want... diff --git a/tests/registry.test b/tests/registry.test index 77588e3..ab29cf0 100644 --- a/tests/registry.test +++ b/tests/registry.test @@ -45,10 +45,10 @@ test registry-1.1b {argument parsing for registry command} {win reg} { } {1 {wrong # args: should be "registry ?-32bit|-64bit? option ?arg ...?"}} test registry-1.2 {argument parsing for registry command} {win reg} { list [catch {registry foo} msg] $msg -} {1 {bad option "foo": must be broadcast, delete, get, keys, set, type, or values}} +} {1 {bad option "foo": should be broadcast, delete, get, keys, set, type, or values}} test registry-1.2a {argument parsing for registry command} {win reg} { list [catch {registry -33bit foo} msg] $msg -} {1 {bad mode "-33bit": must be -32bit or -64bit}} +} {1 {bad mode "-33bit": should be -32bit or -64bit}} test registry-1.3 {argument parsing for registry command} {win reg} { list [catch {registry d} msg] $msg @@ -157,7 +157,7 @@ test registry-1.23 {argument parsing for registry command} {win reg} { test registry-2.1 {DeleteKey: bad key} {win reg} { list [catch {registry delete foo} msg] $msg -} {1 {bad root name "foo": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA}} +} {1 {bad root name "foo": should be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA}} test registry-2.2 {DeleteKey: bad key} {win reg} { list [catch {registry delete HKEY_CLASSES_ROOT} msg] $msg } {1 {bad key: cannot delete root keys}} @@ -600,19 +600,19 @@ test registry-9.2 {ParseKeyName: bad keys} -constraints {win reg} -body { } -returnCodes error -result {bad key "\foobar": must start with a valid root} test registry-9.3 {ParseKeyName: bad keys} -constraints {win reg} -body { registry values \\\\ -} -returnCodes error -result {bad root name "": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA} +} -returnCodes error -result {bad root name "": should be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA} test registry-9.4 {ParseKeyName: bad keys} -constraints {win reg} -body { registry values \\\\\\ -} -returnCodes error -result {bad root name "": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA} +} -returnCodes error -result {bad root name "": should be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA} test registry-9.5 {ParseKeyName: bad keys} -constraints {win reg english nt} -body { registry values \\\\\\HKEY_CLASSES_ROOT } -returnCodes error -result {unable to open key: The network address is invalid.} test registry-9.6 {ParseKeyName: bad keys} -constraints {win reg} -body { registry values \\\\gaspode -} -returnCodes error -result {bad root name "": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA} +} -returnCodes error -result {bad root name "": should be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA} test registry-9.7 {ParseKeyName: bad keys} -constraints {win reg} -body { registry values foobar -} -returnCodes error -result {bad root name "foobar": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA} +} -returnCodes error -result {bad root name "foobar": should be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA} test registry-9.8 {ParseKeyName: null keys} -constraints {win reg} -body { registry delete HKEY_CLASSES_ROOT\\ } -returnCodes error -result {bad key: cannot delete root keys} diff --git a/tests/safe.test b/tests/safe.test index 859f352..27b231e 100644 --- a/tests/safe.test +++ b/tests/safe.test @@ -483,7 +483,7 @@ test safe-11.1a {testing safe encoding} -setup { interp eval $i encoding foobar } -returnCodes error -cleanup { safe::interpDelete $i -} -match glob -result {bad option "foobar": must be *} +} -match glob -result {bad option "foobar": should be *} test safe-11.2 {testing safe encoding} -setup { set i [safe::interpCreate] } -body { diff --git a/tests/set-old.test b/tests/set-old.test index 4c25ec5..4953399 100644 --- a/tests/set-old.test +++ b/tests/set-old.test @@ -335,7 +335,7 @@ test set-old-8.6 {array command} { catch {unset a} set a(22) 3 list [catch {array gorp a} msg] $msg -} {1 {unknown or ambiguous subcommand "gorp": must be anymore, donesearch, exists, get, names, nextelement, set, size, startsearch, statistics, or unset}} +} {1 {unknown or ambiguous subcommand "gorp": should be anymore, donesearch, exists, get, names, nextelement, set, size, startsearch, statistics, or unset}} test set-old-8.7 {array command, anymore option} { catch {unset a} list [catch {array anymore a x} msg] $msg @@ -427,7 +427,7 @@ test set-old-8.22 {array command, names option} { catch {unset a} set a(22) 3 list [catch {array names a 4 5} msg] $msg -} {1 {bad option "4": must be -exact, -glob, or -regexp}} +} {1 {bad option "4": should be -exact, -glob, or -regexp}} test set-old-8.23 {array command, names option} { catch {unset a} array names a diff --git a/tests/socket.test b/tests/socket.test index 2bd2731..2e52ee7 100644 --- a/tests/socket.test +++ b/tests/socket.test @@ -283,7 +283,7 @@ test socket_$af-1.7 {arg parsing for socket command} -constraints [list socket s } -returnCodes error -result {wrong # args: should be "socket ?-myaddr addr? ?-myport myport? ?-async? host port" or "socket -server command ?-myaddr addr? port"} test socket_$af-1.8 {arg parsing for socket command} -constraints [list socket supported_$af] -body { socket -froboz -} -returnCodes error -result {bad option "-froboz": must be -async, -myaddr, -myport, or -server} +} -returnCodes error -result {bad option "-froboz": should be -async, -myaddr, -myport, or -server} test socket_$af-1.9 {arg parsing for socket command} -constraints [list socket supported_$af] -body { socket -server foo -myport 2521 3333 } -returnCodes error -result {option -myport is not valid for servers} diff --git a/tests/string.test b/tests/string.test index f742094..7fe8c2e 100644 --- a/tests/string.test +++ b/tests/string.test @@ -30,7 +30,7 @@ testConstraint memory [llength [info commands memory]] test string-1.1 {error conditions} { list [catch {string gorp a b} msg] $msg -} {1 {unknown or ambiguous subcommand "gorp": must be bytelength, compare, equal, first, index, is, last, length, map, match, range, repeat, replace, reverse, tolower, totitle, toupper, trim, trimleft, trimright, wordend, or wordstart}} +} {1 {unknown or ambiguous subcommand "gorp": should be bytelength, compare, equal, first, index, is, last, length, map, match, range, repeat, replace, reverse, tolower, totitle, toupper, trim, trimleft, trimright, wordend, or wordstart}} test string-1.2 {error conditions} { list [catch {string} msg] $msg } {1 {wrong # args: should be "string subcommand ?arg ...?"}} @@ -40,7 +40,7 @@ test string-2.1 {string compare, too few args} { } {1 {wrong # args: should be "string compare ?-nocase? ?-length int? string1 string2"}} test string-2.2 {string compare, bad args} { list [catch {string compare a b c} msg] $msg -} {1 {bad option "a": must be -length or -nocase}} +} {1 {bad option "a": should be -length or -nocase}} test string-2.3 {string compare, bad args} { list [catch {string compare -length -nocase str1 str2} msg] $msg } {1 {expected integer but got "-nocase"}} @@ -180,7 +180,7 @@ test string-4.1 {string first, too few args} { } {1 {wrong # args: should be "string first needleString haystackString ?startIndex?"}} test string-4.2 {string first, bad args} { list [catch {string first a b c} msg] $msg -} {1 {bad index "c": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "c": should be integer?[+-]integer? or end?[+-]integer?}} test string-4.3 {string first, too many args} { list [catch {string first a b 5 d} msg] $msg } {1 {wrong # args: should be "string first needleString haystackString ?startIndex?"}} @@ -245,7 +245,7 @@ test string-5.6 {string index} { } {0 {}} test string-5.7 {string index} { list [catch {string index a xyz} msg] $msg -} {1 {bad index "xyz": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "xyz": should be integer?[+-]integer? or end?[+-]integer?}} test string-5.8 {string index} { string index abc end } c @@ -315,10 +315,10 @@ test string-6.4 {string is, too many args} { } {1 {wrong # args: should be "string is class ?-strict? ?-failindex var? str"}} test string-6.5 {string is, class check} { list [catch {string is bogus str} msg] $msg -} {1 {bad class "bogus": must be alnum, alpha, ascii, control, boolean, digit, double, entier, false, graph, integer, list, lower, print, punct, space, true, upper, wideinteger, wordchar, or xdigit}} +} {1 {bad class "bogus": should be alnum, alpha, ascii, control, boolean, digit, double, entier, false, graph, integer, list, lower, print, punct, space, true, upper, wideinteger, wordchar, or xdigit}} test string-6.6 {string is, ambiguous class} { list [catch {string is al str} msg] $msg -} {1 {ambiguous class "al": must be alnum, alpha, ascii, control, boolean, digit, double, entier, false, graph, integer, list, lower, print, punct, space, true, upper, wideinteger, wordchar, or xdigit}} +} {1 {ambiguous class "al": should be alnum, alpha, ascii, control, boolean, digit, double, entier, false, graph, integer, list, lower, print, punct, space, true, upper, wideinteger, wordchar, or xdigit}} test string-6.7 {string is alpha, all ok} { string is alpha -strict -failindex var abc } 1 @@ -759,7 +759,7 @@ test string-7.1 {string last, too few args} { } {1 {wrong # args: should be "string last needleString haystackString ?startIndex?"}} test string-7.2 {string last, bad args} { list [catch {string last a b c} msg] $msg -} {1 {bad index "c": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "c": should be integer?[+-]integer? or end?[+-]integer?}} test string-7.3 {string last, too many args} { list [catch {string last a b c d} msg] $msg } {1 {wrong # args: should be "string last needleString haystackString ?startIndex?"}} @@ -845,7 +845,7 @@ test string-10.1 {string map, too few args} { } {1 {wrong # args: should be "string map ?-nocase? charMap string"}} test string-10.2 {string map, bad args} { list [catch {string map {a b} abba oops} msg] $msg -} {1 {bad option "a b": must be -nocase}} +} {1 {bad option "a b": should be -nocase}} test string-10.3 {string map, too many args} { list [catch {string map -nocase {a b} str1 str2} msg] $msg } {1 {wrong # args: should be "string map ?-nocase? charMap string"}} @@ -1070,7 +1070,7 @@ test string-11.29 {string match} { } 1 test string-11.30 {string match, bad args} { list [catch {string match - b c} msg] $msg -} {1 {bad option "-": must be -nocase}} +} {1 {ambiguous option "-": should be -nocase}} test string-11.31 {string match case} { string match a A } 0 @@ -1223,10 +1223,10 @@ test string-12.11 {string range} { } {abcdefghijklmnop} test string-12.12 {string range} { list [catch {string range abc abc 1} msg] $msg -} {1 {bad index "abc": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "abc": should be integer?[+-]integer? or end?[+-]integer?}} test string-12.13 {string range} { list [catch {string range abc 1 eof} msg] $msg -} {1 {bad index "eof": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "eof": should be integer?[+-]integer? or end?[+-]integer?}} test string-12.14 {string range} { string range abcdefghijklmnop end-1 end } {op} @@ -1354,10 +1354,10 @@ test string-14.12 {string replace} { } {} test string-14.13 {string replace} { list [catch {string replace abc abc 1} msg] $msg -} {1 {bad index "abc": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "abc": should be integer?[+-]integer? or end?[+-]integer?}} test string-14.14 {string replace} { list [catch {string replace abc 1 eof} msg] $msg -} {1 {bad index "eof": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "eof": should be integer?[+-]integer? or end?[+-]integer?}} test string-14.15 {string replace} { string replace abcdefghijklmnop end-10 end-2 NEW } {abcdeNEWop} @@ -1373,7 +1373,7 @@ test string-15.1 {string tolower too few args} { } {1 {wrong # args: should be "string tolower string ?first? ?last?"}} test string-15.2 {string tolower bad args} { list [catch {string tolower a b} msg] $msg -} {1 {bad index "b": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "b": should be integer?[+-]integer? or end?[+-]integer?}} test string-15.3 {string tolower too many args} { list [catch {string tolower ABC 1 end oops} msg] $msg } {1 {wrong # args: should be "string tolower string ?first? ?last?"}} @@ -1407,7 +1407,7 @@ test string-16.1 {string toupper} { } {1 {wrong # args: should be "string toupper string ?first? ?last?"}} test string-16.2 {string toupper} { list [catch {string toupper a b} msg] $msg -} {1 {bad index "b": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "b": should be integer?[+-]integer? or end?[+-]integer?}} test string-16.3 {string toupper} { list [catch {string toupper a 1 end oops} msg] $msg } {1 {wrong # args: should be "string toupper string ?first? ?last?"}} @@ -1441,7 +1441,7 @@ test string-17.1 {string totitle} { } {1 {wrong # args: should be "string totitle string ?first? ?last?"}} test string-17.2 {string totitle} { list [catch {string totitle a b} msg] $msg -} {1 {bad index "b": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "b": should be integer?[+-]integer? or end?[+-]integer?}} test string-17.3 {string totitle} { string totitle abCDEf } {Abcdef} @@ -1513,7 +1513,7 @@ test string-20.1 {string trimright errors} { } {1 {wrong # args: should be "string trimright string ?chars?"}} test string-20.2 {string trimright errors} { list [catch {string trimg a} msg] $msg -} {1 {unknown or ambiguous subcommand "trimg": must be bytelength, compare, equal, first, index, is, last, length, map, match, range, repeat, replace, reverse, tolower, totitle, toupper, trim, trimleft, trimright, wordend, or wordstart}} +} {1 {unknown or ambiguous subcommand "trimg": should be bytelength, compare, equal, first, index, is, last, length, map, match, range, repeat, replace, reverse, tolower, totitle, toupper, trim, trimleft, trimright, wordend, or wordstart}} test string-20.3 {string trimright} { string trimright " XYZ " } { XYZ} @@ -1535,7 +1535,7 @@ test string-21.2 {string wordend} { } {1 {wrong # args: should be "string wordend string index"}} test string-21.3 {string wordend} { list [catch {string wordend a gorp} msg] $msg -} {1 {bad index "gorp": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "gorp": should be integer?[+-]integer? or end?[+-]integer?}} test string-21.4 {string wordend} { string wordend abc. -1 } 3 @@ -1572,7 +1572,7 @@ test string-21.14 {string wordend, unicode} { test string-22.1 {string wordstart} { list [catch {string word a} msg] $msg -} {1 {unknown or ambiguous subcommand "word": must be bytelength, compare, equal, first, index, is, last, length, map, match, range, repeat, replace, reverse, tolower, totitle, toupper, trim, trimleft, trimright, wordend, or wordstart}} +} {1 {unknown or ambiguous subcommand "word": should be bytelength, compare, equal, first, index, is, last, length, map, match, range, repeat, replace, reverse, tolower, totitle, toupper, trim, trimleft, trimright, wordend, or wordstart}} test string-22.2 {string wordstart} { list [catch {string wordstart a} msg] $msg } {1 {wrong # args: should be "string wordstart string index"}} @@ -1581,7 +1581,7 @@ test string-22.3 {string wordstart} { } {1 {wrong # args: should be "string wordstart string index"}} test string-22.4 {string wordstart} { list [catch {string wordstart a gorp} msg] $msg -} {1 {bad index "gorp": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "gorp": should be integer?[+-]integer? or end?[+-]integer?}} test string-22.5 {string wordstart} { string wordstart "one two three_words" 400 } 8 @@ -1775,7 +1775,7 @@ test string-26.1 {tcl::prefix, too few args} -body { } -returnCodes 1 -result {wrong # args: should be "tcl::prefix match ?options? table string"} test string-26.2 {tcl::prefix, bad args} -body { tcl::prefix match a b c -} -returnCodes 1 -result {bad option "a": must be -error, -exact, or -message} +} -returnCodes 1 -result {bad option "a": should be -error, -exact, or -message} test string-26.2.1 {tcl::prefix, empty table} -body { tcl::prefix match {} foo } -returnCodes 1 -result {bad option "foo": no valid options} @@ -1799,16 +1799,16 @@ test string-26.6 {tcl::prefix} { } bepa test string-26.7 {tcl::prefix} -body { tcl::prefix match -exact {apa bepa cepa depa} be -} -returnCodes 1 -result {bad option "be": must be apa, bepa, cepa, or depa} +} -returnCodes 1 -result {bad option "be": should be apa, bepa, cepa, or depa} test string-26.8 {tcl::prefix} -body { tcl::prefix match -message wombat {apa bepa bear depa} be -} -returnCodes 1 -result {ambiguous wombat "be": must be apa, bepa, bear, or depa} +} -returnCodes 1 -result {ambiguous wombat "be": should be apa, bepa, bear, or depa} test string-26.9 {tcl::prefix} -body { tcl::prefix match -error {} {apa bepa bear depa} be } -returnCodes 0 -result {} test string-26.10 {tcl::prefix} -body { tcl::prefix match -error {-level 1} {apa bepa bear depa} be -} -returnCodes 2 -result {ambiguous option "be": must be apa, bepa, bear, or depa} +} -returnCodes 2 -result {ambiguous option "be": should be apa, bepa, bear, or depa} test string-26.10.1 {tcl::prefix} -setup { proc _testprefix {args} { array set opts {-a x -b y -c y} @@ -1823,7 +1823,7 @@ test string-26.10.1 {tcl::prefix} -setup { dict get $options -errorinfo } -cleanup { rename _testprefix {} -} -result {bad option "-x": must be -a, -b, or -c +} -result {bad option "-x": should be -a, -b, or -c while executing "_testprefix -x u"} diff --git a/tests/stringComp.test b/tests/stringComp.test index d32f948..a4e255a 100644 --- a/tests/stringComp.test +++ b/tests/stringComp.test @@ -46,7 +46,7 @@ if {[testConstraint memory]} { test stringComp-1.1 {error conditions} { proc foo {} {string gorp a b} list [catch {foo} msg] $msg -} {1 {unknown or ambiguous subcommand "gorp": must be bytelength, compare, equal, first, index, is, last, length, map, match, range, repeat, replace, reverse, tolower, totitle, toupper, trim, trimleft, trimright, wordend, or wordstart}} +} {1 {unknown or ambiguous subcommand "gorp": should be bytelength, compare, equal, first, index, is, last, length, map, match, range, repeat, replace, reverse, tolower, totitle, toupper, trim, trimleft, trimright, wordend, or wordstart}} test stringComp-1.2 {error conditions} { proc foo {} {string} list [catch {foo} msg] $msg @@ -71,7 +71,7 @@ foreach {tname tbody tresult tcode} { } {wrong # args: should be "string compare ?-nocase? ?-length int? string1 string2"} {error} {bad args} { string compare a b c - } {bad option "a": must be -length or -nocase} {error} + } {bad option "a": should be -length or -nocase} {error} {bad args} { string compare -length -nocase str1 str2 } {expected integer but got "-nocase"} {error} @@ -229,7 +229,7 @@ test stringComp-4.1 {string first, too few args} { test stringComp-4.2 {string first, bad args} { proc foo {} {string first a b c} list [catch {foo} msg] $msg -} {1 {bad index "c": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "c": should be integer?[+-]integer? or end?[+-]integer?}} test stringComp-4.3 {string first, too many args} { proc foo {} {string first a b 5 d} list [catch {foo} msg] $msg @@ -306,7 +306,7 @@ test stringComp-5.6 {string index} { test stringComp-5.7 {string index} { proc foo {} {string index a xyz} list [catch {foo} msg] $msg -} {1 {bad index "xyz": must be integer?[+-]integer? or end?[+-]integer?}} +} {1 {bad index "xyz": should be integer?[+-]integer? or end?[+-]integer?}} test stringComp-5.8 {string index} { proc foo {} {string index abc end} foo @@ -561,7 +561,7 @@ test stringComp-11.29 {string match} { test stringComp-11.30 {string match, bad args} { proc foo {} {string match - b c} list [catch {foo} msg] $msg -} {1 {bad option "-": must be -nocase}} +} {1 {ambiguous option "-": should be -nocase}} test stringComp-11.31 {string match case} { proc foo {} {string match a A} foo diff --git a/tests/subst.test b/tests/subst.test index 498512d..38d9f1b 100644 --- a/tests/subst.test +++ b/tests/subst.test @@ -21,7 +21,7 @@ test subst-1.1 {basics} -returnCodes error -body { } -result {wrong # args: should be "subst ?-nobackslashes? ?-nocommands? ?-novariables? string"} test subst-1.2 {basics} -returnCodes error -body { subst a b c -} -result {bad option "a": must be -nobackslashes, -nocommands, or -novariables} +} -result {bad option "a": should be -nobackslashes, -nocommands, or -novariables} test subst-2.1 {simple strings} { subst {} @@ -119,13 +119,13 @@ test subst-6.1 {clear the result after command substitution} -body { test subst-7.1 {switches} -returnCodes error -body { subst foo bar -} -result {bad option "foo": must be -nobackslashes, -nocommands, or -novariables} +} -result {bad option "foo": should be -nobackslashes, -nocommands, or -novariables} test subst-7.2 {switches} -returnCodes error -body { subst -no bar -} -result {ambiguous option "-no": must be -nobackslashes, -nocommands, or -novariables} +} -result {ambiguous option "-no": should be -nobackslashes, -nocommands, or -novariables} test subst-7.3 {switches} -returnCodes error -body { subst -bogus bar -} -result {bad option "-bogus": must be -nobackslashes, -nocommands, or -novariables} +} -result {bad option "-bogus": should be -nobackslashes, -nocommands, or -novariables} test subst-7.4 {switches} { set x 123 subst -nobackslashes {abc $x [expr 1+2] \\\x41} diff --git a/tests/switch.test b/tests/switch.test index 4d204bb..32de84d 100644 --- a/tests/switch.test +++ b/tests/switch.test @@ -99,7 +99,7 @@ test switch-3.5 {-exact vs. -glob vs. -regexp} { } exact test switch-3.6 {-exact vs. -glob vs. -regexp} -body { switch -foo a b c -} -returnCodes error -result {bad option "-foo": must be -exact, -glob, -indexvar, -matchvar, -nocase, -regexp, or --} +} -returnCodes error -result {bad option "-foo": should be -exact, -glob, -indexvar, -matchvar, -nocase, -regexp, or --} test switch-3.7 {-exact vs. -glob vs. -regexp with -nocase} { switch -exact -nocase aaaab { ^a*b$ {subst regexp} diff --git a/tests/tcltest.test b/tests/tcltest.test index ce8d617..541eda5 100644 --- a/tests/tcltest.test +++ b/tests/tcltest.test @@ -1197,7 +1197,7 @@ test tcltest-21.2 {force a test command failure} { } {1} } -returnCodes 1 - -result {bad option "1": must be -body, -cleanup, -constraints, -errorOutput, -match, -output, -result, -returnCodes, or -setup} + -result {bad option "1": should be -body, -cleanup, -constraints, -errorOutput, -match, -output, -result, -returnCodes, or -setup} } test tcltest-21.3 {test command with setup} { @@ -1290,7 +1290,7 @@ test tcltest-21.7 {test command - bad flag} { } } -returnCodes 1 - -result {bad option "-foobar": must be -body, -cleanup, -constraints, -errorOutput, -match, -output, -result, -returnCodes, or -setup} + -result {bad option "-foobar": should be -body, -cleanup, -constraints, -errorOutput, -match, -output, -result, -returnCodes, or -setup} } # alternate test command format (these are the same as 21.1-21.6, with the @@ -1310,7 +1310,7 @@ test tcltest-21.8 {force a test command failure} \ } \ -returnCodes 1 \ -cleanup {set ::tcltest::currentFailure $fail} \ - -result {bad option "1": must be -body, -cleanup, -constraints, -errorOutput, -match, -output, -result, -returnCodes, or -setup} + -result {bad option "1": should be -body, -cleanup, -constraints, -errorOutput, -match, -output, -result, -returnCodes, or -setup} test tcltest-21.9 {test command with setup} \ -setup {set foo 1} \ @@ -1552,7 +1552,7 @@ test tcltest-24.5 { test tcltest-24.5.0 {} \ -match [namespace current]::noSuchMode } result] $result -} -match glob -result {1 *bad -match value*: must be *alwaysMatch,*} +} -match glob -result {1 *bad -match value*: should be *alwaysMatch,*} test tcltest-24.6 { customMatch: -match script that always matches diff --git a/tests/timer.test b/tests/timer.test index e252eff..75ab3a0 100644 --- a/tests/timer.test +++ b/tests/timer.test @@ -189,10 +189,10 @@ test timer-6.1 {Tcl_AfterCmd procedure, basics} -returnCodes error -body { } -result {wrong # args: should be "after option ?arg ...?"} test timer-6.2 {Tcl_AfterCmd procedure, basics} -returnCodes error -body { after 2x -} -result {unknown or ambiguous argument "2x": must be cancel, idle, info, or an integer} +} -result {bad argument "2x": should be cancel, idle, info, or an integer} test timer-6.3 {Tcl_AfterCmd procedure, basics} -returnCodes error -body { after gorp -} -result {unknown or ambiguous argument "gorp": must be cancel, idle, info, or an integer} +} -result {bad argument "gorp": should be cancel, idle, info, or an integer} test timer-6.4 {Tcl_AfterCmd procedure, ms argument} { set x before after 400 {set x after} diff --git a/tests/tm.test b/tests/tm.test index 1b22f8c..ab2b372 100644 --- a/tests/tm.test +++ b/tests/tm.test @@ -18,7 +18,7 @@ test tm-1.1 {tm: path command exists} { } ::tcl::tm::path test tm-1.2 {tm: path command syntax} -returnCodes error -body { ::tcl::tm::path foo -} -result {unknown or ambiguous subcommand "foo": must be add, list, or remove} +} -result {unknown or ambiguous subcommand "foo": should be add, list, or remove} test tm-1.3 {tm: path command syntax} { ::tcl::tm::path add } {} diff --git a/tests/trace.test b/tests/trace.test index d830f3c..15839fa 100644 --- a/tests/trace.test +++ b/tests/trace.test @@ -869,7 +869,7 @@ test trace-14.4 "trace command, wrong # args errors" { test trace-14.5 {trace command, invalid option} { list [catch {trace gorp} msg] $msg -} [list 1 "bad option \"gorp\": must be add, info, remove, variable, vdelete, or vinfo"] +} [list 1 "bad option \"gorp\": should be add, info, remove, variable, vdelete, or vinfo"] # Again, [trace ... command] and [trace ... variable] share syntax and # error message styles for their opList options; these loops test those @@ -883,15 +883,15 @@ foreach type {variable command execution} err $errs abbvlist $abbvs { foreach op {add remove} { test trace-14.6.[incr i] "trace $op $type errors" { list [catch {trace $op $type x {y z w} a} msg] $msg - } [list 1 "bad operation \"y\": must be $err"] + } [list 1 "bad operation \"y\": should be $err"] foreach abbv $abbvlist { test trace-14.6.[incr i] "trace $op $type rejects abbreviations" { list [catch {trace $op $type x $abbv a} msg] $msg - } [list 1 "bad operation \"$abbv\": must be $err"] + } [list 1 "bad operation \"$abbv\": should be $err"] } test trace-14.6.[incr i] "trace $op $type rejects null opList" { list [catch {trace $op $type x {} a} msg] $msg - } [list 1 "bad operation list \"\": must be one or more of $err"] + } [list 1 "bad operation list \"\": should be one or more of $err"] } } rename x {} @@ -910,7 +910,7 @@ test trace-14.10 {trace command, "trace variable" errors} { } [list 1 "wrong # args: should be \"trace variable name ops command\""] test trace-14.11 {trace command, "trace variable" errors} { list [catch {trace variable x y z} msg] $msg -} [list 1 "bad operations \"y\": should be one or more of rwua"] +} [list 1 "bad operations \"y\": should be one or more character of rwua"] test trace-14.12 {trace command ("remove variable" option)} { diff --git a/tests/winDde.test b/tests/winDde.test index f04fb45..9871c93 100644 --- a/tests/winDde.test +++ b/tests/winDde.test @@ -248,7 +248,7 @@ test winDde-5.4 {DDE eval bad arguments} -constraints dde -body { test winDde-6.1 {DDE servername bad arguments} -constraints dde -body { dde servername -z -z -z -} -returnCodes error -result {bad option "-z": must be -force, -handler, or --} +} -returnCodes error -result {bad option "-z": should be -force, -handler, or --} test winDde-6.2 {DDE servername set name} -constraints dde -body { dde servername -- winDde-6.2 } -result {winDde-6.2} diff --git a/tests/zlib.test b/tests/zlib.test index 2346ec7..cdf6af4 100644 --- a/tests/zlib.test +++ b/tests/zlib.test @@ -29,7 +29,7 @@ test zlib-1.1 {zlib basics} -constraints zlib -returnCodes error -body { } -result {wrong # args: should be "zlib command arg ?...?"} test zlib-1.2 {zlib basics} -constraints zlib -returnCodes error -body { zlib ? {} -} -result {bad command "?": must be adler32, compress, crc32, decompress, deflate, gunzip, gzip, inflate, push, or stream} +} -result {bad command "?": should be adler32, compress, crc32, decompress, deflate, gunzip, gzip, inflate, push, or stream} test zlib-1.3 {zlib basics} -constraints zlib -body { zlib::pkgconfig list } -result zlibVersion @@ -83,7 +83,7 @@ test zlib-7.0 {zlib stream} -constraints zlib -returnCodes error -setup { $s ? } -cleanup { $s close -} -result {bad option "?": must be add, checksum, close, eof, finalize, flush, fullflush, get, header, put, or reset} +} -result {bad option "?": should be add, checksum, close, eof, finalize, flush, fullflush, get, header, put, or reset} test zlib-7.1 {zlib stream} zlib { set s [zlib stream compress] $s put -finalize abcdeEDCBA @@ -745,7 +745,7 @@ test zlib-10.0 "bug #2818131 (close with null interp)" -constraints { close $srv rename bgerror {} } -returnCodes error \ - -result {bad event name "xyzzy": must be readable or writable} + -result {bad event name "xyzzy": should be readable or writable} test zlib-10.1 "bug #2818131 (mismatch read)" -constraints { zlib } -setup { diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c index fdc9d1d..c0e5687 100644 --- a/unix/tclUnixChan.c +++ b/unix/tclUnixChan.c @@ -639,7 +639,7 @@ TtySetOptionProc( } else { if (interp) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "bad value for -handshake: must be one of" + "bad value for -handshake: should be one of" " xonxoff, rtscts, dtrdsr or none", -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "FCONFIGURE", "VALUE", NULL); @@ -758,7 +758,7 @@ TtySetOptionProc( } else { if (interp) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "bad signal \"%s\" for -ttycontrol: must be" + "bad signal \"%s\" for -ttycontrol: should be" " DTR, RTS or BREAK", argv[i])); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "FCONFIGURE", "VALUE", NULL); @@ -1216,7 +1216,7 @@ TtyParseMode( } /* - * Only allow setting mark/space parity on platforms that support it Make + * Only allow setting mark/space parity on platforms that support it. Make * sure to allow for the case where strchr is a macro. [Bug: 5089] * * We cannot if/else/endif the strchr arguments, it has to be the whole diff --git a/unix/tclUnixTest.c b/unix/tclUnixTest.c index 4b0f369..d7246fd 100644 --- a/unix/tclUnixTest.c +++ b/unix/tclUnixTest.c @@ -318,7 +318,7 @@ TestfilehandlerCmd( Tcl_DoOneEvent(TCL_WINDOW_EVENTS|TCL_DONT_WAIT); } else { Tcl_AppendResult(interp, "bad option \"", argv[1], - "\": must be close, clear, counts, create, empty, fill, " + "\": should be close, clear, counts, create, empty, fill, " "fillpartial, oneevent, wait, or windowevent", NULL); return TCL_ERROR; } @@ -387,7 +387,7 @@ TestfilewaitCmd( mask = TCL_WRITABLE|TCL_READABLE; } else { Tcl_AppendResult(interp, "bad argument \"", argv[2], - "\": must be readable, writable, or both", NULL); + "\": should be readable, writable, or both", NULL); return TCL_ERROR; } if (Tcl_GetChannelHandle(channel, diff --git a/unix/tclXtTest.c b/unix/tclXtTest.c index fcb0773..8510677 100644 --- a/unix/tclXtTest.c +++ b/unix/tclXtTest.c @@ -119,7 +119,7 @@ TesteventloopCmd( framePtr = oldFramePtr; } else { Tcl_AppendResult(interp, "bad option \"", argv[1], - "\": must be done or wait", NULL); + "\": should be done or wait", NULL); return TCL_ERROR; } return TCL_OK; diff --git a/win/tclWinDde.c b/win/tclWinDde.c index ce0b413..d43b109 100644 --- a/win/tclWinDde.c +++ b/win/tclWinDde.c @@ -557,7 +557,7 @@ ExecuteRemoteObject( if (riPtr->handlerPtr == NULL && Tcl_IsSafe(riPtr->interp)) { Tcl_SetObjResult(riPtr->interp, Tcl_NewStringObj("permission denied: " - "a handler procedure must be defined for use in a safe " + "a handler procedure should be defined for use in a safe " "interp", -1)); Tcl_SetErrorCode(riPtr->interp, "TCL", "DDE", "SECURITY_CHECK", NULL); result = TCL_ERROR; @@ -1714,7 +1714,7 @@ DdeObjCmd( if (Tcl_IsSafe(riPtr->interp) && riPtr->handlerPtr == NULL) { Tcl_SetObjResult(riPtr->interp, Tcl_NewStringObj( - "permission denied: a handler procedure must be" + "permission denied: a handler procedure should be" " defined for use in a safe interp", -1)); Tcl_SetErrorCode(interp, "TCL", "DDE", "SECURITY_CHECK", NULL); diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c index 6487fe4..db62b03 100644 --- a/win/tclWinSerial.c +++ b/win/tclWinSerial.c @@ -1749,7 +1749,7 @@ SerialSetOptionProc( } else { if (interp != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "bad value \"%s\" for -handshake: must be one of" + "bad value \"%s\" for -handshake: should be one of" " xonxoff, rtscts, dtrdsr or none", value)); Tcl_SetErrorCode(interp, "TCL", "VALUE", "HANDSHAKE", NULL); } @@ -1886,7 +1886,7 @@ SerialSetOptionProc( } else { if (interp != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "bad signal name \"%s\" for -ttycontrol: must be" + "bad signal name \"%s\" for -ttycontrol: should be" " DTR, RTS or BREAK", argv[i])); Tcl_SetErrorCode(interp, "TCL", "VALUE", "TTY_SIGNAL", NULL); diff --git a/win/tclWinTest.c b/win/tclWinTest.c index 6027e32..f7858ae 100644 --- a/win/tclWinTest.c +++ b/win/tclWinTest.c @@ -153,7 +153,7 @@ TesteventloopCmd( framePtr = oldFramePtr; } else { Tcl_AppendResult(interp, "bad option \"", argv[1], - "\": must be done or wait", NULL); + "\": should be done or wait", NULL); return TCL_ERROR; } return TCL_OK; |