X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/105260e89ff48167ed02b36fe162ba95375b3dd6..a25a17732c2d4d34d5d35a5318053dd8c6e29722:/tests/strings/crt.cpp?ds=inline

diff --git a/tests/strings/crt.cpp b/tests/strings/crt.cpp
index 70ad0d9fed..e4e69caa16 100644
--- a/tests/strings/crt.cpp
+++ b/tests/strings/crt.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Created:     2004-06-03
 // RCS-ID:      $Id$
-// Copyright:   (c) 2004 Vaclav Slavik 
+// Copyright:   (c) 2004 Vaclav Slavik
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -48,6 +48,7 @@ private:
         CPPUNIT_TEST( Strspn );
         CPPUNIT_TEST( Strcspn );
         CPPUNIT_TEST( Strpbrk );
+        CPPUNIT_TEST( Strnlen );
     CPPUNIT_TEST_SUITE_END();
 
     void SetGetEnv();
@@ -55,6 +56,7 @@ private:
     void Strspn();
     void Strcspn();
     void Strpbrk();
+    void Strnlen();
 
     DECLARE_NO_COPY_CLASS(CrtTestCase)
 };
@@ -67,15 +69,24 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( CrtTestCase, "CrtTestCase" );
 
 void CrtTestCase::SetGetEnv()
 {
+#define TESTVAR_NAME _T("WXTESTVAR")
+
     wxString val;
-    wxSetEnv(_T("TESTVAR"), _T("value"));
-    CPPUNIT_ASSERT( wxGetEnv(_T("TESTVAR"), &val) == true );
-    CPPUNIT_ASSERT( val == _T("value") );
-    wxSetEnv(_T("TESTVAR"), _T("something else"));
-    CPPUNIT_ASSERT( wxGetEnv(_T("TESTVAR"), &val) );
-    CPPUNIT_ASSERT( val == _T("something else") );
-    CPPUNIT_ASSERT( wxUnsetEnv(_T("TESTVAR")) );
-    CPPUNIT_ASSERT( wxGetEnv(_T("TESTVAR"), NULL) == false );
+    wxSetEnv(TESTVAR_NAME, _T("value"));
+    CPPUNIT_ASSERT( wxGetEnv(TESTVAR_NAME, &val) );
+    CPPUNIT_ASSERT_EQUAL( "value", val );
+    CPPUNIT_ASSERT_EQUAL( "value", wxString(wxGetenv(TESTVAR_NAME)) );
+
+    wxSetEnv(TESTVAR_NAME, _T("something else"));
+    CPPUNIT_ASSERT( wxGetEnv(TESTVAR_NAME, &val) );
+    CPPUNIT_ASSERT_EQUAL( "something else", val );
+    CPPUNIT_ASSERT_EQUAL( "something else", wxString(wxGetenv(TESTVAR_NAME)) );
+
+    CPPUNIT_ASSERT( wxUnsetEnv(TESTVAR_NAME) );
+    CPPUNIT_ASSERT( !wxGetEnv(TESTVAR_NAME, NULL) );
+    CPPUNIT_ASSERT( !wxGetenv(TESTVAR_NAME) );
+
+#undef TESTVAR_NAME
 }
 
 void CrtTestCase::Strcmp()
@@ -205,7 +216,40 @@ void CrtTestCase::Strpbrk()
     CPPUNIT_ASSERT_EQUAL(  ',', *wxStrpbrk(strWX.c_str(), s.mb_str()) );
     CPPUNIT_ASSERT_EQUAL( L',', *wxStrpbrk(strWX.c_str(), s.wc_str()) );
 
-    CPPUNIT_ASSERT_EQUAL( (const char *)NULL, wxStrpbrk(strWX, "xyz") );
-    CPPUNIT_ASSERT_EQUAL( (const wchar_t *)NULL, wxStrpbrk(strWX.c_str(), L"xyz") );
+    CPPUNIT_ASSERT( !wxStrpbrk(strWX, "xyz") );
+    CPPUNIT_ASSERT( !wxStrpbrk(strWX.c_str(), L"xyz") );
 }
 
+void CrtTestCase::Strnlen()
+{
+    // other misc tests for wxStrnlen(const char*, size_t)
+
+    CPPUNIT_ASSERT_EQUAL(  (size_t)0, wxStrnlen("", 0) );
+    CPPUNIT_ASSERT_EQUAL(  (size_t)0, wxStrnlen("", 8) );
+    CPPUNIT_ASSERT_EQUAL(  (size_t)0, wxStrnlen("1234", 0) );
+    CPPUNIT_ASSERT_EQUAL(  (size_t)2, wxStrnlen("1234", 2) );
+    CPPUNIT_ASSERT_EQUAL(  (size_t)4, wxStrnlen("1234", 8) );
+    CPPUNIT_ASSERT_EQUAL(  (size_t)7, wxStrnlen("1234567", 8) );
+    CPPUNIT_ASSERT_EQUAL(  (size_t)8, wxStrnlen("12345678", 8) );
+    CPPUNIT_ASSERT_EQUAL(  (size_t)8, wxStrnlen("123456789", 8) );
+    CPPUNIT_ASSERT_EQUAL(  (size_t)9, wxStrnlen("123456789", 12) );
+
+    // other misc tests for wxStrnlen(const wchar_t*, size_t)
+
+    CPPUNIT_ASSERT_EQUAL(  (size_t)0, wxStrnlen(L"", 0) );
+    CPPUNIT_ASSERT_EQUAL(  (size_t)0, wxStrnlen(L"", 8) );
+    CPPUNIT_ASSERT_EQUAL(  (size_t)0, wxStrnlen(L"1234", 0) );
+    CPPUNIT_ASSERT_EQUAL(  (size_t)2, wxStrnlen(L"1234", 2) );
+    CPPUNIT_ASSERT_EQUAL(  (size_t)4, wxStrnlen(L"1234", 8) );
+    CPPUNIT_ASSERT_EQUAL(  (size_t)7, wxStrnlen(L"1234567", 8) );
+    CPPUNIT_ASSERT_EQUAL(  (size_t)8, wxStrnlen(L"12345678", 8) );
+    CPPUNIT_ASSERT_EQUAL(  (size_t)8, wxStrnlen(L"123456789", 8) );
+    CPPUNIT_ASSERT_EQUAL(  (size_t)9, wxStrnlen(L"123456789", 12) );
+
+    // wxStrlen() is only for NULL-terminated strings:
+    CPPUNIT_ASSERT_EQUAL(  (size_t)4, wxStrnlen("1234" "\0" "78", 12) );
+    CPPUNIT_ASSERT_EQUAL(  (size_t)4, wxStrnlen(L"1234" L"\0" L"5678", 12) );
+}
+
+
+