Changeset 161 for trunk/MFCtooling/replay/replay.cpp

Timestamp:

08/15/11 14:23:52 (13 years ago)

Author:

sherbold

Message:

• changed command line parsing; now uses an API that allows actual parameters, e.g., "-r result.xml". For a full description see the description in the Wiki.

File:

• trunk/MFCtooling/replay/replay.cpp (modified) (3 diffs)

trunk/MFCtooling/replay/replay.cpp

@@ -8 +8 @@
 #include <iostream>
 
+#include "options.h"
+
+const char * optv[] = {
+        "r:resultfile <string>",
+        "d:msgdelay <number>",
+        "w:wait <number>",
+        "s:startdelay <number>",
+        "p:path <string>"
+};
+
+void convertTCharToChar(const TCHAR * source, char ** dest) {
+#ifdef UNICODE
+        std::wstring wstr(source);
+    int size_needed = WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)wstr.size(), NULL, 0, NULL, NULL);
+    std::string strTo( size_needed, 0 );
+    WideCharToMultiByte                  (CP_UTF8, 0, &wstr[0], (int)wstr.size(), &strTo[0], size_needed, NULL, NULL);
+        *dest = new char[strTo.size()+1];
+        memcpy((void*)*dest, strTo.c_str(), strTo.size()+1);
+#else
+        std::string str(source);
+        *dest = new char[strTo.size()+1];
+        memcpy(*dest, strTo.c_str(), strTo.size()+1);
+#endif
+}
+
+void convertCharToTChar(const char * source, TCHAR ** dest) {
+#ifdef UNICODE
+        std::string str(source);
+        int size_needed = MultiByteToWideChar(CP_UTF8, 0, &str[0], (int)str.size(), NULL, 0);
+        std::wstring wstrTo( size_needed, 0 );
+        MultiByteToWideChar                  (CP_UTF8, 0, &str[0], (int)str.size(), &wstrTo[0], size_needed);
+        *dest = new TCHAR[wstrTo.size()+1];
+        memcpy((void*)*dest, wstrTo.c_str(), (wstrTo.size()+1)*sizeof(TCHAR));
+#else
+        std::string str(source);
+        *dest = new char[strTo.size()+1];
+        memcpy(*dest, strTo.c_str(), strTo.size()+1);
+#endif
+}
+
 int _tmain(int argc, _TCHAR* argv[])
 {
+        int optchar;
+        const char * optarg;
+
+        // set default values
+        TCHAR * resultfile = NULL;
+        int msgdelay = 0;
+        int startdelay = 5000;
+        int wait = 1;
+        TCHAR * workingPath = NULL;
+
+        int argc_char = argc-2;
+        char ** argv_char = new char*[argc_char];
+
+        // convert argv to char*[]
+        convertTCharToChar(argv[0], &argv_char[0]);
+        for( int i=3; i<argc; i++ ) {
+                convertTCharToChar(argv[i], &argv_char[i-2]);
+        }
+
+        // parse options
+        Options opts(*argv_char, optv);
+        OptArgvIter iter(--argc_char, ++argv_char);
+        while( optchar = opts(iter, optarg) ) {
+                switch(optchar) {
+                        case 'r':
+                                convertCharToTChar(optarg, &resultfile);
+                                break;
+                        case 'd':
+                                msgdelay = atoi(optarg);
+                                break;
+                        case 'w':
+                                wait = atoi(optarg);
+                                break;
+                        case 'p':
+                                convertCharToTChar(optarg, &workingPath);
+                                break;
+                        case 's':
+                                startdelay = atoi(optarg);
+                                break;
+                        default:
+                                break;
+                }
+        }
+        for( int i=0; i<argc_char; i++ ) {
+                delete[] argv_char[i];
+        }
+        //delete[] argv_char; //TODO does not work?!
+
         if (argc<4) 
         {
-                std::wcout << "Usage: " << argv[0] << "<replayfile> <applicationundertest> [<resultfile>] [<useDefaultDelay>] [<waitAfterFinish>]" << std::endl;
+                std::wcout << L"Usage: " << argv[0] << L"<replayfile> <applicationundertest> [-r <resultfile>] [-d <useDefaultDelay>] [-w <waitAfterFinish>] [-p <workingPath>] [-s <startupDelay>]" << std::endl;
                 return 0;
         }
         TCHAR * replayfile = argv[1];
         TCHAR * appUnderTest = argv[2];
-        TCHAR * resultfile = NULL;
-        bool useDefaultDelay = true;
-        int wait = 1;
-        if( argc>=4 ) {
-                TCHAR * resultfile = argv[3];
-        }
-        if( argc>=5 ) {
-                useDefaultDelay = (bool) _tstoi(argv[4]);
-        } 
-        if( argc>=6 ) {
-                wait = _tstoi(argv[5]);
-        }
 
         // initialize COM library for the current thread
@@ -45 +121 @@
                 TestResults results(replayfile);
                 std::wcout << L"replaying sessions in " << argv[1] << std::endl;
-                LogParser * parser = new LogParser(appUnderTest, 5000, &results, useDefaultDelay);
+                LogParser * parser = new LogParser(appUnderTest, startdelay, &results, (bool) msgdelay);
                 pXMLReader->putContentHandler(parser);
                 hr = pXMLReader->parseURL(replayfile);
@@ -64 +140 @@
         }
 
+        delete resultfile;
+
         return 0;
 }