cvs commit: logging-log4cxx/tests/src/nt nteventlogappendertestcase.cpp

[carnold]

carnold     2005/03/09 09:38:25

  Modified:    tests/src/nt nteventlogappendertestcase.cpp
  Log:
  LOGCXX-67: Tweaked NTAppenderTestCase for full event logs
  
  Revision  Changes    Path
  1.4       +13 -7     
logging-log4cxx/tests/src/nt/nteventlogappendertestcase.cpp
  
  Index: nteventlogappendertestcase.cpp
  ===================================================================
  RCS file: 
/home/cvs/logging-log4cxx/tests/src/nt/nteventlogappendertestcase.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- nteventlogappendertestcase.cpp    3 Mar 2005 19:27:44 -0000       1.3
  +++ nteventlogappendertestcase.cpp    9 Mar 2005 17:38:25 -0000       1.4
  @@ -54,13 +54,15 @@
           }
   
           void testHelloWorld() {
  -           DWORD expectedCount = 1;
  +           DWORD expectedId = 1;
              HANDLE hEventLog = ::OpenEventLogW(NULL, L"log4cxx_test");
              if (hEventLog != NULL) {
  -               BOOL stat = GetNumberOfEventLogRecords(hEventLog, 
&expectedCount);
  -               CPPUNIT_ASSERT(stat);
  +               BOOL stat = GetNumberOfEventLogRecords(hEventLog, 
&expectedId);
  +               DWORD oldest;
  +               if(stat) stat = GetOldestEventLogRecord(hEventLog, &oldest);
                  CloseEventLog(hEventLog);
  -               expectedCount++;
  +               CPPUNIT_ASSERT(stat);
  +               expectedId += oldest;
              }
    
   
  @@ -80,11 +82,15 @@
               }
               hEventLog = ::OpenEventLogW(NULL, L"log4cxx_test");
               CPPUNIT_ASSERT(hEventLog != NULL);
  -            DWORD actualCount;
  -            BOOL stat = GetNumberOfEventLogRecords(hEventLog, &actualCount);
  +            DWORD actualId;
  +            BOOL stat = GetNumberOfEventLogRecords(hEventLog, &actualId);
  +            DWORD oldest;
  +            if (stat) stat = GetOldestEventLogRecord(hEventLog, &oldest);
  +            actualId += oldest;
  +            actualId--;
               CloseEventLog(hEventLog);
               CPPUNIT_ASSERT(stat);
  -            CPPUNIT_ASSERT_EQUAL(expectedCount, actualCount);
  +            CPPUNIT_ASSERT_EQUAL(expectedId, actualId);
           }
   };