formatting changes

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

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index 240849422659bc198537faaef59a06508a04e090..7795300fae7e7913eafe53e1a3f35e5fd4f8e460 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -43,8 +43,8 @@
 
 //#define TEST_ARRAYS
 //#define TEST_CHARSET
 
 //#define TEST_ARRAYS
 //#define TEST_CHARSET

-//#define TEST_CMDLINE
-#define TEST_DATETIME
+#define TEST_CMDLINE
+//#define TEST_DATETIME

 //#define TEST_DIR
 //#define TEST_DLLLOADER
 //#define TEST_ENVIRON
 //#define TEST_DIR
 //#define TEST_DLLLOADER
 //#define TEST_ENVIRON


@@ -64,7 +64,7 @@
 //#define TEST_REGCONF
 //#define TEST_REGEX
 //#define TEST_REGISTRY
 //#define TEST_REGCONF
 //#define TEST_REGEX
 //#define TEST_REGISTRY

-//#define TEST_SNGLINST
+#define TEST_SNGLINST

 //#define TEST_SOCKETS
 //#define TEST_STREAMS
 //#define TEST_STRINGS
 //#define TEST_SOCKETS
 //#define TEST_STREAMS
 //#define TEST_STRINGS


@@ -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
 


@@ -4858,13 +4904,17 @@ int main(int argc, char **argv)
 #ifdef TEST_CMDLINE
     static const wxCmdLineEntryDesc cmdLineDesc[] =
     {
 #ifdef TEST_CMDLINE
     static const wxCmdLineEntryDesc cmdLineDesc[] =
     {

+        { wxCMD_LINE_SWITCH, _T("h"), _T("help"), "show this help message",
+            wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },

         { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" },
         { wxCMD_LINE_SWITCH, "q", "quiet",   "be quiet" },
 
         { wxCMD_LINE_OPTION, "o", "output",  "output file" },
         { wxCMD_LINE_OPTION, "i", "input",   "input dir" },
         { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" },
         { wxCMD_LINE_SWITCH, "q", "quiet",   "be quiet" },
 
         { wxCMD_LINE_OPTION, "o", "output",  "output file" },
         { wxCMD_LINE_OPTION, "i", "input",   "input dir" },

-        { wxCMD_LINE_OPTION, "s", "size",    "output block size", wxCMD_LINE_VAL_NUMBER },
-        { wxCMD_LINE_OPTION, "d", "date",    "output file date", wxCMD_LINE_VAL_DATE },
+        { wxCMD_LINE_OPTION, "s", "size",    "output block size",
+            wxCMD_LINE_VAL_NUMBER },
+        { wxCMD_LINE_OPTION, "d", "date",    "output file date",
+            wxCMD_LINE_VAL_DATE },

 
         { wxCMD_LINE_PARAM,  NULL, NULL, "input file",
             wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE },
 
         { wxCMD_LINE_PARAM,  NULL, NULL, "input file",
             wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE },


@@ -5084,8 +5134,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


@@ -5105,8 +5156,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