You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ca...@apache.org on 2005/04/05 22:26:48 UTC

cvs commit: xml-xerces/c/tests/XSValueTest XSValueTest.cpp

cargilld    2005/04/05 13:26:48

  Modified:    c/src/xercesc/framework/psvi XSValue.cpp
               c/tests/XSValueTest XSValueTest.cpp
  Log:
  Update XSValue to handle leading and trailing whitespace.
  
  Revision  Changes    Path
  1.22      +80 -28    xml-xerces/c/src/xercesc/framework/psvi/XSValue.cpp
  
  Index: XSValue.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/psvi/XSValue.cpp,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- XSValue.cpp	23 Dec 2004 16:11:21 -0000	1.21
  +++ XSValue.cpp	5 Apr 2005 20:26:48 -0000	1.22
  @@ -16,6 +16,9 @@
   
   /*
    * $Log$
  + * Revision 1.22  2005/04/05 20:26:48  cargilld
  + * Update XSValue to handle leading and trailing whitespace.
  + *
    * Revision 1.21  2004/12/23 16:11:21  cargilld
    * Various XSValue updates: use ulong for postiveInteger; reset date fields to zero; modifty XSValueTest to test the returned value from getActualValue.
    *
  @@ -108,6 +111,7 @@
   #include <xercesc/util/regx/RegularExpression.hpp>
   #include <xercesc/validators/schema/SchemaSymbols.hpp>
   #include <xercesc/util/OutOfMemoryException.hpp>
  +#include <xercesc/util/TransService.hpp>
   
   XERCES_CPP_NAMESPACE_BEGIN
   
  @@ -704,11 +708,14 @@
       }
   }
   
  -bool XSValue::validateDateTimes(const XMLCh*         const content    
  +bool XSValue::validateDateTimes(const XMLCh*         const input_content    
                                 ,       DataType             datatype
                                 ,       Status&              status
                                 ,       MemoryManager* const manager)
   {
  +    XMLCh* content = XMLString::replicate(input_content, manager);
  +    ArrayJanitor<XMLCh> janTmpName(content, manager);
  +    XMLString::trim(content);   
       try
       {
           XMLDateTime coreDate = XMLDateTime(content, manager);
  @@ -781,8 +788,11 @@
           case XSValue::dt_boolean:
               {
                   unsigned int i = 0;
  +                XMLCh* tmpStrValue = XMLString::replicate(content, manager);
  +                ArrayJanitor<XMLCh> janTmpName(tmpStrValue, manager);
  +                XMLString::trim(tmpStrValue);    
                   for (; i < XMLUni::fgBooleanValueSpaceArraySize; i++) {
  -                    if (XMLString::equals(content, XMLUni::fgBooleanValueSpace[i]))
  +                    if (XMLString::equals(tmpStrValue, XMLUni::fgBooleanValueSpace[i]))
                           break;
                   }
   
  @@ -791,10 +801,15 @@
                   }
                   break;
               }
  -        case XSValue::dt_hexBinary:            
  -            if (HexBin::getDataLength(content) == -1) {
  +        case XSValue::dt_hexBinary:
  +            {
  +            XMLCh* tmpStrValue = XMLString::replicate(content, manager);
  +            ArrayJanitor<XMLCh> janTmpName(tmpStrValue, manager);
  +            XMLString::trim(tmpStrValue);
  +            if (HexBin::getDataLength(tmpStrValue) == -1) {
                  isValid = false;                	
  -            }            
  +            }
  +            }
               break;
           case XSValue::dt_base64Binary:            
               if (Base64::getDataLength(content, manager) == -1) {
  @@ -807,14 +822,24 @@
               }        
               break;
           case XSValue::dt_QName:
  +            {
  +            XMLCh* tmpStrValue = XMLString::replicate(content, manager);
  +            ArrayJanitor<XMLCh> janTmpName(tmpStrValue, manager);
  +            XMLString::trim(tmpStrValue);
               isValid = (version == ver_10) ? 
  -                XMLChar1_0::isValidQName(content, XMLString::stringLen(content)) :
  -                XMLChar1_1::isValidQName(content, XMLString::stringLen(content));
  +                XMLChar1_0::isValidQName(tmpStrValue, XMLString::stringLen(tmpStrValue)) :
  +                XMLChar1_1::isValidQName(tmpStrValue, XMLString::stringLen(tmpStrValue));
  +            }
               break;
           case XSValue::dt_NOTATION:
  -            if ( XMLString::isValidNOTATION(content, manager) == false) {
  +            {
  +            XMLCh* tmpStrValue = XMLString::replicate(content, manager);
  +            ArrayJanitor<XMLCh> janTmpName(tmpStrValue, manager);
  +            XMLString::trim(tmpStrValue);
  +            if ( XMLString::isValidNOTATION(tmpStrValue, manager) == false) {
               	isValid = false;
               }
  +            }
               break;
           case XSValue::dt_string:
               {
  @@ -1114,13 +1139,15 @@
   
   }
   
  -XMLCh* XSValue::getCanRepDateTimes(const XMLCh*         const content    
  +XMLCh* XSValue::getCanRepDateTimes(const XMLCh*         const input_content    
                                    ,       DataType             datatype
                                    ,       Status&              status                                 
                                    ,       bool                 toValidate
                                    ,       MemoryManager* const manager)
   {
  -
  +    XMLCh* content = XMLString::replicate(input_content, manager);
  +    ArrayJanitor<XMLCh> janTmpName(content, manager);
  +    XMLString::trim(content);   
       try
       {
   
  @@ -1184,15 +1211,19 @@
       try
       {
           switch (datatype) {        
  -        case XSValue::dt_boolean:            
  +        case XSValue::dt_boolean:
  +            {
  +            XMLCh* tmpStrValue = XMLString::replicate(content, manager);
  +            ArrayJanitor<XMLCh> janTmpName(tmpStrValue, manager);
  +            XMLString::trim(tmpStrValue);
               //always validate before getting canRep
  -            if (XMLString::equals(content, XMLUni::fgBooleanValueSpace[0]) ||
  -                XMLString::equals(content, XMLUni::fgBooleanValueSpace[2])  ) 
  +            if (XMLString::equals(tmpStrValue, XMLUni::fgBooleanValueSpace[0]) ||
  +                XMLString::equals(tmpStrValue, XMLUni::fgBooleanValueSpace[2])  ) 
               {
                   return XMLString::replicate(XMLUni::fgBooleanValueSpace[0], manager);
               }
  -            else if (XMLString::equals(content, XMLUni::fgBooleanValueSpace[1]) ||
  -                     XMLString::equals(content, XMLUni::fgBooleanValueSpace[3])  ) 
  +            else if (XMLString::equals(tmpStrValue, XMLUni::fgBooleanValueSpace[1]) ||
  +                     XMLString::equals(tmpStrValue, XMLUni::fgBooleanValueSpace[3])  ) 
               {
                   return XMLString::replicate(XMLUni::fgBooleanValueSpace[1], manager);
               }
  @@ -1200,12 +1231,17 @@
               {
                   status = st_FOCA0002;
                   return 0;
  -            }            
  +            }     
  +            }
               break;
           case XSValue::dt_hexBinary: 
               {
                   //HexBin::getCanonicalRepresentation does validation automatically
  -                XMLCh* canRep = HexBin::getCanonicalRepresentation(content, manager);
  +                XMLCh* tmpStrValue = XMLString::replicate(content, manager);
  +                ArrayJanitor<XMLCh> janTmpName(tmpStrValue, manager);
  +                XMLString::trim(tmpStrValue); 
  +
  +                XMLCh* canRep = HexBin::getCanonicalRepresentation(tmpStrValue, manager);
                   if (!canRep)
                       status = st_FOCA0002;
   
  @@ -1420,11 +1456,14 @@
   }
   
   XSValue*  
  -XSValue::getActValDateTimes(const XMLCh*         const content    
  +XSValue::getActValDateTimes(const XMLCh*         const input_content    
                             ,       DataType             datatype
                             ,       Status&              status                         
                             ,       MemoryManager* const manager)
   {
  +    XMLCh* content = XMLString::replicate(input_content, manager);
  +    ArrayJanitor<XMLCh> janTmpName(content, manager);
  +    XMLString::trim(content);   
       try
       {
           //Need not check if validation is requested since
  @@ -1516,17 +1555,21 @@
       try
       {
           switch (datatype) { 
  -        case XSValue::dt_boolean:            
  +        case XSValue::dt_boolean: 
  +            {
  +            XMLCh* tmpStrValue = XMLString::replicate(content, manager);
  +            ArrayJanitor<XMLCh> janTmpName(tmpStrValue, manager);
  +            XMLString::trim(tmpStrValue);            
               //do validation here more efficiently
  -            if (XMLString::equals(content, XMLUni::fgBooleanValueSpace[0]) ||
  -                XMLString::equals(content, XMLUni::fgBooleanValueSpace[2])  )
  +            if (XMLString::equals(tmpStrValue, XMLUni::fgBooleanValueSpace[0]) ||
  +                XMLString::equals(tmpStrValue, XMLUni::fgBooleanValueSpace[2])  )
               {
                   XSValue* retVal = new (manager) XSValue(dt_boolean, manager);
                   retVal->fData.fValue.f_bool = false;
                   return retVal;
               }
  -            else if (XMLString::equals(content, XMLUni::fgBooleanValueSpace[1]) ||
  -                     XMLString::equals(content, XMLUni::fgBooleanValueSpace[3])  )
  +            else if (XMLString::equals(tmpStrValue, XMLUni::fgBooleanValueSpace[1]) ||
  +                     XMLString::equals(tmpStrValue, XMLUni::fgBooleanValueSpace[3])  )
               {
                   XSValue* retVal = new (manager) XSValue(dt_boolean, manager);
                   retVal->fData.fValue.f_bool = true;
  @@ -1536,11 +1579,16 @@
               {
                   status = st_FOCA0002;
                   return 0;
  -            }            
  +            }
  +            }
               break;
           case XSValue::dt_hexBinary:
               {
  -                XMLByte* decodedData = HexBin::decodeToXMLByte(content, manager);
  +                XMLCh* tmpStrValue = XMLString::replicate(content, manager);
  +                ArrayJanitor<XMLCh> janTmpName(tmpStrValue, manager);
  +                XMLString::trim(tmpStrValue); 
  +
  +                XMLByte* decodedData = HexBin::decodeToXMLByte(tmpStrValue, manager);
   
                   if (!decodedData)
                   {
  @@ -1725,8 +1773,12 @@
       // check if all chars are valid char
       if ( (endptr - nptr) != strLen)
       {
  -        status = st_FOCA0002;
  -        return false;
  +        for (unsigned int i=endptr - nptr; i <strLen; i++) {
  +            if (!XMLPlatformUtils::fgTransService->isSpace(nptr[i])) {
  +                status = st_FOCA0002;
  +                return false;
  +            }
  +        }
       }
       return true;
   }
  
  
  
  1.16      +53 -50    xml-xerces/c/tests/XSValueTest/XSValueTest.cpp
  
  Index: XSValueTest.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/tests/XSValueTest/XSValueTest.cpp,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- XSValueTest.cpp	25 Feb 2005 18:30:46 -0000	1.15
  +++ XSValueTest.cpp	5 Apr 2005 20:26:48 -0000	1.16
  @@ -17,6 +17,9 @@
   /*
   * $Id$
   * $Log$
  +* Revision 1.16  2005/04/05 20:26:48  cargilld
  +* Update XSValue to handle leading and trailing whitespace.
  +*
   * Revision 1.15  2005/02/25 18:30:46  cargilld
   * Attempt to fix compiler errors.
   *
  @@ -672,9 +675,9 @@
           else {                                                                        \
           if (expStatus != myStatus) {                                                  \
                   printf("CANREP_TEST Context Diff,                                     \
  -                        at line <%d> data=<%s>, datatype=<%d>\n                       \
  +                        at line <%d> data=<%s>, datatype=<%s>\n                       \
                           expStatus=<%s>, actStatus=<%s>\n"                             \
  -                      , __LINE__, data, datatype                                      \
  +                      , __LINE__, data, StrX(getDataTypeString(datatype)).localForm() \
                         , getStatusString(expStatus), getStatusString(myStatus));       \
                   errSeen = true;                                                       \
               }                                                                         \
  @@ -773,7 +776,7 @@
       const XSValue::DataType dt = XSValue::dt_decimal; 
       bool  toValidate = true;
   
  -    const char lex_v_ran_v_1[]="1234.567";
  +    const char lex_v_ran_v_1[]="  1234.567  \n";
       const char lex_v_ran64_v_1[]="18446744073709551615.999";
       const char lex_v_ran64_v_2[]="999.18446744073709551615";
       const char lex_v_ran64_iv_1[]="18446744073709551616.999";
  @@ -812,7 +815,7 @@
    *       to the left of the decimal point which may be a zero.
    ***/
   
  -    const char data_rawstr_1[]="-123.45";
  +    const char data_rawstr_1[]="  -123.45  \n";
       const char data_canrep_1[]="-123.45";
       const char data_rawstr_2[]="+123.45";
       const char data_canrep_2[]="123.45";
  @@ -954,7 +957,7 @@
       const XSValue::DataType dt = XSValue::dt_float; 
       bool  toValidate = true;
   
  -    const char lex_v_ran_v_0[]="1234.e+10";
  +    const char lex_v_ran_v_0[]="  1234.e+10  \n";
       const char lex_v_ran_v_1[]="+3.402823466e+38";
       const char lex_v_ran_v_2[]="-3.402823466e+38";
       const char lex_v_ran_v_3[]="+1.175494351e-38";
  @@ -994,7 +997,7 @@
    *
    ***/
   
  -    const char data_rawstr_1[]="-123.45";
  +    const char data_rawstr_1[]="   -123.45    \n";
       const char data_canrep_1[]="-1.2345E2";
       const char data_rawstr_2[]="+123.45";
       const char data_canrep_2[]="1.2345E2";
  @@ -1146,7 +1149,7 @@
       const XSValue::DataType dt = XSValue::dt_double; 
       bool  toValidate = true;
   
  -    const char lex_v_ran_v_0[]="1234.e+10";
  +    const char lex_v_ran_v_0[]="   1234.e+10   \n";
       const char lex_v_ran_v_1[]="+1.7976931348623158e+308";
       const char lex_v_ran_v_2[]="-1.7976931348623158e+308";
       const char lex_v_ran_v_3[]="+2.2250738585072014e-308";
  @@ -1189,7 +1192,7 @@
    *
    ***/
   
  -    const char data_rawstr_1[]="-123.45";
  +    const char data_rawstr_1[]="    -123.45    \n";
       const char data_canrep_1[]="-1.2345E2";
       const char data_rawstr_2[]="+123.45";
       const char data_canrep_2[]="1.2345E2";
  @@ -1343,7 +1346,7 @@
       const XSValue::DataType dt = XSValue::dt_integer; 
       bool  toValidate = true;
   
  -    const char lex_v_ran_v_1[]="1234";
  +    const char lex_v_ran_v_1[]="   1234    \n";
       const char lex_v_ran64_v_1[]="+9223372036854775807";
       const char lex_v_ran64_v_2[]="-9223372036854775808";
       const char lex_v_ran64_iv_1[]="+9223372036854775808";
  @@ -1380,7 +1383,7 @@
    *
    ***/
   
  -    const char data_rawstr_1[]="+12345";
  +    const char data_rawstr_1[]="   +12345   \n";
       const char data_canrep_1[]="12345";
       const char data_rawstr_2[]="00012345";
       const char data_canrep_2[]="12345";
  @@ -1500,7 +1503,7 @@
       const XSValue::DataType dt = XSValue::dt_nonPositiveInteger; 
       bool  toValidate = true;
   
  -    const char lex_v_ran_v_1[]="-1234";
  +    const char lex_v_ran_v_1[]="    -1234   \n";
       const char lex_v_ran_iv_1[]="+1";
   
       const char lex_v_ran64_v_2[]="-9223372036854775808";
  @@ -1532,7 +1535,7 @@
    *
    ***/
   
  -    const char data_rawstr_1[]="0";
  +    const char data_rawstr_1[]="   0    \n";
       const char data_canrep_1[]="-0";
       const char data_rawstr_2[]="-00012345";
       const char data_canrep_2[]="-12345";
  @@ -1646,7 +1649,7 @@
       const XSValue::DataType dt = XSValue::dt_negativeInteger; 
       bool  toValidate = true;
   
  -    const char lex_v_ran_v_1[]="-1234";
  +    const char lex_v_ran_v_1[]="    -1234    \n";
       const char lex_v_ran_iv_1[]="0";
   
       const char lex_v_ran64_v_2[]="-9223372036854775808";
  @@ -1677,7 +1680,7 @@
    *
    ***/
   
  -    const char data_rawstr_1[]="-00012345";
  +    const char data_rawstr_1[]="    -00012345    \n";
       const char data_canrep_1[]="-12345";
      
       /***    
  @@ -1788,7 +1791,7 @@
       const XSValue::DataType dt = XSValue::dt_long; 
       bool  toValidate = true;
   
  -    const char lex_v_ran_v_1[]="1234";
  +    const char lex_v_ran_v_1[]="    1234    \n";
       const char lex_v_ran64_v_1[]="+9223372036854775807";
       const char lex_v_ran64_v_2[]="-9223372036854775808";
       const char lex_v_ran64_iv_1[]="+9223372036854775808";
  @@ -1825,7 +1828,7 @@
   
    ***/
   
  -    const char data_rawstr_1[]="+12345";
  +    const char data_rawstr_1[]="    +12345   \n";
       const char data_canrep_1[]="12345";
       const char data_rawstr_2[]="00012345";
       const char data_canrep_2[]="12345";
  @@ -1953,7 +1956,7 @@
       const XSValue::DataType dt = XSValue::dt_int; 
       bool  toValidate = true;
   
  -    const char lex_v_ran_v_0[]="1234";
  +    const char lex_v_ran_v_0[]="    1234     \n";
   
       const char lex_v_ran_v_1[]="+2147483647";
       const char lex_v_ran_v_2[]="-2147483648";
  @@ -1982,7 +1985,7 @@
    *
    ***/
   
  -    const char data_rawstr_1[]="+12345";
  +    const char data_rawstr_1[]="    +12345  \n";
       const char data_canrep_1[]="12345";
       const char data_rawstr_2[]="00012345";
       const char data_canrep_2[]="12345";
  @@ -2106,7 +2109,7 @@
       const XSValue::DataType dt = XSValue::dt_short; 
       bool  toValidate = true;
   
  -    const char lex_v_ran_v_0[]="1234";
  +    const char lex_v_ran_v_0[]="    1234    \n";
   
       const char lex_v_ran_v_1[]="+32767";
       const char lex_v_ran_v_2[]="-32768";
  @@ -2136,7 +2139,7 @@
    *
    ***/
   
  -    const char data_rawstr_1[]="+12345";
  +    const char data_rawstr_1[]="   +12345   \n";
       const char data_canrep_1[]="12345";
       const char data_rawstr_2[]="00012345";
       const char data_canrep_2[]="12345";
  @@ -2260,7 +2263,7 @@
       const XSValue::DataType dt = XSValue::dt_byte; 
       bool  toValidate = true;
   
  -    const char lex_v_ran_v_0[]="12";
  +    const char lex_v_ran_v_0[]="   12   \n";
   
       const char lex_v_ran_v_1[]="+127";
       const char lex_v_ran_v_2[]="-128";
  @@ -2290,7 +2293,7 @@
    *
    ***/
     
  -    const char data_rawstr_1[]="+123";
  +    const char data_rawstr_1[]="   +123   \n";
       const char data_canrep_1[]="123";
       const char data_rawstr_2[]="000123";
       const char data_canrep_2[]="123";
  @@ -2411,7 +2414,7 @@
       const XSValue::DataType dt = XSValue::dt_nonNegativeInteger; 
       bool  toValidate = true;
   
  -    const char lex_v_ran_v_1[]="1234";
  +    const char lex_v_ran_v_1[]="   1234   \n";
       const char lex_v_ran_iv_1[]="-1";
   
       const char lex_v_ran64_v_2[]="+18446744073709551615";
  @@ -2443,7 +2446,7 @@
    *
    ***/
   
  -    const char data_rawstr_1[]="0";
  +    const char data_rawstr_1[]="   0    \n";
       const char data_canrep_1[]="0";
       const char data_rawstr_2[]="+00012345";
       const char data_canrep_2[]="12345";
  @@ -2559,7 +2562,7 @@
       const XSValue::DataType dt = XSValue::dt_unsignedLong; 
       bool  toValidate = true;
   
  -    const char lex_v_ran_v_1[]="1234";
  +    const char lex_v_ran_v_1[]="    1234   \n";
       const char lex_v_ran64_v_1[]="+18446744073709551615";
       const char lex_v_ran64_v_2[]="0";
       const char lex_v_ran64_iv_1[]="+18446744073709551616";
  @@ -2596,7 +2599,7 @@
   
    ***/
   
  -    const char data_rawstr_1[]="+12345";
  +    const char data_rawstr_1[]="    +12345   \n";
       const char data_canrep_1[]="12345";
       const char data_rawstr_2[]="00012345";
       const char data_canrep_2[]="12345";
  @@ -2725,7 +2728,7 @@
       const XSValue::DataType dt = XSValue::dt_unsignedInt; 
       bool  toValidate = true;
   
  -    const char lex_v_ran_v_0[]="1234";
  +    const char lex_v_ran_v_0[]="   1234   \n";
   
       const char lex_v_ran_v_1[]="+4294967295";
       const char lex_v_ran_v_2[]="0";
  @@ -2753,7 +2756,7 @@
    *
    ***/
   
  -    const char data_rawstr_1[]="+12345";
  +    const char data_rawstr_1[]="   +12345   \n";
       const char data_canrep_1[]="12345";
       const char data_rawstr_2[]="00012345";
       const char data_canrep_2[]="12345";
  @@ -2875,7 +2878,7 @@
       const XSValue::DataType dt = XSValue::dt_unsignedShort; 
       bool  toValidate = true;
   
  -    const char lex_v_ran_v_0[]="1234";
  +    const char lex_v_ran_v_0[]="    1234  \n";
   
       const char lex_v_ran_v_1[]="+65535";
       const char lex_v_ran_v_2[]="0";
  @@ -2903,7 +2906,7 @@
    *
    ***/
   
  -    const char data_rawstr_1[]="+12345";
  +    const char data_rawstr_1[]="    +12345   \n";
       const char data_canrep_1[]="12345";
       const char data_rawstr_2[]="00012345";
       const char data_canrep_2[]="12345";
  @@ -3025,7 +3028,7 @@
       const XSValue::DataType dt = XSValue::dt_unsignedByte; 
       bool  toValidate = true;
   
  -    const char lex_v_ran_v_0[]="123";
  +    const char lex_v_ran_v_0[]="   123   \n";
   
       const char lex_v_ran_v_1[]="+255";
       const char lex_v_ran_v_2[]="0";
  @@ -3053,7 +3056,7 @@
    *
    ***/
   
  -    const char data_rawstr_1[]="+123";
  +    const char data_rawstr_1[]="   +123  \n";
       const char data_canrep_1[]="123";
       const char data_rawstr_2[]="000123";
       const char data_canrep_2[]="123";
  @@ -3174,7 +3177,7 @@
       const XSValue::DataType dt = XSValue::dt_positiveInteger; 
       bool  toValidate = true;
   
  -    const char lex_v_ran_v_1[]="1234";
  +    const char lex_v_ran_v_1[]="   1234   \n";
       const char lex_v_ran_iv_1[]="0";
   
       const char lex_v_ran64_v_2[]="+18446744073709551615";
  @@ -3205,7 +3208,7 @@
    *
    ***/
   
  -    const char data_rawstr_1[]="+1";
  +    const char data_rawstr_1[]="  +1  \n";
       const char data_canrep_1[]="1";
       const char data_rawstr_2[]="+00012345";
       const char data_canrep_2[]="12345";
  @@ -3319,7 +3322,7 @@
       const XSValue::DataType dt = XSValue::dt_boolean; 
       bool  toValidate = true;
   
  -    const char lex_v_1[]="1";
  +    const char lex_v_1[]="  1  \n";
       const char lex_v_2[]="0";
       const char lex_v_3[]="true";
       const char lex_v_4[]="false";
  @@ -3437,7 +3440,7 @@
       const XSValue::DataType dt = XSValue::dt_hexBinary; 
       bool  toValidate = true;
   
  -    const char lex_v_1[]="0fb7";
  +    const char lex_v_1[]="   0fb7  \n";
       const char lex_v_2[]="1234";
   
       const char lex_iv_1[]="0gb7";
  @@ -3555,7 +3558,7 @@
       const XSValue::DataType dt = XSValue::dt_base64Binary; 
       bool  toValidate = true;
   
  -    const char lex_v_1[]="134x cv56 gui0";
  +    const char lex_v_1[]="  134x cv56 gui0   \n";
       const char lex_v_2[]="wxtz 8e4k";
   
       const char lex_iv_2[]="134xcv56gui";
  @@ -3681,7 +3684,7 @@
       const XSValue::DataType dt = XSValue::dt_duration; 
       bool  toValidate = true;
   
  -    const char v_1[]="P1Y1M1DT1H1M1S";
  +    const char v_1[]="   P1Y1M1DT1H1M1S   \n";
       const char v_2[]="P1Y1M1DT23H59M59S";
       const char v_3[]="P1Y1M1DT23H";
   
  @@ -3816,7 +3819,7 @@
       const XSValue::DataType dt = XSValue::dt_date; 
       bool  toValidate = true;
   
  -    const char v_1[]="1991-05-31";
  +    const char v_1[]="   1991-05-31   \n";
       const char v_2[]="9999-06-30";
       const char v_3[]="99991-07-31";
   
  @@ -3953,7 +3956,7 @@
       const XSValue::DataType dt = XSValue::dt_gYearMonth; 
       bool  toValidate = true;
   
  -    const char v_1[]="20000-02";
  +    const char v_1[]="   20000-02   \n";
       const char v_2[]="0200-11";
       const char v_3[]="2000-02";
   
  @@ -4089,7 +4092,7 @@
       const XSValue::DataType dt = XSValue::dt_gYear; 
       bool  toValidate = true;
   
  -    const char v_1[]="0001";
  +    const char v_1[]="   0001  \n";
       const char v_2[]="9999";
       const char v_3[]="-1999";
   
  @@ -4226,7 +4229,7 @@
       const XSValue::DataType dt = XSValue::dt_gMonthDay; 
       bool  toValidate = true;
   
  -    const char v_1[]="--01-31";
  +    const char v_1[]="   --01-31   \n";
       const char v_2[]="--03-31";
       const char v_3[]="--04-01";
   
  @@ -4362,7 +4365,7 @@
       const XSValue::DataType dt = XSValue::dt_gDay; 
       bool  toValidate = true;
   
  -    const char v_1[]="---31";
  +    const char v_1[]="   ---31   \n";
       const char v_2[]="---01";
       const char v_3[]="---28";
   
  @@ -4499,7 +4502,7 @@
       const XSValue::DataType dt = XSValue::dt_gMonth; 
       bool  toValidate = true;
   
  -    const char v_1[]="--02";
  +    const char v_1[]="   --02   \n";
       const char v_2[]="--10";
       const char v_3[]="--12";
   
  @@ -4636,7 +4639,7 @@
       const XSValue::DataType dt = XSValue::dt_dateTime; 
       bool  toValidate = true;
   
  -    const char v_1[]="2000-12-31T23:59:59.00389";
  +    const char v_1[]="   2000-12-31T23:59:59.00389  \n";
       const char v_2[]="2000-10-01T11:10:20+06:00";
       const char v_3[]="2000-10-01T11:10:20-06:00";
   
  @@ -4802,7 +4805,7 @@
       const XSValue::DataType dt = XSValue::dt_time; 
       bool  toValidate = true;
   
  -    const char v_1[]="23:59:59.38900";
  +    const char v_1[]="   23:59:59.38900   \n";
       const char v_2[]="24:00:00";
       const char v_3[]="23:59:59";
   
  @@ -5045,7 +5048,7 @@
       const XSValue::DataType dt = XSValue::dt_anyURI; 
       bool  toValidate = true;
   
  -    const char v_1[]="http://www.schemaTest.org/IBMd3_2_17v01";
  +    const char v_1[]="  http://www.schemaTest.org/IBMd3_2_17v01  \n";
       const char v_2[]="gopher://spinaltap.micro.umn.edu/00/Weather/California/Los%20Angeles";
       const char v_3[]="ftp://www.noNamespace.edu";
   
  @@ -5161,7 +5164,7 @@
       const XSValue::DataType dt = XSValue::dt_QName; 
       bool  toValidate = true;
   
  -    const char v_1[]="Ant:Eater";
  +    const char v_1[]="   Ant:Eater  \n";
       const char v_2[]="Minimum_Length";
       const char v_3[]="abcde:a2345";
   
  @@ -5277,7 +5280,7 @@
       const XSValue::DataType dt = XSValue::dt_NOTATION; 
       bool  toValidate = true;
   
  -    const char v_1[]="http://www.ibm.com/test:notation1";
  +    const char v_1[]="   http://www.ibm.com/test:notation1  \n";
       const char iv_1[]="invaliduri:notation2";
   
       XSValue::XSValue_Data act_v_ran_v_1;  act_v_ran_v_1.fValue.f_strVal = 0;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org