Changeset 104 for trunk

Timestamp:

07/05/11 11:10:35 (13 years ago)

Author:

sherbold

Message:

• improved output in case of wrong startup parameters
• parameter for application under test now mandatory
• automatically closes application under test at the end of a session in case it is still open

+ support for multiple sessions in one replay file

Location:

trunk/MFCtooling/replay

Files:

• LogParser.cpp (modified) (4 diffs)
• LogParser.h (modified) (1 diff)
• replay.cpp (modified) (3 diffs)

trunk/MFCtooling/replay/LogParser.cpp

@@ -6 +6 @@
 #include "WindowFinder.h"
 
-LogParser::LogParser(void)
+LogParser::LogParser(_TCHAR* runCommand, unsigned int startupTime, bool useDefaultDelay) : runCommand(runCommand), startupTime(startupTime), useDefaultDelay(useDefaultDelay)
 {
         
@@ -28 +28 @@
         std::wstring localName(pwchLocalName);
         if( localName.compare(L"session")==0 ) {
-                // TODO
+                std::wstring sessionId = GetAttributeValue(pAttributes, L"id", L"");
+                std::wcout << L"================================================" << std::endl;
+                std::wcout << L"starting session " << sessionId << std::endl;
+                std::wcout << L"executing " << runCommand << std::endl;
+                PROCESS_INFORMATION pi;
+                STARTUPINFO si;
+                ZeroMemory(&pi, sizeof(pi));
+                ZeroMemory(&si, sizeof(si));
+                CreateProcess(NULL, runCommand, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
+                hProcess = pi.hProcess;
+                CloseHandle(pi.hThread);
+                std::wcout << L"waiting " << startupTime << L" ms for application under test to intialize" << std::endl;
+                Sleep(startupTime);
+                std::wcout << L"replay starting..." << std::endl;
         }
         else if( localName.compare(L"msg")==0 ) {
@@ -76 +89 @@
         std::wstring localName(pwchLocalName);
         if( localName.compare(L"session")==0 ) {
-                // TODO
+                std::wcout << L"session completed" << std::endl;
+                BOOL retVal = TerminateProcess(hProcess, 0);
+                if( retVal!=0 ) {
+                        std::wcout << L"application terminated" << std::endl;
+                }
+                CloseHandle(hProcess);
         } 
         else if( localName.compare(L"msg")==0 ) {
@@ -129 +147 @@
 
 void LogParser::sendMessage(HWND hwnd) {
-        std::wcout << L"Sending " << msgType << L" to " << hwnd << "L - LPARAM: " << lParam << L" - WPARAM: " << wParam << std::endl;
+        std::wcout << L"  Sending " << msgType << L" to " << hwnd << "L - LPARAM: " << lParam << L" - WPARAM: " << wParam << std::endl;
         PostMessage(hwnd, msgType, wParam, lParam);
-        Sleep(defaultMsgDelay);
-        //Sleep(delay);
+        if( useDefaultDelay ) {
+                Sleep(defaultMsgDelay);
+        } else {
+                Sleep(delay);
+        }
 }

trunk/MFCtooling/replay/LogParser.h

@@ -17 +17 @@
         WPARAM wParam;
 
+        boolean useDefaultDelay;
         int delay;
 
         void sendMessage(HWND hwnd);
 
+        _TCHAR * runCommand;
+        unsigned int startupTime;
+        HANDLE hProcess;
+
 public:
-        LogParser(void);
+        LogParser(_TCHAR * runCommand, unsigned int startupChar, bool useDefaultDelay = false);
         ~LogParser(void);
 

trunk/MFCtooling/replay/replay.cpp

@@ -10 +10 @@
 int _tmain(int argc, _TCHAR* argv[])
 {
-        if (argc<2) 
+        if (argc<3) 
         {
-                wprintf(L"no argument provided\n");
+                std::wcout << "Usage: " << argv[0] << "<replayfile> <applicationundertest>" << std::endl;
                 return 0;
         }
 
         // execute application to be replayed
-        if (argc>2) {
+        /*if (argc>2) {
                 std::wcout << "executing " << argv[2] << std::endl;
                 PROCESS_INFORMATION pi;
@@ -25 +25 @@
                 CreateProcess(NULL, argv[2], NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
                 Sleep(10000);
-        }
+        }*/
 
 
@@ -41 +41 @@
 
         if( !FAILED(hr) ) {
-                LogParser * parser = new LogParser();
+                std::wcout << L"replaying sessions in " << argv[1] << std::endl;
+                LogParser * parser = new LogParser(argv[2], 5000, true);
                 pXMLReader->putContentHandler(parser);
                 hr = pXMLReader->parseURL(argv[1]);
-
                 pXMLReader->Release();
+                std::wcout << L"================================================" << std::endl;
+                std::wcout << L"replay completed" << std::endl;
         }
 
         CoUninitialize();
 
-        std::wcout << "Press enter to exit ...";
+        std::wcout << L"press enter to exit ...";
         getchar();