Changeset 105 for trunk/MFCtooling/replay/LogParser.cpp

Timestamp:

07/05/11 13:04:29 (13 years ago)

Author:

sherbold

Message:

+ added test verdict pass/fail, including error message and the number of the message in the session at which the verdict was set
+ added result file; location is a parameter when calling the application
+ added test arbiter: if the target of a message cannot be determined correctly, the session fails

File:

• trunk/MFCtooling/replay/LogParser.cpp (modified) (4 diffs)

trunk/MFCtooling/replay/LogParser.cpp

@@ -6 +6 @@
 #include "WindowFinder.h"
 
-LogParser::LogParser(_TCHAR* runCommand, unsigned int startupTime, bool useDefaultDelay) : runCommand(runCommand), startupTime(startupTime), useDefaultDelay(useDefaultDelay)
+LogParser::LogParser(_TCHAR* runCommand, unsigned int startupTime, TestResults * results, bool useDefaultDelay) : runCommand(runCommand), startupTime(startupTime), results(results), useDefaultDelay(useDefaultDelay)
 {
         
@@ -28 +28 @@
         std::wstring localName(pwchLocalName);
         if( localName.compare(L"session")==0 ) {
-                std::wstring sessionId = GetAttributeValue(pAttributes, L"id", L"");
+                sessionId = GetAttributeValue(pAttributes, L"id", L"");
                 std::wcout << L"================================================" << std::endl;
                 std::wcout << L"starting session " << sessionId << std::endl;
+                result.sessionPass = true;
+                result.errorMessage = L"";
+                result.msgNumber = 0;
+                currentMessage = 0;
                 std::wcout << L"executing " << runCommand << std::endl;
                 PROCESS_INFORMATION pi;
@@ -90 +94 @@
         if( localName.compare(L"session")==0 ) {
                 std::wcout << L"session completed" << std::endl;
+                results->addResult(sessionId, result);
                 BOOL retVal = TerminateProcess(hProcess, 0);
                 if( retVal!=0 ) {
@@ -97 +102 @@
         } 
         else if( localName.compare(L"msg")==0 ) {
+                currentMessage++;
                 WindowFinder finder;
                 HWND hwnd = finder.find(currentWindow);
+                // check if window was found, if not test has failed
+                if( result.sessionPass ) {
+                        result.sessionPass = false;
+                        result.errorMessage = finder.getErrorMessage();
+                        result.msgNumber = currentMessage;
+                }
+
                 sendMessage(hwnd);
                 deleteWindowData(currentWindow);