Minor corrections to make dist after reports

[wxWidgets.git] / tests / strings / vararg.cpp

diff --git a/tests/strings/vararg.cpp b/tests/strings/vararg.cpp
index de259e3534696169944f2250649287af1484a82a..1cc62ba3f0dec6459d9d72544e838b1f09699d49 100644 (file)
--- a/tests/strings/vararg.cpp
+++ b/tests/strings/vararg.cpp
@@ -36,17 +36,21 @@ public:
 private:
     CPPUNIT_TEST_SUITE( VarArgTestCase );
         CPPUNIT_TEST( StringPrintf );
 private:
     CPPUNIT_TEST_SUITE( VarArgTestCase );
         CPPUNIT_TEST( StringPrintf );

+        CPPUNIT_TEST( CharPrintf );

 #if wxUSE_STD_STRING
         CPPUNIT_TEST( StdString );
 #endif
         CPPUNIT_TEST( Sscanf );
 #if wxUSE_STD_STRING
         CPPUNIT_TEST( StdString );
 #endif
         CPPUNIT_TEST( Sscanf );

+        CPPUNIT_TEST( RepeatedPrintf );

     CPPUNIT_TEST_SUITE_END();
 
     void StringPrintf();
     CPPUNIT_TEST_SUITE_END();
 
     void StringPrintf();

+    void CharPrintf();

 #if wxUSE_STD_STRING
     void StdString();
 #endif
     void Sscanf();
 #if wxUSE_STD_STRING
     void StdString();
 #endif
     void Sscanf();

+    void RepeatedPrintf();

 
     DECLARE_NO_COPY_CLASS(VarArgTestCase)
 };
 
     DECLARE_NO_COPY_CLASS(VarArgTestCase)
 };


@@ -91,7 +95,42 @@ void VarArgTestCase::StringPrintf()
     // literal:
     bool cond = true;
     s2.Printf(_T("foo %s"), !cond ? s.c_str() : _T("bar"));
     // literal:
     bool cond = true;
     s2.Printf(_T("foo %s"), !cond ? s.c_str() : _T("bar"));

+}

 
 

+void VarArgTestCase::CharPrintf()
+{
+    wxString foo("foo");
+    wxString s;
+
+    // test using wchar_t:
+    s.Printf("char=%c", L'c');
+    CPPUNIT_ASSERT_EQUAL( "char=c", s );
+
+    // test wxUniCharRef:
+    s.Printf("string[1] is %c", foo[1]);
+    CPPUNIT_ASSERT_EQUAL( "string[1] is o", s );
+
+    // test char
+    char c = 'z';
+    s.Printf("%c to %c", 'a', c);
+    CPPUNIT_ASSERT_EQUAL( "a to z", s );
+
+    // test char used as integer:
+    #ifdef _MSC_VER
+        #pragma warning(disable:4305) // truncation of constant value in VC6
+        #pragma warning(disable:4309) // truncation of constant value
+    #endif
+    c = 240;
+    #ifdef _MSC_VER
+        #pragma warning(default:4305) // truncation of constant value in VC6
+        #pragma warning(default:4309)
+    #endif
+    s.Printf("value is %i (int)", c);
+    CPPUNIT_ASSERT_EQUAL( wxString("value is -16 (int)"), s );
+
+    unsigned char u = 240;
+    s.Printf("value is %i (int)", u);
+    CPPUNIT_ASSERT_EQUAL( "value is 240 (int)", s );

 }
 
 #if wxUSE_STD_STRING
 }
 
 #if wxUSE_STD_STRING


@@ -104,10 +143,10 @@ void VarArgTestCase::StdString()
     std::string wc("widechar");
 
     s.Printf("string %s(%i).", mb, 1);
     std::string wc("widechar");
 
     s.Printf("string %s(%i).", mb, 1);

-    CPPUNIT_ASSERT( s == "string multi-byte(1)." );
+    CPPUNIT_ASSERT_EQUAL( "string multi-byte(1).", s );

 
     s.Printf("string %s(%i).", wc, 2);
 
     s.Printf("string %s(%i).", wc, 2);

-    CPPUNIT_ASSERT( s == "string widechar(2)." );
+    CPPUNIT_ASSERT_EQUAL( "string widechar(2).", s );

 }
 #endif // wxUSE_STD_STRING
 
 }
 #endif // wxUSE_STD_STRING
 


@@ -128,3 +167,19 @@ void VarArgTestCase::Sscanf()
     CPPUNIT_ASSERT( i == 42 );
     CPPUNIT_ASSERT( wxStrcmp(wstr, "test") == 0 );
 }
     CPPUNIT_ASSERT( i == 42 );
     CPPUNIT_ASSERT( wxStrcmp(wstr, "test") == 0 );
 }

+
+void VarArgTestCase::RepeatedPrintf()
+{
+    wxCharBuffer buffer(2);
+    char *p = buffer.data();
+    *p = 'h';
+    p++;
+    *p = 'i';
+
+    wxString s;
+    s = wxString::Format("buffer %s, len %d", buffer, wxStrlen(buffer));
+    CPPUNIT_ASSERT_EQUAL("buffer hi, len 2", s);
+
+    s = wxString::Format("buffer %s, len %d", buffer, wxStrlen(buffer));
+    CPPUNIT_ASSERT_EQUAL("buffer hi, len 2", s);
+}