equal
deleted
inserted
replaced
91 // cannot do if URI is unresolved - i.e. if it contains "Reference Test Agent" instead of actual private directory name |
91 // cannot do if URI is unresolved - i.e. if it contains "Reference Test Agent" instead of actual private directory name |
92 if (!unresolvedUri) |
92 if (!unresolvedUri) |
93 { |
93 { |
94 RFile file; |
94 RFile file; |
95 file.Open(iParent.Fs(), uri, EFileShareReadersOnly); |
95 file.Open(iParent.Fs(), uri, EFileShareReadersOnly); |
96 content = CContent::NewLC(file); |
96 CleanupClosePushL(file); |
97 file.Close(); |
97 content = CContent::NewL(file); |
|
98 CleanupStack::PopAndDestroy(&file); |
|
99 CleanupStack::PushL(content); |
98 value = expectedValue+1; |
100 value = expectedValue+1; |
99 User::LeaveIfError(content->GetAttribute(attribute, value, uniqueId)); |
101 User::LeaveIfError(content->GetAttribute(attribute, value, uniqueId)); |
100 if(expectedValue != value) |
102 if(expectedValue != value) |
101 { |
103 { |
102 SetTestStepResult(EFail); |
104 SetTestStepResult(EFail); |
193 // cannot do if URI is unresolved - i.e. if it contains "Reference Test Agent" instead of actual private directory name |
195 // cannot do if URI is unresolved - i.e. if it contains "Reference Test Agent" instead of actual private directory name |
194 if (!unresolvedUri) |
196 if (!unresolvedUri) |
195 { |
197 { |
196 RFile file; |
198 RFile file; |
197 file.Open(iParent.Fs(), uri, EFileShareReadersOnly); |
199 file.Open(iParent.Fs(), uri, EFileShareReadersOnly); |
198 content = CContent::NewLC(file); |
200 CleanupClosePushL(file); |
199 file.Close(); |
201 content = CContent::NewL(file); |
|
202 CleanupStack::PopAndDestroy(&file); |
|
203 CleanupStack::PushL(content); |
200 |
204 |
201 CleanupClosePushL(attributeSet); |
205 CleanupClosePushL(attributeSet); |
202 attributeSet.AddL(attribute1); |
206 attributeSet.AddL(attribute1); |
203 attributeSet.AddL(attribute2); |
207 attributeSet.AddL(attribute2); |
204 |
208 |
299 // cannot do if URI is unresolved - i.e. if it contains "Reference Test Agent" instead of actual private directory name |
303 // cannot do if URI is unresolved - i.e. if it contains "Reference Test Agent" instead of actual private directory name |
300 if (!unresolvedUri) |
304 if (!unresolvedUri) |
301 { |
305 { |
302 RFile file; |
306 RFile file; |
303 file.Open(iParent.Fs(), uri, EFileShareReadersOnly); |
307 file.Open(iParent.Fs(), uri, EFileShareReadersOnly); |
304 content = CContent::NewLC(file); |
308 CleanupClosePushL(file); |
305 file.Close(); |
309 content = CContent::NewL(file); |
|
310 CleanupStack::PopAndDestroy(&file); |
|
311 CleanupStack::PushL(content); |
306 |
312 |
307 result = content->GetStringAttribute(attribute, value, uniqueId); |
313 result = content->GetStringAttribute(attribute, value, uniqueId); |
308 if(result != expectedResult) |
314 if(result != expectedResult) |
309 { |
315 { |
310 SetTestStepResult(EFail); |
316 SetTestStepResult(EFail); |
418 // cannot do if URI is unresolved - i.e. if it contains "Reference Test Agent" instead of actual private directory name |
424 // cannot do if URI is unresolved - i.e. if it contains "Reference Test Agent" instead of actual private directory name |
419 if (!unresolvedUri) |
425 if (!unresolvedUri) |
420 { |
426 { |
421 RFile file; |
427 RFile file; |
422 file.Open(iParent.Fs(), uri, EFileShareReadersOnly); |
428 file.Open(iParent.Fs(), uri, EFileShareReadersOnly); |
423 content = CContent::NewLC(file); |
429 CleanupClosePushL(file); |
424 file.Close(); |
430 content = CContent::NewL(file); |
|
431 CleanupStack::PopAndDestroy(&file); |
|
432 CleanupStack::PushL(content); |
425 |
433 |
426 CleanupClosePushL(attributeSet); |
434 CleanupClosePushL(attributeSet); |
427 attributeSet.AddL(attribute1); |
435 attributeSet.AddL(attribute1); |
428 attributeSet.AddL(attribute2); |
436 attributeSet.AddL(attribute2); |
429 |
437 |