Changeset 105

Timestamp:

07/05/11 13:04:29 (14 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

Location:

trunk/MFCtooling/replay

Files:

• LogParser.cpp (modified) (4 diffs)
• LogParser.h (modified) (2 diffs)
• TestResults.cpp (added)
• TestResults.h (added)
• WindowFinder.cpp (modified) (4 diffs)
• WindowFinder.h (modified) (2 diffs)
• replay.cpp (modified) (3 diffs)
• replay.vcproj (modified) (3 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);

trunk/MFCtooling/replay/LogParser.h

@@ -5 +5 @@
 
 #include "WindowData.h"
+#include "TestResults.h"
 
 class LogParser : public SAXContentHandlerImpl
@@ -26 +27 @@
         HANDLE hProcess;
 
+        std::wstring sessionId;
+        RESULT result;
+        unsigned int currentMessage;
+
+        TestResults * results;
+
 public:
-        LogParser(_TCHAR * runCommand, unsigned int startupChar, bool useDefaultDelay = false);
+        LogParser(_TCHAR * runCommand, unsigned int startupChar, TestResults * results, bool useDefaultDelay = false);
         ~LogParser(void);
 

trunk/MFCtooling/replay/WindowFinder.cpp

@@ -27 +27 @@
         evalPopup = false;
         parentHandles = NULL;
+        success = true;
 }
 
@@ -65 +66 @@
                 if( maxScore==0 ) {
                         std::wcerr << L"Warning: Score is zero." << std::endl;
+                        errorMessage = L"score zero";
+                        success = false;
                 }
                 result = find(winData->child);
@@ -70 +73 @@
                 if( parentHandles->size()==0 ) {
                         std::wcerr << L"Error: handle not found." << std::endl;
+                        errorMessage = L"handle not found";
                         result = NULL;
+                        success = false;
                 }
                 else {
                         if( parentHandles->size()!=1 ) {
                                 std::wcerr << L"Warning: more than one fitting window found." << std::endl;
+                                errorMessage = L"multiple matches";
+                                success = false;
                         }
                         if( maxScore==0 ) {
                                 std::wcerr << L"Warning: Score is zero." << std::endl;
+                                errorMessage = L"score zero";
+                                success = false;
                         }
                         result = (*parentHandles)[0];
@@ -125 +134 @@
         return evalPopup;
 }
+
+bool WindowFinder::successfull() {
+        return success;
+}
+
+std::wstring WindowFinder::getErrorMessage() {
+        return errorMessage;
+}

trunk/MFCtooling/replay/WindowFinder.h

@@ -20 +20 @@
         bool evalPopup;
 
+        bool success;
+
+        std::wstring errorMessage;
+
 public:
         WindowFinder(void);
@@ -30 +34 @@
         bool isCurrentPopup();
 
+        bool successfull();
+
+        std::wstring getErrorMessage();
+
 };

trunk/MFCtooling/replay/replay.cpp

@@ -12 +12 @@
         if (argc<3) 
         {
-                std::wcout << "Usage: " << argv[0] << "<replayfile> <applicationundertest>" << std::endl;
+                std::wcout << "Usage: " << argv[0] << "<replayfile> <applicationundertest> [<resultfile>]" << std::endl;
                 return 0;
         }
-
-        // execute application to be replayed
-        /*if (argc>2) {
-                std::wcout << "executing " << argv[2] << std::endl;
-                PROCESS_INFORMATION pi;
-                STARTUPINFO si;
-                ZeroMemory(&pi, sizeof(pi));
-                ZeroMemory(&si, sizeof(si));
-                CreateProcess(NULL, argv[2], NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
-                Sleep(10000);
-        }*/
-
 
         // initialize COM library for the current thread
@@ -41 +29 @@
 
         if( !FAILED(hr) ) {
+                TestResults results(argv[1]);
                 std::wcout << L"replaying sessions in " << argv[1] << std::endl;
-                LogParser * parser = new LogParser(argv[2], 5000, true);
+                LogParser * parser = new LogParser(argv[2], 5000, &results, true);
                 pXMLReader->putContentHandler(parser);
                 hr = pXMLReader->parseURL(argv[1]);
@@ -48 +37 @@
                 std::wcout << L"================================================" << std::endl;
                 std::wcout << L"replay completed" << std::endl;
+                if( argc>=4 ) {
+                        results.write(argv[3]);
+                        std::wcout << L"results written to " << argv[3] << std::endl;
+                }
         }
 

trunk/MFCtooling/replay/replay.vcproj

@@ -2 +2 @@
 <VisualStudioProject
         ProjectType="Visual C++"
-        Version="9.00"
+        Version="9,00"
         Name="replay"
         ProjectGUID="{6CDC762E-2D22-4B0F-B6CD-7F8AB432ED42}"
@@ -202 +202 @@
                         </File>
                         <File
+                                RelativePath=".\TestResults.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\WindowData.cpp"
                                 >
@@ -232 +236 @@
                         </File>
                         <File
+                                RelativePath=".\TestResults.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\WindowData.h"
                                 >