Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use single quotes in wxMarkupText unit test to work around VC6 bug.

Browse Source 
VC6 seems to have a strange bug with escaped quotes used in strings passed to
macros and failed to compile the original code with nonsensical error messages.

Use single quotes to try to work around this issue. They are also somewhat
more readable as they don't need to be escaped inside C strings.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-02-27 18:36:55 +00:00
parent 036718302c
commit d44bc7333a
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/controls/markuptest.cpp
View File

@@ -86,13 +86,13 @@ void MarkupTestCase::RoundTrip()
m_text << "<span"; m_text << "<span";
if ( !attrs.m_fgCol.empty() ) if ( !attrs.m_fgCol.empty() )
m_text << " foreground=\"" << attrs.m_fgCol << "\""; m_text << " foreground='" << attrs.m_fgCol << "'";
if ( !attrs.m_bgCol.empty() ) if ( !attrs.m_bgCol.empty() )
m_text << " background=\"" << attrs.m_bgCol << "\""; m_text << " background='" << attrs.m_bgCol << "'";
if ( !attrs.m_fontFace.empty() ) if ( !attrs.m_fontFace.empty() )
m_text << " face=\"" << attrs.m_fontFace << "\""; m_text << " face='" << attrs.m_fontFace << "'";
wxString size; wxString size;
switch ( attrs.m_sizeKind ) switch ( attrs.m_sizeKind )
@@ -125,7 +125,7 @@ void MarkupTestCase::RoundTrip()
} }
if ( !size.empty() ) if ( !size.empty() )
m_text << " size=\"" << size << '"'; m_text << " size='" << size << '\'';
// TODO: Handle the rest of attributes. // TODO: Handle the rest of attributes.
@@ -162,17 +162,17 @@ void MarkupTestCase::RoundTrip()
CHECK_PARSES_OK( "foo" ); CHECK_PARSES_OK( "foo" );
CHECK_PARSES_OK( "foo<b>bar</b>" ); CHECK_PARSES_OK( "foo<b>bar</b>" );
CHECK_PARSES_OK( "1<big>2<small>3</small>4<big>5</big></big>6" ); CHECK_PARSES_OK( "1<big>2<small>3</small>4<big>5</big></big>6" );
CHECK_PARSES_OK( "first <span foreground=\"red\">second</span> last" ); CHECK_PARSES_OK( "first <span foreground='red'>second</span> last" );
CHECK_PARSES_OK( "first <span foreground=\"red\" " CHECK_PARSES_OK( "first <span foreground='red' "
"background=\"#ffffff\">second </span> last" ); "background='#ffffff'>second </span> last" );
CHECK_PARSES_OK( "<span size=\"10240\">10pt</span>" ); CHECK_PARSES_OK( "<span size='10240'>10pt</span>" );
CHECK_PARSES_OK( "<span size=\"x-small\">much smaller</span>" ); CHECK_PARSES_OK( "<span size='x-small'>much smaller</span>" );
CHECK_PARSES_OK( "<span size=\"larger\">larger</span>" ); CHECK_PARSES_OK( "<span size='larger'>larger</span>" );
CHECK_PARSES_OK CHECK_PARSES_OK
( (
"<u>Please</u> notice: <i><b>any</b></i> <span foreground=\"grey\">" "<u>Please</u> notice: <i><b>any</b></i> <span foreground='grey'>"
"<s><tt>bugs</tt></s></span> in this code are <span foreground=\"red\" " "<s><tt>bugs</tt></s></span> in this code are <span foreground='red' "
"size=\"xx-large\">NOT</span> allowed." "size='xx-large'>NOT</span> allowed."
); );
CHECK_PARSES_OK( "foo&bar" ); CHECK_PARSES_OK( "foo&bar" );
@@ -208,12 +208,12 @@ void MarkupTestCase::Strip()
CHECK_STRIP( "foo", "foo" ); CHECK_STRIP( "foo", "foo" );
CHECK_STRIP( "&lt;foo&gt;", "<foo>" ); CHECK_STRIP( "&lt;foo&gt;", "<foo>" );
CHECK_STRIP( "<b>Big</b> problem", "Big problem" ); CHECK_STRIP( "<b>Big</b> problem", "Big problem" );
CHECK_STRIP( "<span foreground=\"red\">c</span>" CHECK_STRIP( "<span foreground='red'>c</span>"
"<span background=\"green\">o</span>" "<span background='green'>o</span>"
"<span background=\"blue\">l</span>" "<span background='blue'>l</span>"
"<span background=\"green\">o</span>" "<span background='green'>o</span>"
"<span foreground=\"yellow\">u</span>" "<span foreground='yellow'>u</span>"
"<span background=\"green\">r</span>", "<span background='green'>r</span>",
"colour" ); "colour" );
#undef CHECK_STRIP #undef CHECK_STRIP