FCL/sf/mw/srvdiscovery: comparison services/terminalmodeservice/tsrc/upnptmservertest/src/tmservertestcases.cpp

equal deleted inserted replaced

-:e9457ebcc4df
+:b6b8e90f9863
 */
 // INCLUDE FILES
 #include <e32math.h>
-#include "tmservertest.h"
 #include <ecom/ecom.h>
-#include "testtimer.h"
-#include "discoverytesttimer.h"
 #include <upnpdevice.h>
 #include <upnptmserverdeviceinfo.h>
 #include <upnpsettings.h>
+#include "testtimer.h"
+#include "discoverytesttimer.h"
+#include "tmservertest.h"
 // LOCAL CONSTANTS AND MACROS
 _LIT8(KTestSvgMimeType,           "image/svg+xml");
 _LIT8(KTmServerDevice,            "urn:schemas-upnp-org:device:TmServerDevice:1" );
 _LIT8(KTmServerService,           "urn:schemas-upnp-org:service:TmApplicationServer:1" );
 _LIT8(KProfileId,                 "ProfileID");
 _LIT8(KProfileId1,                "profileID");
 _LIT8(KBackground,                "Background");
 _LIT8(KForeground,                "Foreground");
 _LIT8(KAppListFilterValue1,       "\"icon@mimetype=\"*svg+xml*\",icon@width=\"*\",icon@height=\"*\",icon@depth=\"*\"\"");
-_LIT8(KAppListFilterValue2,       "\"name=\"*nav*\",description=\"*\",appInfo@appCategory=\"*\",displayInfo@contentCategory=\"*\",allowedProfileIDs=\"*\"\"");
+_LIT8(KAppListFilterValue2,       "\"name=\"*nav*\",description=\"*\",appInfo@appCategory=\"*\",appInfo@trustLevel=\"*\",displayInfo@contentCategory=\"*\",displayInfo@contentRules=\"*\",displayInfo@trustLevel=\"*\",allowedProfileIDs=\"*\"\"");
-_LIT8(KAppListFilterValue3,       "\"name=\"*bluetooth*\",description=\"*\",icon@mimetype=\"*svg+xml*\",remotingInfo@protocolID=\"*\",appInfo@appCategory=\"*\",audioInfo@audioType=\"*\",resourceStatus=\"free\",signature=\"*\"\"");
+_LIT8(KAppListFilterValue3,       "\"name=\"*bluetooth*\",description=\"*\",icon@mimetype=\"*svg+xml*\",remotingInfo@protocolID=\"*\",remotingInfo@direction=\"*\",appInfo@appCategory=\"*\",audioInfo@audioType=\"*\",resourceStatus=\"free\",signature=\"*\"\"");
-_LIT8(KAppListFilterValue4,       "\"name=\"*\",description=\"*Audio*\",icon@mimetype=\"*svg+xml*\",remotingInfo@protocolID=\"*\",appInfo@appCategory=\"*\",audioInfo@audioType=\"*\",resourceStatus=\"free\",signature=\"*\"\"");
+_LIT8(KAppListFilterValue4,       "\"name=\"*\",description=\"*Audio*\",icon@mimetype=\"*svg+xml*\",remotingInfo@protocolID=\"*\",remotingInfo@format=\"*\",appInfo@appCategory=\"*\",audioInfo@audioType=\"*\",resourceStatus=\"free\",signature=\"*\"\"");
 _LIT8(KWildCard,                  "*");
 _LIT(KIconPathMusicUnLaunched,          "c:\\upnptmserver\\icons\\music_unlaunched.svg");
 _LIT(KIconPathMusicLaunched,            "c:\\upnptmserver\\icons\\music_launched.svg");
 _LIT(KIconPathMaps,                     "c:\\upnptmserver\\icons\\maps.svg");
 _LIT(KIconPathBtA2DpUnLaunched,         "c:\\upnptmserver\\icons\\gallery.svg");
 //Start the control point and search for device
 iSearchDevice = CDiscoverDevice::NewL(*this);
 iTestTimer = CTestTimer::NewL(*this);
 iTestTimer->After(15);
 CActiveScheduler::Start();
 if ( iDeviceVerified)
 {
 _LIT( KDescription , "Terminalmode Server Device started successfully");
 aResult.SetResult( KErrNone, KDescription );
 iLog->Log( KDescription );
 //Start the control point and search for device
 iSearchDevice = CDiscoverDevice::NewL(*this);
 iTestTimer = CTestTimer::NewL(*this);
 iTestTimer->After(15);
 CActiveScheduler::Start();
 if ( iServiceVerified)
 {
 _LIT( KDescription , "Terminalmode server Service published successfully");
 aResult.SetResult( KErrNone, KDescription );
 iLog->Log( KDescription );
 //Start the control point and search for device
 iSearchDevice = CDiscoverDevice::NewL(*this);
 iDiscoveryTestTimer = CDiscoveryTestTimer::NewL(*this);
 iDiscoveryTestTimer->AfterDiscovery(15);
 CActiveScheduler::Start();
 if ( iDeviceVerified  )
 {
 //Stop the tmserver device and its services
 iTmServer->StopL();
 }
+iTestTimer = CTestTimer::NewL(*this);
-iTestTimer = CTestTimer::NewL(*this);
+iTestTimer->After(15);
-iTestTimer->After(15);
+CActiveScheduler::Start();
-CActiveScheduler::Start();
 if ( iDeviceLostVerified )
 {
 _LIT( KDescription , "Terminalmode server Device stopped successfully");
 aResult.SetResult( KErrNone, KDescription );
 iLog->Log( KDescription );
 aResult.iResult = KErrGeneral;
 _LIT( KDescription , "Stopping of Terminalmode server Device Failed");
 aResult.SetResult( KErrNone, KDescription );
 iLog->Log( KDescription );
 }
+delete iDiscoveryTestTimer;
-delete iDiscoveryTestTimer;
+iDiscoveryTestTimer = NULL;
-iDiscoveryTestTimer = NULL;
+delete iTestTimer;
-delete iTestTimer;
+iTestTimer = NULL;
-iTestTimer = NULL;
+REComSession::FinalClose();
-REComSession::FinalClose();
+return KErrNone;
-return KErrNone;
+}
-}
 TInt CTmServerTest::ReStartTmServerDeviceL ( TTestResult& aResult )
 {
 _LIT( KLogInfo, "ReStart Terminalmode server Device" );
 iLog->Log( KLogInfo );
 //Start the control point and search for device
 iSearchDevice = CDiscoverDevice::NewL(*this);
 iTestTimer = CTestTimer::NewL(*this);
 iTestTimer->After(15);
 CActiveScheduler::Start();
 if ( iDeviceVerified)
 {
 _LIT( KDescription , "Terminalmode server Device re-started successfully");
 aResult.SetResult( KErrNone, KDescription );
 iLog->Log( KDescription );
 {
 aResult.iResult = KErrGeneral;
 _LIT( KDescription , "Re-starting of Terminalmode server Device Failed");
 aResult.SetResult( KErrNone, KDescription );
 iLog->Log( KDescription );
 }
+delete iTestTimer;
-delete iTestTimer;
+iTestTimer = NULL;
-iTestTimer = NULL;
+REComSession::FinalClose();
-REComSession::FinalClose();
+return KErrNone;
-return KErrNone;
+}
-}
 TInt CTmServerTest::RegisterDuplicateAppL(  TTestResult& aResult  )
 {
 _LIT( KLogInfo, "Register Duplicate Application" );
 iLog->Log( KLogInfo );
 REComSession::FinalClose();
 return KErrNone;
 }
 TInt CTmServerTest::UnRegisterAppL(  TTestResult& aResult  )
 {
 _LIT( KLogInfo, "UnRegister Application" );
 iLog->Log( KLogInfo );
 REComSession::FinalClose();
 return KErrNone;
 }
 TInt CTmServerTest::HandleEventDuplicateAppStatusUpdateL( TTestResult& aResult )
 {
 _LIT( KLogInfo, "Handle Event For Duplicate AppStatus Update" );
 iLog->Log( KLogInfo );
 iTmServerDeviceType = ETrue;
 //Sets the information associated with the terminal mode server device
 iTmServer ->StartL();
 //Start the control point and search for device
 iSearchDevice = CDiscoverDevice::NewL(*this);
 iDiscoveryTestTimer = CDiscoveryTestTimer::NewL(*this);
 iDiscoveryTestTimer->AfterDiscovery(15);
 CActiveScheduler::Start();
 if ( iDeviceVerified  )
 {
 //Subscribe to Services
 iSearchDevice->SubscribeToServiceL();
 }
 RArray<TUint> updatedAppIdList;
 updatedAppIdList.Append(KAppId1Value);
 updatedAppIdList.Append(KAppId1Value);
 //Update the status of applications which have undergone some change
 iTmServer->UpdateAppStatusL(updatedAppIdList);
 REComSession::FinalClose();
 return KErrNone;
 }
 TInt CTmServerTest::HandleEventProfileIdListStatusUpdateL( TTestResult& aResult )
 {
 _LIT( KLogInfo, "Handle Event For ProfileIdList Status Update" );
 iLog->Log( KLogInfo );
 iTmServerDeviceType = ETrue;
 //Sets the information associated with the terminal mode server device
 RArray<TUint> UnusedProfileIdList;
 UnusedProfileIdList.Append(5);
 UnusedProfileIdList.Append(6);
 //Update the list of profile IDs for profiles which are not used
 iTmServer->UpdateUnusedProfileIdsL(UnusedProfileIdList);
 iTestTimer = CTestTimer::NewL(*this);
 iTestTimer->After(15);
 CActiveScheduler::Start();
 if ( iStatusNotified )
 iDiscoveryTestTimer = NULL;
 delete iTestTimer;
 iTestTimer = NULL;
 REComSession::FinalClose();
 return KErrNone;
 }
 TInt CTmServerTest::HandleLaunchAppActionL ( TTestResult& aResult )
 {
-_LIT( KLogInfo, "Handle LaunchApp Command" );
+_LIT( KLogInfo , "Handle LaunchApp Command" );
 iLog->Log( KLogInfo );
 iTmServerDeviceType = ETrue;
 //Sets the information associated with the terminal mode server device
 //Start the control point and search for device
 iSearchDevice = CDiscoverDevice::NewL(*this);
 iDiscoveryTestTimer = CDiscoveryTestTimer::NewL(*this);
 iDiscoveryTestTimer->AfterDiscovery(15);
 CActiveScheduler::Start();
 if ( iDeviceVerified  )
 {
 //Launch the application remotely by specifying appId and profileId
 iSearchDevice->LaunchAppActionL(KAppId1Value,KProfileIdValue);
 }
 //Start the control point and search for device
 iSearchDevice = CDiscoverDevice::NewL(*this);
 iDiscoveryTestTimer = CDiscoveryTestTimer::NewL(*this);
 iDiscoveryTestTimer->AfterDiscovery(15);
 CActiveScheduler::Start();
 if ( iDeviceVerified  )
 {
 //Subscribes to a service
 iSearchDevice->SubscribeToServiceL();
 }
 REComSession::FinalClose();
 return KErrNone;
 }
 TInt CTmServerTest::HandleEventAppListUpdateL( TTestResult& aResult )
 {
 _LIT( KLogInfo, "Handle Event For AppList Update" );
 iLog->Log( KLogInfo );
 iTmServerDeviceType = ETrue;
 //Sets the information associated with the terminal mode server device
 else if ( aProfileId == 1 )
 {
 // different mime type and different dimension
 clientIconPref = CUpnpTmClientIconPref::NewL(1);
 clientIconPref->SetMimeTypeL(_L8("image/bmp"));
-clientIconPref->SetWidth(60);
+clientIconPref->SetWidth(70);
-clientIconPref->SetHeight(60);
+clientIconPref->SetHeight(80);
 }
 else if ( aProfileId == 2 )
 {
 // different mime type and no dimension specified by the client
 clientIconPref = CUpnpTmClientIconPref::NewL(2);
 else if ( aProfileId == 3 )
 {
 // same mime type but different dimension
 clientIconPref = CUpnpTmClientIconPref::NewL(3);
 clientIconPref->SetMimeTypeL(_L8("image/svg+xml"));
-clientIconPref->SetWidth(36);
+clientIconPref->SetWidth(100);
-clientIconPref->SetHeight(44);
+clientIconPref->SetHeight(100);
 }
 else if ( aProfileId == 4 )
 {
 // same mime type but no dimension specified by the client
 clientIconPref = CUpnpTmClientIconPref::NewL(4);

changeset 26	b6b8e90f9863
parent 24	e9457ebcc4df
child 31	b51a6f4f15ba