fix for wxExecute(subprocess which produces a lot of output) bug

[wxWidgets.git] / samples / console / console.cpp

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index 67a1b7f2b2ed7b71c7dc2ac92f18b795af27ddd9..f7f43fc2ea04270a6b01d316b47268d251ca4399 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -54,7 +54,7 @@
 //#define TEST_FILENAME
 //#define TEST_FTP
 //#define TEST_HASH
 //#define TEST_FILENAME
 //#define TEST_FTP
 //#define TEST_HASH

-//#define TEST_INFO_FUNCTIONS
+#define TEST_INFO_FUNCTIONS

 //#define TEST_LIST
 //#define TEST_LOCALE
 //#define TEST_LOG
 //#define TEST_LIST
 //#define TEST_LOCALE
 //#define TEST_LOG


@@ -62,7 +62,7 @@
 //#define TEST_MIME
 //#define TEST_PATHLIST
 //#define TEST_REGCONF
 //#define TEST_MIME
 //#define TEST_PATHLIST
 //#define TEST_REGCONF

-#define TEST_REGEX
+//#define TEST_REGEX

 //#define TEST_REGISTRY
 //#define TEST_SNGLINST
 //#define TEST_SOCKETS
 //#define TEST_REGISTRY
 //#define TEST_SNGLINST
 //#define TEST_SOCKETS


@@ -1364,6 +1364,35 @@ static void TestMimeAssociate()
 
 #include <wx/utils.h>
 
 
 #include <wx/utils.h>
 

+static void TestDiskInfo()
+{
+    puts("*** Testing wxGetDiskSpace() ***");
+
+    for ( ;; )
+    {
+        char pathname[128];
+        printf("\nEnter a directory name: ");
+        if ( !fgets(pathname, WXSIZEOF(pathname), stdin) )
+            break;
+
+        // kill the last '\n'
+        pathname[strlen(pathname) - 1] = 0;
+
+        wxLongLong total, free;
+        if ( !wxGetDiskSpace(pathname, &total, &free) )
+        {
+            wxPuts(_T("ERROR: wxGetDiskSpace failed."));
+        }
+        else
+        {
+            wxPrintf(_T("%sKb total, %sKb free on '%s'.\n"),
+                    (total / 1024).ToString().c_str(),
+                    (free / 1024).ToString().c_str(),
+                    pathname);
+        }
+    }
+}
+

 static void TestOsInfo()
 {
     puts("*** Testing OS info functions ***\n");
 static void TestOsInfo()
 {
     puts("*** Testing OS info functions ***\n");


@@ -1410,6 +1439,17 @@ static void TestUserInfo()
 // get a random 64 bit number
 #define RAND_LL()   MAKE_LL(rand(), rand(), rand(), rand())
 
 // get a random 64 bit number
 #define RAND_LL()   MAKE_LL(rand(), rand(), rand(), rand())
 

+static const long testLongs[] =
+{
+    0,
+    1,
+    -1,
+    LONG_MAX,
+    LONG_MIN,
+    0x1234,
+    -0x1234
+};
+

 #if wxUSE_LONGLONG_WX
 inline bool operator==(const wxLongLongWx& a, const wxLongLongNative& b)
     { return a.GetHi() == b.GetHi() && a.GetLo() == b.GetLo(); }
 #if wxUSE_LONGLONG_WX
 inline bool operator==(const wxLongLongWx& a, const wxLongLongNative& b)
     { return a.GetHi() == b.GetHi() && a.GetLo() == b.GetLo(); }


@@ -1635,17 +1675,6 @@ static void TestLongLongComparison()
 #if wxUSE_LONGLONG_WX
     puts("*** Testing wxLongLong comparison ***\n");
 
 #if wxUSE_LONGLONG_WX
     puts("*** Testing wxLongLong comparison ***\n");
 

-    static const long testLongs[] =
-    {
-        0,
-        1,
-        -1,
-        LONG_MAX,
-        LONG_MIN,
-        0x1234,
-        -0x1234
-    };
-

     static const long ls[2] =
     {
         0x1234,
     static const long ls[2] =
     {
         0x1234,


@@ -1654,7 +1683,7 @@ static void TestLongLongComparison()
 
     wxLongLongWx lls[2];
     lls[0] = ls[0];
 
     wxLongLongWx lls[2];
     lls[0] = ls[0];

-    lls[1] = ls[1]; 
+    lls[1] = ls[1];

 
     for ( size_t n = 0; n < WXSIZEOF(testLongs); n++ )
     {
 
     for ( size_t n = 0; n < WXSIZEOF(testLongs); n++ )
     {


@@ -1681,6 +1710,23 @@ static void TestLongLongComparison()
 #endif // wxUSE_LONGLONG_WX
 }
 
 #endif // wxUSE_LONGLONG_WX
 }
 

+static void TestLongLongPrint()
+{
+    wxPuts(_T("*** Testing wxLongLong printing ***\n"));
+
+    for ( size_t n = 0; n < WXSIZEOF(testLongs); n++ )
+    {
+        wxLongLong ll = testLongs[n];
+        wxPrintf(_T("%ld == %s\n"), testLongs[n], ll.ToString().c_str());
+    }
+
+    wxLongLong ll(0x12345678, 0x87654321);
+    wxPrintf(_T("0x1234567887654321 = %s\n"), ll.ToString().c_str());
+
+    ll.Negate();
+    wxPrintf(_T("-0x1234567887654321 = %s\n"), ll.ToString().c_str());
+}
+

 #undef MAKE_LL
 #undef RAND_LL
 
 #undef MAKE_LL
 #undef RAND_LL
 


@@ -4039,6 +4085,7 @@ static void TestTimeSpanFormat()
         _T("(with ms) %H:%M:%S:%l"),
         _T("100%% of minutes is %M"),       // test "%%"
         _T("%D days and %H hours"),
         _T("(with ms) %H:%M:%S:%l"),
         _T("100%% of minutes is %M"),       // test "%%"
         _T("%D days and %H hours"),

+        _T("or also %S seconds"),

     };
 
     wxTimeSpan ts1(1, 2, 3, 4),
     };
 
     wxTimeSpan ts1(1, 2, 3, 4),


@@ -5083,8 +5130,9 @@ int main(int argc, char **argv)
         TestAddition();
         TestLongLongConversion();
         TestBitOperations();
         TestAddition();
         TestLongLongConversion();
         TestBitOperations();

+        TestLongLongComparison();

     }
     }

-    TestLongLongComparison();
+    TestLongLongPrint();

 #endif // TEST_LONGLONG
 
 #ifdef TEST_HASH
 #endif // TEST_LONGLONG
 
 #ifdef TEST_HASH


@@ -5104,8 +5152,12 @@ int main(int argc, char **argv)
 #endif // TEST_MIME
 
 #ifdef TEST_INFO_FUNCTIONS
 #endif // TEST_MIME
 
 #ifdef TEST_INFO_FUNCTIONS

-    TestOsInfo();
-    TestUserInfo();
+    TestDiskInfo();
+    if ( 0 )
+    {
+        TestOsInfo();
+        TestUserInfo();
+    }

 #endif // TEST_INFO_FUNCTIONS
 
 #ifdef TEST_PATHLIST
 #endif // TEST_INFO_FUNCTIONS
 
 #ifdef TEST_PATHLIST