Mercurial Mercurial > oss > FCL > sf > os > osrndtools / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stif/TestEngine/src/TestEngine.cpp
branchRCL_3
changeset 14 381827f66490
parent 11 cfe32394fcd5
child 30 86a2e675b80a
equal deleted inserted replaced
12:7e287c5c61f0 14:381827f66490 
   409 
   409 
   410 -------------------------------------------------------------------------------
 
   410 -------------------------------------------------------------------------------
 
   411 */
 
   411 */
 
   412 void CTestEngineServer::ConstructL()
 
   412 void CTestEngineServer::ConstructL()
 
   413     {
 
   413     {
 
       
   414     // Create report setting
 
       
   415     iTestReportSettings = CTestReportSettings::NewL();
 
   414     // Create container
 
   416     // Create container
 
   415     iContainerIndex = CObjectConIx::NewL();
 
   417     iContainerIndex = CObjectConIx::NewL();
 
   416 
   418 
   417     // Create logger, in Wins use HTML in HW default logger
 
   419     // Create logger, in Wins use HTML in HW default logger
 
   418     TLoggerSettings loggerSettings;
 
   420     TLoggerSettings loggerSettings;
 
   503     delete iContainerIndex; 
   505     delete iContainerIndex; 
   504 
   506 
   505     __TRACE(KAlways, ( _L( "---------------- Log Ended ----------------" ) ) );
 
   507     __TRACE(KAlways, ( _L( "---------------- Log Ended ----------------" ) ) );
 
   506     delete iLogger;
 
   508     delete iLogger;
 
   507 
   509 
       
   510     delete iTestReportSettings;
 
       
   511     iTestReportSettings = NULL;
 
   508     }
 
   512     }
 
   509 
   513 
   510 /*
 
   514 /*
 
   511 -------------------------------------------------------------------------------
 
   515 -------------------------------------------------------------------------------
 
   512 
   516 
   879 
   883 
   880         delete iTestCases;
 
   884         delete iTestCases;
 
   881         iTestCases = NULL;
 
   885         iTestCases = NULL;
 
   882         }
 
   886         }
 
   883     
   887     
       
   888     iTestCaseArray.Close();    
   884     delete iTestEngineSubSessions;
 
   889     delete iTestEngineSubSessions;
 
   885     iTestEngineSubSessions = NULL;
 
   890     iTestEngineSubSessions = NULL;
 
   886 
   891 
   887     // Delete the object container
 
   892     // Delete the object container
 
   888     // This provides unique ids for the objects of this session
 
   893     // This provides unique ids for the objects of this session
 
  1232 -------------------------------------------------------------------------------
 
  1237 -------------------------------------------------------------------------------
 
  1233 */
 
  1238 */
 
  1234 void CTestEngine::InitTestReportAndLoggerVarL()
 
  1239 void CTestEngine::InitTestReportAndLoggerVarL()
 
  1235     {
 
  1240     {
 
  1236     // Test report settings initialization
 
  1241     // Test report settings initialization
 
  1237     iTestEngineServer->iTestReportSettings.iCreateTestReport = ETrue;
 
  1242     iTestEngineServer->iTestReportSettings->iCreateTestReport = ETrue;
 
  1238     _LIT( path, "C:\\LOGS\\TestFramework\\");
 
  1243     _LIT( path, "C:\\LOGS\\TestFramework\\");
 
  1239     _LIT( name, "TestReport");
 
  1244     _LIT( name, "TestReport");
 
  1240     iTestEngineServer->iTestReportSettings.iPath = path().AllocL();
 
  1245     delete iTestEngineServer->iTestReportSettings->iPath;
 
  1241     iTestEngineServer->iTestReportSettings.iName = name().AllocL();
 
  1246     iTestEngineServer->iTestReportSettings->iPath = NULL;
 
  1242     iTestEngineServer->iTestReportSettings.iFormat = CStifLogger::ETxt;
 
  1247     iTestEngineServer->iTestReportSettings->iPath = path().AllocL();
 
  1243     iTestEngineServer->iTestReportSettings.iOutput = CStifLogger::EFile;
 
  1248     delete iTestEngineServer->iTestReportSettings->iName;
 
  1244     iTestEngineServer->iTestReportSettings.iOverwrite = ETrue;
 
  1249     iTestEngineServer->iTestReportSettings->iName = NULL;
 
       
  1250     iTestEngineServer->iTestReportSettings->iName = name().AllocL();
 
       
  1251     iTestEngineServer->iTestReportSettings->iFormat = CStifLogger::ETxt;
 
       
  1252     iTestEngineServer->iTestReportSettings->iOutput = CStifLogger::EFile;
 
       
  1253     iTestEngineServer->iTestReportSettings->iOverwrite = ETrue;
 
  1245 
  1254 
  1246     // Initializations to indicator is setting in use
 
  1255     // Initializations to indicator is setting in use
 
  1247     iTestEngineServer->iLoggerSettings.iIsDefined.iCreateLogDir = EFalse;
 
  1256     iTestEngineServer->iLoggerSettings.iIsDefined.iCreateLogDir = EFalse;
 
  1248     iTestEngineServer->iLoggerSettings.iIsDefined.iPath = EFalse;
 
  1257     iTestEngineServer->iLoggerSettings.iIsDefined.iPath = EFalse;
 
  1249     iTestEngineServer->iLoggerSettings.iIsDefined.iHwPath = EFalse;
 
  1258     iTestEngineServer->iLoggerSettings.iIsDefined.iHwPath = EFalse;
 
  1368         }
 
  1377         }
 
  1369 
  1378 
  1370     Logger()->WriteDelimiter();
 
  1379     Logger()->WriteDelimiter();
 
  1371     
  1380     
  1372     // Create Test Reporter if allowed
 
  1381     // Create Test Reporter if allowed
 
  1373     if ( iTestEngineServer->iTestReportSettings.iCreateTestReport )
 
  1382     if ( iTestEngineServer->iTestReportSettings->iCreateTestReport )
 
  1374         {
 
  1383         {
 
  1375         TRAPD(err, iTestReport = 
  1384         TRAPD(err, iTestReport = 
  1376             CTestReport::NewL( iTestEngineServer->iTestReportSettings, 
  1385             CTestReport::NewL( *(iTestEngineServer->iTestReportSettings), 
  1377                                ( CTestReport::TTestReportMode ) iReportMode ));
 
  1386                                ( CTestReport::TTestReportMode ) iReportMode ));
 
  1378         if(err!=KErrNone)
 
  1387         if(err!=KErrNone)
 
  1379             {
 
  1388             {
 
  1380             iTestReport = NULL;
 
  1389             iTestReport = NULL;
 
  1381             __TRACE( KInit,( CStifLogger::ERed, _L( "Test report creation failed with error: %d, test report not created." ), err ) );
 
  1390             __TRACE( KInit,( CStifLogger::ERed, _L( "Test report creation failed with error: %d, test report not created." ), err ) );
 
  1474         get_ret = aSettings->GetBooleanSettingsL( sectionParser,
 
  1483         get_ret = aSettings->GetBooleanSettingsL( sectionParser,
 
  1475                                 _L( "CreateTestReport=" ), createTestReport );
 
  1484                                 _L( "CreateTestReport=" ), createTestReport );
 
  1476         if ( get_ret == KErrNone )
 
  1485         if ( get_ret == KErrNone )
 
  1477             {
 
  1486             {
 
  1478             __TRACE( KInit,( _L( "Test report creation indicator: %d"), createTestReport ) );
 
  1487             __TRACE( KInit,( _L( "Test report creation indicator: %d"), createTestReport ) );
 
  1479             iTestEngineServer->iTestReportSettings.iCreateTestReport = createTestReport;
 
  1488             iTestEngineServer->iTestReportSettings->iCreateTestReport = createTestReport;
 
  1480             }
 
  1489             }
 
  1481         else
 
  1490         else
 
  1482             {
 
  1491             {
 
  1483             __TRACE( KInit,( _L( "Creation indicator not found or not given" ) ) );
 
  1492             __TRACE( KInit,( _L( "Creation indicator not found or not given" ) ) );
 
  1484             }
 
  1493             }
 
  1485 
  1494 
  1486         // Get Test report path settings
 
  1495         // Get Test report path settings
 
  1487         if ( iTestEngineServer->iTestReportSettings.iCreateTestReport )
 
  1496         if ( iTestEngineServer->iTestReportSettings->iCreateTestReport )
 
  1488             {
 
  1497             {
 
  1489             __TRACE( KInit,( _L( "Parsing Test report path" ) ) );
 
  1498             __TRACE( KInit,( _L( "Parsing Test report path" ) ) );
 
  1490             TPtrC path;
 
  1499             TPtrC path;
 
  1491             get_ret = aSettings->GetFileSetting( sectionParser,
 
  1500             get_ret = aSettings->GetFileSetting( sectionParser,
 
  1492                                         _L( "TestReportFilePath=" ), path );
 
  1501                                         _L( "TestReportFilePath=" ), path );
 
  1493             if ( get_ret == KErrNone )
 
  1502             if ( get_ret == KErrNone )
 
  1494                 {
 
  1503                 {
 
  1495                 __TRACE( KInit,( _L( "Test report path: %S"), &path ) );
 
  1504                 __TRACE( KInit,( _L( "Test report path: %S"), &path ) );
 
  1496                 // Delete old one before setting new one
 
  1505                 // Delete old one before setting new one
 
  1497                 delete iTestEngineServer->iTestReportSettings.iPath;
 
  1506                 delete iTestEngineServer->iTestReportSettings->iPath;
 
  1498 				iTestEngineServer->iTestReportSettings.iPath = NULL;
 
  1507 				iTestEngineServer->iTestReportSettings->iPath = NULL;
 
  1499                 iTestEngineServer->iTestReportSettings.iPath = path.AllocL();
 
  1508                 iTestEngineServer->iTestReportSettings->iPath = path.AllocL();
 
  1500                 }
 
  1509                 }
 
  1501             else
 
  1510             else
 
  1502                 {
 
  1511                 {
 
  1503                 __TRACE( KInit,( _L( "Path not found or not given" ) ) );
 
  1512                 __TRACE( KInit,( _L( "Path not found or not given" ) ) );
 
  1504                 }
 
  1513                 }
 
  1505             }
 
  1514             }
 
  1506 
  1515 
  1507         // Get Test report name settings
 
  1516         // Get Test report name settings
 
  1508         if ( iTestEngineServer->iTestReportSettings.iCreateTestReport )
 
  1517         if ( iTestEngineServer->iTestReportSettings->iCreateTestReport )
 
  1509             {
 
  1518             {
 
  1510             __TRACE( KInit,( _L( "Parsing Test report filename" ) ) );
 
  1519             __TRACE( KInit,( _L( "Parsing Test report filename" ) ) );
 
  1511             TPtrC name;
 
  1520             TPtrC name;
 
  1512             get_ret = aSettings->GetFileSetting( sectionParser,
 
  1521             get_ret = aSettings->GetFileSetting( sectionParser,
 
  1513                                         _L( "TestReportFileName=" ), name );
 
  1522                                         _L( "TestReportFileName=" ), name );
 
  1514             if ( get_ret == KErrNone )
 
  1523             if ( get_ret == KErrNone )
 
  1515                 {
 
  1524                 {
 
  1516                 __TRACE( KInit,( _L( "Test report filename: %S"), &name ) );
 
  1525                 __TRACE( KInit,( _L( "Test report filename: %S"), &name ) );
 
  1517                 // Delete old one before setting new one
 
  1526                 // Delete old one before setting new one
 
  1518                 delete iTestEngineServer->iTestReportSettings.iName;
 
  1527                 delete iTestEngineServer->iTestReportSettings->iName;
 
  1519 				iTestEngineServer->iTestReportSettings.iName = NULL;
 
  1528 				iTestEngineServer->iTestReportSettings->iName = NULL;
 
  1520                 iTestEngineServer->iTestReportSettings.iName = name.AllocL();
 
  1529                 iTestEngineServer->iTestReportSettings->iName = name.AllocL();
 
  1521                 }
 
  1530                 }
 
  1522             else
 
  1531             else
 
  1523                 {
 
  1532                 {
 
  1524                 __TRACE( KInit,( _L( "Filename not found or not given" ) ) );
 
  1533                 __TRACE( KInit,( _L( "Filename not found or not given" ) ) );
 
  1525                 }
 
  1534                 }
 
  1526             }
 
  1535             }
 
  1527 
  1536 
  1528         // Get Test report format settings
 
  1537         // Get Test report format settings
 
  1529         if ( iTestEngineServer->iTestReportSettings.iCreateTestReport )
 
  1538         if ( iTestEngineServer->iTestReportSettings->iCreateTestReport )
 
  1530             {
 
  1539             {
 
  1531             __TRACE( KInit,( _L( "Parsing Test report format" ) ) );
 
  1540             __TRACE( KInit,( _L( "Parsing Test report format" ) ) );
 
  1532             CStifLogger::TLoggerType type;
 
  1541             CStifLogger::TLoggerType type;
 
  1533             TBool xml;
 
  1542             TBool xml;
 
  1534             get_ret = aSettings->GetFormatL( sectionParser,
 
  1543             get_ret = aSettings->GetFormatL( sectionParser,
 
  1535                                             _L( "TestReportFormat=" ), type, xml );
 
  1544                                             _L( "TestReportFormat=" ), type, xml );
 
  1536             if ( get_ret == KErrNone )
 
  1545             if ( get_ret == KErrNone )
 
  1537                 {
 
  1546                 {
 
  1538                 __TRACE( KInit,( _L( "Test report format: %d, xml: %d"), type, xml ) );
 
  1547                 __TRACE( KInit,( _L( "Test report format: %d, xml: %d"), type, xml ) );
 
  1539                 iTestEngineServer->iTestReportSettings.iFormat = type;
 
  1548                 iTestEngineServer->iTestReportSettings->iFormat = type;
 
  1540                 iTestEngineServer->iTestReportSettings.iXML = xml;
 
  1549                 iTestEngineServer->iTestReportSettings->iXML = xml;
 
  1541                 }
 
  1550                 }
 
  1542             else
 
  1551             else
 
  1543                 {
 
  1552                 {
 
  1544                 __TRACE( KInit,( _L( "Format not found or not given" ) ) );
 
  1553                 __TRACE( KInit,( _L( "Format not found or not given" ) ) );
 
  1545                 }
 
  1554                 }
 
  1546             }
 
  1555             }
 
  1547 
  1556 
  1548         // Get Test report output settings
 
  1557         // Get Test report output settings
 
  1549         if ( iTestEngineServer->iTestReportSettings.iCreateTestReport )
 
  1558         if ( iTestEngineServer->iTestReportSettings->iCreateTestReport )
 
  1550             {
 
  1559             {
 
  1551             __TRACE( KInit,( _L( "Parsing Test report output" ) ) );
 
  1560             __TRACE( KInit,( _L( "Parsing Test report output" ) ) );
 
  1552             CStifLogger::TOutput output;
 
  1561             CStifLogger::TOutput output;
 
  1553             get_ret = aSettings->GetOutputL( sectionParser,
 
  1562             get_ret = aSettings->GetOutputL( sectionParser,
 
  1554                                         _L( "TestReportOutput=" ), output );
 
  1563                                         _L( "TestReportOutput=" ), output );
 
  1555             if ( get_ret == KErrNone )
 
  1564             if ( get_ret == KErrNone )
 
  1556                 {
 
  1565                 {
 
  1557                 __TRACE( KInit,( _L( "Test report output: %d"), output ) );
 
  1566                 __TRACE( KInit,( _L( "Test report output: %d"), output ) );
 
  1558                 iTestEngineServer->iTestReportSettings.iOutput = output;
 
  1567                 iTestEngineServer->iTestReportSettings->iOutput = output;
 
  1559                 }
 
  1568                 }
 
  1560             else
 
  1569             else
 
  1561                 {
 
  1570                 {
 
  1562                 __TRACE( KInit,( _L( "Output not found or not given" ) ) );
 
  1571                 __TRACE( KInit,( _L( "Output not found or not given" ) ) );
 
  1563                 }
 
  1572                 }
 
  1564             }
 
  1573             }
 
  1565 
  1574 
  1566         // Get Test report file creation mode (overwrite settings)
 
  1575         // Get Test report file creation mode (overwrite settings)
 
  1567         if ( iTestEngineServer->iTestReportSettings.iCreateTestReport )
 
  1576         if ( iTestEngineServer->iTestReportSettings->iCreateTestReport )
 
  1568             {
 
  1577             {
 
  1569             __TRACE( KInit,( _L( "Parsing Test report file writing mode" ) ) );
 
  1578             __TRACE( KInit,( _L( "Parsing Test report file writing mode" ) ) );
 
  1570             TBool overwrite;
 
  1579             TBool overwrite;
 
  1571             get_ret = aSettings->GetOverwriteL( sectionParser,
 
  1580             get_ret = aSettings->GetOverwriteL( sectionParser,
 
  1572                             _L( "TestReportFileCreationMode=" ), overwrite );
 
  1581                             _L( "TestReportFileCreationMode=" ), overwrite );
 
  1573             if ( get_ret == KErrNone )
 
  1582             if ( get_ret == KErrNone )
 
  1574                 {
 
  1583                 {
 
  1575                 __TRACE( KInit,( _L( "Test report file creation mode: %d"), overwrite ) );
 
  1584                 __TRACE( KInit,( _L( "Test report file creation mode: %d"), overwrite ) );
 
  1576                 iTestEngineServer->iTestReportSettings.iOverwrite = overwrite;
 
  1585                 iTestEngineServer->iTestReportSettings->iOverwrite = overwrite;
 
  1577                 }
 
  1586                 }
 
  1578             else
 
  1587             else
 
  1579                 {
 
  1588                 {
 
  1580                 __TRACE( KInit,( _L( "Writing mode not found or not given" ) ) );
 
  1589                 __TRACE( KInit,( _L( "Writing mode not found or not given" ) ) );
 
  1581                 }
 
  1590                 }
 
  5568 /*
 
  5577 /*
 
  5569 -------------------------------------------------------------------------------
 
  5578 -------------------------------------------------------------------------------
 
  5570 
  5579 
  5571     DESCRIPTION
 
  5580     DESCRIPTION
 
  5572 
  5581 
       
  5582     Default constructor
 
       
  5583 
       
  5584 -------------------------------------------------------------------------------
 
       
  5585 */
 
       
  5586 CTestReportSettings::CTestReportSettings()
 
       
  5587     {
 
       
  5588     iCreateTestReport = ETrue;
 
       
  5589     iPath = NULL;
 
       
  5590     iName = NULL;
 
       
  5591     iFormat = CStifLogger::ETxt;
 
       
  5592     iOutput = CStifLogger::EFile;
 
       
  5593     iOverwrite = ETrue; 
       
  5594     iXML = EFalse;
 
       
  5595     }
 
       
  5596 
       
  5597 /*
 
       
  5598 -------------------------------------------------------------------------------
 
       
  5599 
       
  5600     DESCRIPTION
 
       
  5601 
       
  5602     Two-phased constructor.
 
       
  5603 
       
  5604 -------------------------------------------------------------------------------
 
       
  5605 */
 
       
  5606 CTestReportSettings* CTestReportSettings::NewL()
 
       
  5607     {
 
       
  5608     CTestReportSettings* self = new ( ELeave ) CTestReportSettings();
 
       
  5609     CleanupStack::PushL( self );
 
       
  5610     self->ConstructL();
 
       
  5611     CleanupStack::Pop();
 
       
  5612     return self;
 
       
  5613     }
 
       
  5614 
       
  5615 /*
 
       
  5616 -------------------------------------------------------------------------------
 
       
  5617 
       
  5618     DESCRIPTION
 
       
  5619 
       
  5620     Symbian OS second phase constructor
 
       
  5621 
       
  5622 -------------------------------------------------------------------------------
 
       
  5623 */
 
       
  5624 void CTestReportSettings::ConstructL()
 
       
  5625     {
 
       
  5626     
       
  5627     }
 
       
  5628 /*
 
       
  5629 -------------------------------------------------------------------------------
 
       
  5630 
       
  5631     DESCRIPTION
 
       
  5632 
       
  5633     Destructor
 
       
  5634 
       
  5635 -------------------------------------------------------------------------------
 
       
  5636 */
 
       
  5637 CTestReportSettings::~CTestReportSettings()
 
       
  5638     { 
       
  5639     delete iPath; 
       
  5640     iPath = NULL;
 
       
  5641     delete iName;
 
       
  5642     iName = NULL;
 
       
  5643     } 
       
  5644 
       
  5645 /*
 
       
  5646 -------------------------------------------------------------------------------
 
       
  5647 
       
  5648     DESCRIPTION
 
       
  5649 
  5573     This module contains implementation of CRebootParams class member functions.
 
  5650     This module contains implementation of CRebootParams class member functions.
 
  5574 
  5651 
  5575 -------------------------------------------------------------------------------
 
  5652 -------------------------------------------------------------------------------
 
  5576 */
 
  5653 */
 
  5577 
  5654
FCL/sf/os/osrndtools