equal
deleted
inserted
replaced
22 #include <badesca.h> |
22 #include <badesca.h> |
23 #include <commdb.h> |
23 #include <commdb.h> |
24 #include <mmf/common/mmfcontrollerpluginresolver.h> |
24 #include <mmf/common/mmfcontrollerpluginresolver.h> |
25 |
25 |
26 #include "VCXTestCommon.h" |
26 #include "VCXTestCommon.h" |
|
27 #include "IptvTestUtilALR.h" |
27 #include "CIptvTestVerifyData.h" |
28 #include "CIptvTestVerifyData.h" |
28 #include "TestUtilConnectionWaiter.h" |
29 #include "TestUtilConnectionWaiter.h" |
29 #include "VCXTestLog.h" |
30 #include "VCXTestLog.h" |
30 |
31 |
31 // EXTERNAL DATA STRUCTURES |
32 // EXTERNAL DATA STRUCTURES |
167 found = GetIapIdByNameL(KEmulatorIap, aIapId); |
168 found = GetIapIdByNameL(KEmulatorIap, aIapId); |
168 VCXLOGLO1("<<<CVCXTestCommon::GetIapIdL"); |
169 VCXLOGLO1("<<<CVCXTestCommon::GetIapIdL"); |
169 return found; |
170 return found; |
170 } |
171 } |
171 #endif |
172 #endif |
172 |
173 |
|
174 if( aIapName == _L("default") ) |
|
175 { |
|
176 VCXLOGLO1("CVCXTestCommon::GetIapIdL -- Searching default iap from cenrep"); |
|
177 CIptvTestUtilALR* util = CIptvTestUtilALR::NewLC(); |
|
178 aIapId = util->GetDefaultIapCenRep(); |
|
179 CleanupStack::PopAndDestroy( util ); |
|
180 if( aIapId != 0 ) |
|
181 { |
|
182 VCXLOGLO2("CVCXTestCommon::GetIapIdL -- Got default from cenrep: %d", aIapId); |
|
183 return ETrue; |
|
184 } |
|
185 } |
|
186 |
|
187 if( aIapName == _L("default") ) |
|
188 { |
|
189 VCXLOGLO1("CVCXTestCommon::GetIapIdL -- Getting default iap via ALR util"); |
|
190 CIptvTestUtilALR* util = CIptvTestUtilALR::NewLC(); |
|
191 aIapId = util->GetDefaultIap(); |
|
192 CleanupStack::PopAndDestroy( util ); |
|
193 if( aIapId != 0 ) |
|
194 { |
|
195 VCXLOGLO2("CVCXTestCommon::GetIapIdL -- Got default: %d", aIapId); |
|
196 return ETrue; |
|
197 } |
|
198 } |
|
199 |
173 VCXLOGLO2("CVCXTestCommon:: Searching IAP: %S", &aIapName); |
200 VCXLOGLO2("CVCXTestCommon:: Searching IAP: %S", &aIapName); |
174 |
201 |
175 found = GetIapIdByNameL(aIapName, aIapId); |
202 found = GetIapIdByNameL(aIapName, aIapId); |
176 |
203 |
177 // Iap with exact name found |
204 // Iap with exact name found |