--- a/kerneltest/f32test/server/t_fsrv.cpp Mon May 03 13:47:38 2010 +0300
+++ b/kerneltest/f32test/server/t_fsrv.cpp Fri May 14 17:13:29 2010 +0300
@@ -99,9 +99,9 @@
test.Start(_L("Path test thread"));
RFs f;
TInt r=f.Connect();
- test(r==KErrNone);
+ test_KErrNone(r);
r=f.SessionPath(tPath);
- test(r==KErrNone);
+ test_KErrNone(r);
f.Close();
return(KErrNone);
@@ -209,59 +209,55 @@
test.Printf(_L("Dismounting the Remote Drive returned %d\n"),r);
- test(r==KErrNone );
+ test_Value(r, r == KErrNone );
}
LOCAL_C void CreateSubstDrive()
{
- test.Printf(_L("Create Substitute Drive \n"));
-
- TDriveList driveList;
- TInt i ;
-
- TInt r=TheFs.SessionPath(gTestSessionPath);
- test(r==KErrNone);
+ test.Printf(_L("Create Substitute Drive \n"));
+
+ TDriveList driveList;
+
+ TInt r=TheFs.SessionPath(gTestSessionPath);
+ test_KErrNone(r);
r=TheFs.DriveList(driveList, KDriveAttExclude|KDriveAttLocal);
- test( r==KErrNone );
+ test_KErrNone(r);
- for ( i = EDriveO; i < KMaxDrives; i++)
- {
-
- if ( driveList[i] == 0)
- {
- if (i == EDriveQ) continue; // Q reserved to mount a virtual Remote Drive, as part of the test.
- substDrive = i;
- break;
- }
- }
-
-
+ for (TInt i = EDriveO; i < KMaxDrives; i++)
+ {
+ if (driveList[i] == 0)
+ {
+ if (i == EDriveQ)
+ continue; // Q reserved to mount a virtual Remote Drive, as part of the test.
+ substDrive = i;
+ break;
+ }
+ }
+
if (substDrive)
{
TDriveInfo driveInfo;
r=TheFs.Drive(driveInfo,substDrive);
- test(r==KErrNone);
+ test_KErrNone(r);
if (driveInfo.iDriveAtt==KDriveAttLocal)
- {
+ {
return; // Subst local drives fails
}
TFileName n;
r=TheFs.Subst(n,substDrive);
- test(r==KErrNone);
- test(n.Length()==0);
+ test_KErrNone(r);
+ test_Value(n.Length(), n.Length() == 0);
r=TheFs.SetSubst(gTestSessionPath,substDrive);
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.Subst(n,substDrive);
- test(r==KErrNone);
- test(n==gTestSessionPath);
+ test_KErrNone(r);
+ test(n==gTestSessionPath);
}
-
-
}
@@ -269,9 +265,9 @@
{
if( substDrive)
{
- test.Printf(_L("Removing Substitute Drive \n"));
- TInt r =TheFs.SetSubst(_L(""),substDrive);
- test(r ==KErrNone);
+ test.Printf(_L("Removing Substitute Drive \n"));
+ TInt r =TheFs.SetSubst(_L(""),substDrive);
+ test_KErrNone(r);
}
}
@@ -284,16 +280,16 @@
//
{
- test(anInfo.iConnectionBusType==EConnectionBusInternal || anInfo.iConnectionBusType==EConnectionBusUsb);
+ test_Value(anInfo.iConnectionBusType, anInfo.iConnectionBusType==EConnectionBusInternal || anInfo.iConnectionBusType==EConnectionBusUsb);
if (aDrive==EDriveZ)
{
if (anInfo.iType==EMediaNotPresent)
return;
- test(anInfo.iMediaAtt==KMediaAttWriteProtected);
- test(anInfo.iDriveAtt==(KDriveAttRom|KDriveAttInternal));
- test(anInfo.iType==EMediaRom);
+ test_Value(anInfo.iMediaAtt, anInfo.iMediaAtt==KMediaAttWriteProtected);
+ test_Value(anInfo.iDriveAtt, anInfo.iDriveAtt==(KDriveAttRom|KDriveAttInternal));
+ test_Value(anInfo.iType, anInfo.iType==EMediaRom);
}
else if (GetDriveLFFS()==aDrive)
@@ -301,9 +297,9 @@
if (anInfo.iType==EMediaNotPresent)
return;
- test(anInfo.iDriveAtt&(KDriveAttLocal|KDriveAttInternal)==KDriveAttLocal|KDriveAttInternal); // LFFS sets KDriveAttTransaction as well
- test(anInfo.iType==EMediaFlash);
- test(anInfo.iMediaAtt==KMediaAttFormattable);
+ test_Value(anInfo.iDriveAtt, anInfo.iDriveAtt&(KDriveAttLocal|KDriveAttInternal)==KDriveAttLocal|KDriveAttInternal); // LFFS sets KDriveAttTransaction as well
+ test_Value(anInfo.iType, anInfo.iType==EMediaFlash);
+ test_Value(anInfo.iMediaAtt, anInfo.iMediaAtt==KMediaAttFormattable);
}
/*
Why assume certain drive letters can only refer to certain drive types?
@@ -381,17 +377,17 @@
test.Printf(_L("Test existing DriveList \n"));
err = TheFs.DriveList(driveList);
- test( err == KErrNone );
+ test_KErrNone(err);
for ( i = 0; i < KMaxDrives; i++)
{
if (driveList[i])
{
err = TheFs.Drive(info, i);
- test( err == KErrNone );
- test( info.iType != EMediaRemote );
- test( !(info.iDriveAtt & KDriveAttRemote ) );
- test( !(info.iDriveAtt & KDriveAttHidden ) );
+ test_KErrNone(err);
+ test_Value(info.iType, info.iType != EMediaRemote);
+ test_Value(info.iDriveAtt, !(info.iDriveAtt & KDriveAttRemote));
+ test_Value(info.iDriveAtt, !(info.iDriveAtt & KDriveAttHidden));
drivecount++;
if( info.iDriveAtt & KDriveAttRemovable)
@@ -430,13 +426,13 @@
flags = KDriveAttAll;
err = TheFs.DriveList(driveList, flags);
- test( err == KErrNone );
+ test_KErrNone(err);
for ( i = 0; i < KMaxDrives; i++)
{
if (driveList[i])
{
err = TheFs.Drive(info,i);
- test( err == KErrNone );
+ test_KErrNone(err);
allDrivecount++;
if( info.iDriveAtt & KDriveAttSubsted )
@@ -462,9 +458,6 @@
}
}
- test(allDrivecount == drivecount + hiddenOrRemoteDriveCount);
- test(hiddenOrRemoteDriveCount - hiddenDriveCount == 1);
-
test.Printf(_L("Found %d substitute drives\n"), substDriveCount);
test.Printf(_L("Found %d exclusively substitute drives \n"),exclusiveSubstDriveCount);
test.Printf(_L("Found %d hidden drives\n"), hiddenDriveCount);
@@ -475,6 +468,9 @@
test.Printf(_L("Found %d physically removable drives \n"),physicallyRemovable);
test.Printf(_L("Found %d logically removable drives \n"),logicallyRemovableDriveCount);
+ test(allDrivecount == drivecount + hiddenOrRemoteDriveCount);
+ test(hiddenOrRemoteDriveCount - hiddenDriveCount == 1);
+
//---------------------------------------------
//! @SYMTestCaseID PBASE-T_FSRV-0546
@@ -495,22 +491,22 @@
flags = KDriveAttRemovable;
err = TheFs.DriveList(driveList, flags);
- test( err == KErrNone );
+ test_KErrNone(err);
for ( i = 0; i < KMaxDrives; i++)
{
if (driveList[i])
{
err = TheFs.Drive(info, i);
- test( err == KErrNone );
- test( info.iDriveAtt & KDriveAttRemovable );
- drivecount++;
+ test_KErrNone(err);
+ test_Value(info.iDriveAtt, info.iDriveAtt & KDriveAttRemovable);
+ drivecount++;
printDriveAtt(i,info.iDriveAtt);
}
}
- test( drivecount == removableDriveCount ); // no removable drive was added
+ test_Value(drivecount, drivecount == removableDriveCount); // no removable drive was added
//---------------------------------------------
@@ -531,14 +527,14 @@
drivecount = 0;
flags = KDriveAttRemovable | KDriveAttRemote;
err = TheFs.DriveList(driveList, flags);
- test( err == KErrNone );
+ test_KErrNone(err);
for ( i = 0; i < KMaxDrives; i++)
{
if (driveList[i])
{
err = TheFs.Drive(info, i);
- test( err == KErrNone );
- test( (info.iDriveAtt & KDriveAttRemovable ) || (info.iDriveAtt & KDriveAttRemote));
+ test_KErrNone(err);
+ test_Value(info.iDriveAtt, (info.iDriveAtt & KDriveAttRemovable ) || (info.iDriveAtt & KDriveAttRemote));
drivecount++;
printDriveAtt(i,info.iDriveAtt);
@@ -546,7 +542,7 @@
}
}
- test( drivecount == removableDriveCount + 1 ); //contains the remote drive we mounted
+ test_Value(drivecount, drivecount == removableDriveCount + 1 ); //contains the remote drive we mounted
//---------------------------------------------
@@ -568,21 +564,21 @@
flags = KDriveAttExclusive | KDriveAttRemote;
TUint match = KDriveAttRemote;
err = TheFs.DriveList(driveList, flags);
- test( err == KErrNone );
+ test_KErrNone(err);
for ( i = 0; i < KMaxDrives; i++)
{
if (driveList[i])
{
err = TheFs.Drive(info, i);
- test( err == KErrNone );
- test( (info.iDriveAtt == match));
+ test_KErrNone(err);
+ test_Value(info.iDriveAtt, (info.iDriveAtt == match));
drivecount++;
printDriveAtt(i,info.iDriveAtt);
}
}
- test( drivecount == 1 ); //The remote drive we mounted.
+ test_Value(drivecount, drivecount == 1); //The remote drive we mounted.
//---------------------------------------------
@@ -603,22 +599,22 @@
drivecount = 0;
flags = KDriveAttExclude | KDriveAttRemovable;
err = TheFs.DriveList(driveList, flags);
- test( err == KErrNone );
+ test_KErrNone(err);
for (i = 0; i < KMaxDrives; i++)
{
if (driveList[i])
{
err = TheFs.Drive(info, i);
- test( err == KErrNone );
- test( (!(info.iDriveAtt & KDriveAttRemovable ) ));
+ test_KErrNone(err);
+ test_Value(info.iDriveAtt, (!(info.iDriveAtt & KDriveAttRemovable ) ));
drivecount++;
printDriveAtt(i,info.iDriveAtt);
}
}
- test ( drivecount == allDrivecount - removableDriveCount);
- test ( drivecount == nonRemovables + hiddenDriveCount + 1) ; //The remote drive we added is non removable
+ test_Value(drivecount, drivecount == allDrivecount - removableDriveCount);
+ test_Value (drivecount, drivecount == nonRemovables + hiddenDriveCount + 1) ; //The remote drive we added is non removable
@@ -643,21 +639,21 @@
flags = KDriveAttExclude | KDriveAttRemovable | KDriveAttRemote;
err = TheFs.DriveList(driveList, flags);
- test( err == KErrNone );
+ test_KErrNone(err);
for ( i = 0; i < KMaxDrives; i++)
{
if (driveList[i])
{
err = TheFs.Drive(info,i);
- test( err == KErrNone );
- test( (!(info.iDriveAtt & KDriveAttRemovable ) && (!(info.iDriveAtt & KDriveAttRemote ))));
+ test_KErrNone(err);
+ test_Value(info.iDriveAtt, (!(info.iDriveAtt & KDriveAttRemovable ) && (!(info.iDriveAtt & KDriveAttRemote ))));
drivecount++;
printDriveAtt(i,info.iDriveAtt);
}
}
- test(drivecount == (allDrivecount - removableDriveCount - 1) ); // also excluding the removables and the remote drive
+ test_Value(drivecount, drivecount == (allDrivecount - removableDriveCount - 1) ); // also excluding the removables and the remote drive
@@ -687,21 +683,21 @@
flags = KDriveAttExclude | KDriveAttRemote | KDriveAttSubsted;
err = TheFs.DriveList(driveList, flags);
- test( err == KErrNone );
+ test_KErrNone(err);
for ( i = 0; i < KMaxDrives; i++)
{
if (driveList[i])
{
err = TheFs.Drive(info,i);
- test( err == KErrNone );
- test( (!(info.iDriveAtt & KDriveAttRemote ) && (!(info.iDriveAtt & KDriveAttSubsted ))));
+ test_KErrNone(err);
+ test_Value(info.iDriveAtt, (!(info.iDriveAtt & KDriveAttRemote ) && (!(info.iDriveAtt & KDriveAttSubsted ))));
drivecount++;
printDriveAtt(i,info.iDriveAtt);
}
}
- test(drivecount == (allDrivecount - substDriveCount- 1) );
+ test_Value(drivecount, drivecount == (allDrivecount - substDriveCount- 1) );
@@ -711,15 +707,15 @@
flags = KDriveAttExclusive | KDriveAttExclude | KDriveAttSubsted;
err = TheFs.DriveList(driveList, flags);
- test( err == KErrNone );
+ test_KErrNone(err);
for ( i = 0; i < KMaxDrives; i++)
{
if (driveList[i])
{
err = TheFs.Drive(info,i);
- test( err == KErrNone );
- test( info.iDriveAtt != KDriveAttSubsted );
+ test_KErrNone(err);
+ test_Value(info.iDriveAtt, info.iDriveAtt != KDriveAttSubsted);
drivecount++;
printDriveAtt(i,info.iDriveAtt);
@@ -727,7 +723,7 @@
}
- test(drivecount == (allDrivecount - exclusiveSubstDriveCount) );
+ test_Value(drivecount, drivecount == (allDrivecount - exclusiveSubstDriveCount) );
}
@@ -767,14 +763,14 @@
TDriveList fullDriveList;
err = TheFs.DriveList(fullDriveList, KDriveAttAll);
- test( err == KErrNone );
+ test_KErrNone(err);
for ( i = 0; i < KMaxDrives; i++)
{
if (driveList[i])
{
err = TheFs.Drive(info,i);
- test( err == KErrNone );
+ test_KErrNone(err);
printDriveAtt(i,info.iDriveAtt);
}
}
@@ -794,14 +790,14 @@
//test.Printf(_L("Expected Result : %d \n"), testAtt == 0 ? testCombinations[matchIdx].iExpectedResultNoAtts : testCombinations[matchIdx].iExpectedResultWithAtts);
//test.Printf(_L(" Actual Result : 0x%08x \n"), err);
- test( err == (testAtt == 0 ? testCombinations[matchIdx].iExpectedResultNoAtts : testCombinations[matchIdx].iExpectedResultWithAtts) );
+ test_Value(err, err == (testAtt == 0 ? testCombinations[matchIdx].iExpectedResultNoAtts : testCombinations[matchIdx].iExpectedResultWithAtts));
if(err == KErrNone)
{
//printDriveAtt(0, testAtt); //Prints attributes
for ( i = 0; i < KMaxDrives; i++)
{
- TBool expectMatch = EFalse;
+ TBool expectMatch = EFalse;
switch(testCombinations[matchIdx].iMatchMask)
{
@@ -813,11 +809,11 @@
expectMatch = ETrue;
break;
- case KDriveAttExclude :
+ case KDriveAttExclude:
expectMatch = (fullDriveList[i] & testAtt) == 0;
break;
- case KDriveAttExclusive :
+ case KDriveAttExclusive:
expectMatch = (fullDriveList[i] == testAtt);
break;
@@ -825,20 +821,14 @@
expectMatch = (fullDriveList[i] != testAtt);
break;
- case KDriveAttAll | KDriveAttExclude :
- test(0); // Invalid - should never get here as this returns KErrArgument for all cases
- break;
-
- case KDriveAttAll | KDriveAttExclusive :
- test(0); // Invalid - should never get here as this returns KErrArgument for all cases
- break;
-
- case KDriveAttAll | KDriveAttExclude | KDriveAttExclusive :
- test(0); // Invalid - should never get here as this returns KErrArgument for all cases
- break;
-
+ case KDriveAttAll | KDriveAttExclude:
+ // Invalid - should never get here as this returns KErrArgument for all cases
+ case KDriveAttAll | KDriveAttExclusive:
+ // Invalid - should never get here as this returns KErrArgument for all cases
+ case KDriveAttAll | KDriveAttExclude | KDriveAttExclusive:
+ // Invalid - should never get here as this returns KErrArgument for all cases
default:
- test.Printf(_L("Unexpected Match Mask %08x"), testCombinations[matchIdx].iMatchMask);
+ test.Printf(_L("Unexpected or invalid Match Mask %08x"), testCombinations[matchIdx].iMatchMask);
test(0);
break;
}
@@ -846,7 +836,7 @@
if(expectMatch)
{
//test.Printf(_L(" %c MATCHED OK "), 'A' + i);
- test(newDriveList[i] == fullDriveList[i]);
+ test_Value(newDriveList[i], newDriveList[i] == fullDriveList[i]);
}
else
{
@@ -859,7 +849,7 @@
test.Printf(_L(" %c NOT MATCHED "), 'A' + i);
}
*/
- test(newDriveList[i] == 0);
+ test_Value(newDriveList[i], newDriveList[i] == 0);
}
}
}
@@ -885,14 +875,14 @@
drivecount = 0;
flags = KDriveAttLogicallyRemovable;
err = TheFs.DriveList(driveList, flags);
- test( err == KErrNone );
+ test_KErrNone(err);
for ( i = 0; i < KMaxDrives; i++)
{
if (driveList[i])
{
err = TheFs.Drive(info, i);
- test( err == KErrNone );
- test( info.iDriveAtt & KDriveAttLogicallyRemovable );
+ test_KErrNone(err);
+ test_Value(info.iDriveAtt, info.iDriveAtt & KDriveAttLogicallyRemovable);
drivecount++;
printDriveAtt(i,info.iDriveAtt);
@@ -900,8 +890,7 @@
}
- test( drivecount == logicallyRemovableDriveCount ); // no logically removable drive was added
-
+ test_Value(drivecount, drivecount == logicallyRemovableDriveCount); // no logically removable drive was added
test.End();
}
@@ -921,7 +910,7 @@
test.Start(_L("The drive info"));
TDriveList list;
TInt r=TheFs.DriveList(list);
- test(r==KErrNone);
+ test_KErrNone(r);
for (TInt i=0;i<KMaxDrives;i++)
{
TInt att=list[i];
@@ -929,7 +918,7 @@
{
TDriveInfo d;
r=TheFs.Drive(d,i);
- test(r==KErrNone);
+ test_KErrNone(r);
printDriveInfo(i,d);
test.Printf(_L("\n"));
testDriveInfo(i,d);
@@ -948,7 +937,7 @@
test.Start(_L("The volume info"));
TDriveList list;
TInt r=TheFs.DriveList(list);
- test(r==KErrNone);
+ test_KErrNone(r);
for (TInt i=0;i<KMaxDrives;i++)
{
TVolumeInfo v;
@@ -1012,7 +1001,7 @@
}
else
r=f.Set(name,NULL,NULL);
- test(r==KErrNone);
+ test_KErrNone(r);
test(TPtrC(p.fullName)==f.FullName());
test(TPtrC(p.drive)==f.Drive());
test(TPtrC(p.path)==f.Path());
@@ -1032,28 +1021,28 @@
test.Start(_L("Test path handling"));
TFileName p;
TInt r=TheFs.SessionPath(p);
- test(r==KErrNone);
+ test_KErrNone(r);
test.Printf(_L("SESSION=\"%S\"\n"),&p);
r=TheFs.SetSessionPath(_L("A:\\TEST\\"));
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.SessionPath(p);
- test(r==KErrNone);
+ test_KErrNone(r);
test(p==_L("A:\\TEST\\"));
r=TheFs.SetSessionPath(gSessionPath);
- test(r==KErrNone);
+ test_KErrNone(r);
TheFs.SetAllocFailure(gAllocFailOff);
RThread t;
r=t.Create(_L("PathTest"),pathTestThread,KDefaultStackSize,KHeapSize,KHeapSize,NULL);
- test(r==KErrNone);
+ test_KErrNone(r);
TRequestStatus tStat;
t.Logon(tStat);
t.Resume();
User::WaitForRequest(tStat);
- test(tStat==KErrNone);
- test(r==KErrNone);
+ r = tStat.Int();
+ test_KErrNone(r);
t.Close();
TheFs.SetAllocFailure(gAllocFailOn);
@@ -1071,9 +1060,9 @@
TFileName old;
TInt r=TheFs.SessionPath(old);
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.SetSessionPath(_L("C:\\ABCDEF\\"));
- test(r==KErrNone);
+ test_KErrNone(r);
for (TInt i=0;i<KMaxParses;i++)
{
TInt r;
@@ -1084,7 +1073,7 @@
r=TheFs.Parse(name,TPtrC(p.rel),f);
else
r=TheFs.Parse(name,f);
- test(r==KErrNone);
+ test_KErrNone(r);
test(TPtrC(p.fullName)==f.FullName());
test(TPtrC(p.drive)==f.Drive());
test(TPtrC(p.path)==f.Path());
@@ -1092,7 +1081,7 @@
test(TPtrC(p.ext)==f.Ext());
}
r=TheFs.SetSessionPath(old);
- test(r==KErrNone);
+ test_KErrNone(r);
test.End();
}
@@ -1106,14 +1095,14 @@
test.Printf(_L("Test subst"));
TVolumeInfo v;
TInt r=TheFs.Volume(v);
- test(r==KErrNone);
+ test_KErrNone(r);
TDriveInfo origDI;
r=TheFs.Drive(origDI);
- test(r==KErrNone);
+ test_KErrNone(r);
TDriveInfo driveInfo;
r=TheFs.Drive(driveInfo,EDriveO);
- test(r==KErrNone);
+ test_KErrNone(r);
if (driveInfo.iDriveAtt==KDriveAttLocal)
{
@@ -1122,40 +1111,40 @@
TFileName n;
r=TheFs.Subst(n,EDriveO);
- test(r==KErrNone);
- test(n.Length()==0);
+ test_KErrNone(r);
+ test_Value(n.Length(), n.Length()==0);
r=TheFs.SetSubst(gSessionPath,EDriveO);
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.Subst(n,EDriveO);
- test(r==KErrNone);
+ test_KErrNone(r);
test(n==gSessionPath);
TVolumeInfo w;
r=TheFs.Volume(w,EDriveO);
- test(r==KErrNone);
- test(w.iDrive.iType==v.iDrive.iType);
- test(w.iDrive.iConnectionBusType==v.iDrive.iConnectionBusType);
- test(w.iDrive.iDriveAtt==KDriveAttSubsted);
- test(w.iDrive.iMediaAtt==v.iDrive.iMediaAtt);
+ test_KErrNone(r);
+ test_Value(w.iDrive.iType, w.iDrive.iType==v.iDrive.iType);
+ test_Value(w.iDrive.iConnectionBusType, w.iDrive.iConnectionBusType==v.iDrive.iConnectionBusType);
+ test_Value(w.iDrive.iDriveAtt, w.iDrive.iDriveAtt==KDriveAttSubsted);
+ test_Value(w.iDrive.iMediaAtt, w.iDrive.iMediaAtt==v.iDrive.iMediaAtt);
test(w.iUniqueID==v.iUniqueID);
test(w.iSize==v.iSize);
test(w.iFree==v.iFree);
test(w.iName==v.iName);
TDriveList driveList;
r=TheFs.DriveList(driveList);
- test(r==KErrNone);
+ test_KErrNone(r);
test(driveList[EDriveO]==KDriveAttSubsted);
TDriveInfo d;
r=TheFs.Drive(d,EDriveO);
- test(r==KErrNone);
- test(d.iDriveAtt==KDriveAttSubsted);
- test(d.iMediaAtt==origDI.iMediaAtt);
- test(d.iType==origDI.iType);
- test(d.iConnectionBusType==origDI.iConnectionBusType);
+ test_KErrNone(r);
+ test_Value(d.iDriveAtt, d.iDriveAtt==KDriveAttSubsted);
+ test_Value(d.iMediaAtt, d.iMediaAtt==origDI.iMediaAtt);
+ test_Value(d.iType, d.iType==origDI.iType);
+ test_Value(d.iConnectionBusType, d.iConnectionBusType==origDI.iConnectionBusType);
test.Next(_L("Test real name"));
r=TheFs.RealName(_L("O:\\FILE.XXX"),n);
- test(r==KErrNone);
+ test_KErrNone(r);
TFileName substedPath=gSessionPath;
substedPath.Append(_L("FILE.XXX"));
test(n.CompareF(substedPath)==KErrNone);
@@ -1165,25 +1154,25 @@
TFileName dir=gSessionPath;
dir+=KTurgid;
r=TheFs.MkDirAll(dir);
- test(r==KErrNone);
+ test_KErrNone(r);
dir+=_L("subdir\\");
r=TheFs.MkDir(dir);
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.RmDir(_L("O:\\turgid\\subdir\\"));
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.Rename(_L("O:\\turgid"), _L("O:\\facile"));
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.MkDir(_L("O:\\insipid\\"));
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.Rename(_L("O:\\insipid"), _L("O:\\glib"));
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.RmDir(_L("O:\\facile\\"));
- test(r==KErrNone);
+ test_KErrNone(r);
_LIT(KGlib,"glib\\");
dir=gSessionPath;
dir+=KGlib;
r=TheFs.RmDir(dir);
- test(r==KErrNone);
+ test_KErrNone(r);
//
test.Next(_L("Test file operations on Substed drive"));
_LIT(File1,"File1.txt");
@@ -1195,21 +1184,21 @@
name1+=File1;
RFile f1;
r=f1.Replace(TheFs,name1,EFileShareExclusive|EFileWrite);
- test(r==KErrNone);
+ test_KErrNone(r);
name2=SubstRoot;
name2+=File2;
TBool isValid=TheFs.IsValidName(name2);
test(isValid);
r=f1.Rename(name2);
- test(r==KErrNone);
+ test_KErrNone(r);
f1.Close();
r=f1.Create(TheFs,name1,EFileShareExclusive|EFileWrite);
- test(r==KErrNone);
+ test_KErrNone(r);
f1.Close();
r=TheFs.Replace(name2,name1);
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.Delete(name1);
- test(r==KErrNone);
+ test_KErrNone(r);
test.Next(_L("Test notifications on Substed drive"));
name1=gSessionPath;
name1+=Subdir;
@@ -1220,58 +1209,62 @@
TRequestStatus status2;
TRequestStatus status3;
TheFs.NotifyChange(ENotifyDir,status1,name1);
- test(status1==KRequestPending);
+ test_Value(status1.Int(), status1==KRequestPending);
TheFs.NotifyChange(ENotifyDir,status2,name2);
- test(status2==KRequestPending);
+ test_Value(status2.Int(), status2==KRequestPending);
r=TheFs.MkDirAll(name1);
- test(r==KErrNone);
+ test_KErrNone(r);
User::WaitForRequest(status1);
User::WaitForRequest(status2);
- test(status1==KErrNone && status2==KErrNone);
+ test_KErrNone(status1.Int());
+ test_KErrNone(status2.Int());
TheFs.NotifyChange(ENotifyDir,status1,name1);
- test(status1==KRequestPending);
+ test_Value(status1.Int(), status1==KRequestPending);
TheFs.NotifyChange(ENotifyDir,status2,name2);
- test(status2==KRequestPending);
+ test_Value(status2.Int(), status2==KRequestPending);
TheFs.NotifyChange(ENotifyAll,status3,name2);
- test(status3==KRequestPending);
+ test_Value(status3.Int(), status3==KRequestPending);
r=f1.Temp(TheFs,name2,n,EFileShareAny|EFileWrite);
- test(r==KErrNone);
+ test_KErrNone(r);
User::WaitForRequest(status3);
- test(status3==KErrNone && status1==KRequestPending && status2==KRequestPending);
+ test_KErrNone(status3.Int());
+ test_Value(status1.Int(), status1==KRequestPending);
+ test_Value(status2.Int(), status2==KRequestPending);
f1.Close();
TheFs.NotifyChangeCancel();
- test(status1==KErrCancel && status2==KErrCancel);
+ test_Value(status1.Int(), status1==KErrCancel);
+ test_Value(status2.Int(), status2==KErrCancel);
r=TheFs.Delete(n);
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.RmDir(name1);
- test(r==KErrNone);
+ test_KErrNone(r);
//
test.Next(_L("Test file systems on Substed drive"));
// test cannot mount file system on substituted drive
TInt sessionDrv;
r=TheFs.CharToDrive(gSessionPath[0],sessionDrv);
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.FileSystemName(n,sessionDrv);
- test(r==KErrNone || r==KErrNotFound);
+ test_Value(r, r == KErrNone || r==KErrNotFound);
r=TheFs.MountFileSystem(n,EDriveO);
- test(r==KErrAccessDenied);
+ test_Value(r, r == KErrAccessDenied);
// test file system name on substitued drive is null
r=TheFs.FileSystemName(n,EDriveO);
- test(r==KErrNotFound && n==KNullDesC);
+ test_Value(r, r == KErrNotFound && n==KNullDesC);
// test cannot format a substitued drive
RFormat format;
TInt count;
r=format.Open(TheFs,SubstRoot,EHighDensity,count);
- test(r==KErrAccessDenied);
+ test_Value(r, r == KErrAccessDenied);
r=TheFs.SetSubst(_L(""),EDriveO);
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.Subst(n,EDriveO);
- test(r==KErrNone);
+ test_KErrNone(r);
test(n==_L(""));
r=TheFs.Drive(d,EDriveO);
- test(r==KErrNone);
- test(d.iDriveAtt==0);
+ test_KErrNone(r);
+ test_Value(d.iDriveAtt, d.iDriveAtt==0);
}
LOCAL_C void testSetVolume()
@@ -1286,7 +1279,7 @@
TVolumeInfo v;
TInt r=TheFs.Volume(v,driveNum);
- test(r==KErrNone);
+ test_KErrNone(r);
TFileName n=v.iName;
test.Printf(_L("VOL=\"%S\"\n"),&n);
@@ -1300,27 +1293,27 @@
return;
}
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.Volume(v,driveNum);
- test(r==KErrNone );
+ test_Value(r, r == KErrNone );
+ test.Printf(_L("VOL=\"%S\"\n"),&v.iName);
test(v.iName==_L(""));
- test.Printf(_L("VOL=\"%S\"\n"),&v.iName);
test.Next(_L("Set volume label to ABCDEFGHIJK"));
r=TheFs.SetVolumeLabel(_L("ABCDEFGHIJK"),driveNum);
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.Volume(v,driveNum);
- test(r==KErrNone);
+ test_KErrNone(r);
+ test.Printf(_L("VOL=\"%S\"\n"),&v.iName);
test(v.iName==_L("ABCDEFGHIJK"));
- test.Printf(_L("VOL=\"%S\"\n"),&v.iName);
test.Next(_L("Set volume label to ABCDE"));
r=TheFs.SetVolumeLabel(_L("ABCDE"),driveNum);
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.Volume(v,driveNum);
- test(r==KErrNone);
+ test_KErrNone(r);
+ test.Printf(_L("VOL=\"%S\"\n"),&v.iName);
test(v.iName==_L("ABCDE"));
- test.Printf(_L("VOL=\"%S\"\n"),&v.iName);
test.Next(_L("Test replacement of non-ascii chars"));
@@ -1338,7 +1331,7 @@
uBuf[9]=0x104;
uBuf[10]='f';
r=TheFs.SetVolumeLabel(uBuf,driveNum);
- test(r==KErrNone);
+ test_KErrNone(r);
TFileName drive=_L("?:");
drive[0]=gSessionPath[0];
@@ -1348,56 +1341,54 @@
TFileName sess;
r=TheFs.SessionPath(sess);
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.Volume(v,driveNum);
- test(r==KErrNone);
-
+ test_KErrNone(r);
+ test.Printf(_L("VOL=\"%S\"\n"),&v.iName);
if(Is_Fat(TheFs, gDrive)) //-- FAT doesn't support normal UNICODE in volume labels
test(v.iName==_L("a_b_c_d_e_f"));
else
test(v.iName == uBuf);
-
- test.Printf(_L("VOL=\"%S\"\n"),&v.iName);
-
-
test.Next(_L("Set volume label back to nothing"));
r=TheFs.SetVolumeLabel(_L(""),driveNum);
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.Volume(v,driveNum);
- test(r==KErrNone);
+ test_KErrNone(r);
+ test.Printf(_L("VOL=\"%S\"\n"),&v.iName);
test(v.iName==_L(""));
- test.Printf(_L("VOL=\"%S\"\n"),&v.iName);
test.Next(_L("Attempt to set volume label containing illegal characters"));
r=TheFs.SetVolumeLabel(_L("abc>def"),driveNum);
- test(r==KErrBadName);
+ test_Value(r, r == KErrBadName);
r=TheFs.SetVolumeLabel(_L("ghi*jkl"),driveNum);
- test(r==KErrBadName);
+ test_Value(r, r == KErrBadName);
r=TheFs.SetVolumeLabel(_L("mno?pqr"),driveNum);
- test(r==KErrBadName);
+ test_Value(r, r == KErrBadName);
r=TheFs.SetVolumeLabel(_L("stu|vwx"),driveNum);
- test(r==KErrBadName);
+ test_Value(r, r == KErrBadName);
r=TheFs.SetVolumeLabel(_L("yz<abc"),driveNum);
- test(r==KErrBadName);
+ test_Value(r, r == KErrBadName);
r=TheFs.SetVolumeLabel(_L("def//ghi"),driveNum);
- test(r==KErrBadName);
+ test_Value(r, r == KErrBadName);
r=TheFs.Volume(v,driveNum);
- test(r==KErrNone);
+ test_KErrNone(r);
+ test.Printf(_L("VOL=\"%S\"\n"),&v.iName);
test(v.iName==_L(""));
- test.Printf(_L("VOL=\"%S\"\n"),&v.iName);
// test volume label after remount (for removable media only)
test.Next(_L("Test volume label after remount"));
TDriveInfo info;
- test(TheFs.Drive(info, driveNum) == KErrNone);
+ r = TheFs.Drive(info, driveNum);
+ test_KErrNone(r);
if((info.iDriveAtt & KDriveAttRemovable) != 0)
{
// 1. set volume label
- test(TheFs.SetVolumeLabel(_L("XXX"), driveNum) == KErrNone);
+ r = TheFs.SetVolumeLabel(_L("XXX"), driveNum);
+ test_KErrNone(r);
// 2. change bootsector volume label
const TInt offset = IsFileSystemFAT32(TheFs, driveNum)?
@@ -1408,15 +1399,20 @@
RRawDisk rdisk;
TPtrC8 label(_S8("Z"), 1);
- test(rdisk.Open(TheFs, driveNum) == KErrNone);
- test(rdisk.Write(offset, label) == KErrNone);
+ r = rdisk.Open(TheFs, driveNum);
+ test_KErrNone(r);
+ r = rdisk.Write(offset, label);
+ test_KErrNone(r);
rdisk.Close();
// 3. remount the drive
- test(TheFs.RemountDrive(driveNum) == KErrNone);
+ r = TheFs.RemountDrive(driveNum);
+ test_KErrNone(r);
// 4. check volume label
- test(TheFs.Volume(v, driveNum) == KErrNone);
+ r = TheFs.Volume(v, driveNum);
+ test_KErrNone(r);
+ test.Printf(_L("VOL=\"%S\"\n"),&v.iName);
test(v.iName == _L("XXX"));
test.Printf(_L("- Passed.\n"));
}
@@ -1426,11 +1422,11 @@
// clean up
test.Next(_L("Set volume label to original"));
r=TheFs.SetVolumeLabel(n,driveNum);
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.Volume(v,driveNum);
- test(r==KErrNone);
+ test_KErrNone(r);
+ test.Printf(_L("VOL=\"%S\"\n"),&v.iName);
test(v.iName==n);
- test.Printf(_L("VOL=\"%S\"\n"),&v.iName);
test.End();
}
@@ -1444,45 +1440,46 @@
test.Start(_L("Test modified/SetModified functions"));
TTime savedTime;
TInt r=TheFs.Modified(_L("\\F32-TST\\TFSRV\\T_FSRV.CPP"),savedTime);
- test(r==KErrNone);
+ test_KErrNone(r);
TDateTime dateTime=savedTime.DateTime();
test.Printf(_L("T_FSRV.CPP last modified %d/%d/%d %d:%d:%d.%-06d\n"),dateTime.Day()+1,dateTime.Month()+1,dateTime.Year(),dateTime.Hour(),dateTime.Minute(),dateTime.Second(),dateTime.MicroSecond());
test.Next(_L("Set modified"));
dateTime.Set(1993,EAugust,23,1,13,54,123456);
TTime newTime(dateTime);
r=TheFs.SetModified(_L("\\F32-TST\\TFSRV\\T_FSRV.CPP"),newTime);
- test(r==KErrNone);
+ test_KErrNone(r);
TTime checkTime;
r=TheFs.Modified(_L("\\XXXX\\YYYY\\ZZZZ.CPP"),checkTime);
- test(r==KErrPathNotFound);
+ test_Value(r, r == KErrPathNotFound);
r=TheFs.Modified(_L("\\F32-TST\\TFSRV\\T_FSRV.CPP"),checkTime);
- test(r==KErrNone);
+ test_KErrNone(r);
dateTime=checkTime.DateTime();
+ test.Printf(_L("T_FSRV.CPP last modified %d/%d/%d %d:%d:%d.%-06d\n"),dateTime.Day()+1,dateTime.Month()+1,dateTime.Year(),dateTime.Hour(),dateTime.Minute(),dateTime.Second(),dateTime.MicroSecond());
test(dateTime.Year()==1993);
test(dateTime.Month()==EAugust);
test(dateTime.Day()==23);
test(dateTime.Hour()==1);
test(dateTime.Minute()==13);
test(dateTime.Second()==54);
- test.Printf(_L("T_FSRV.CPP last modified %d/%d/%d %d:%d:%d.%-06d\n"),dateTime.Day()+1,dateTime.Month()+1,dateTime.Year(),dateTime.Hour(),dateTime.Minute(),dateTime.Second(),dateTime.MicroSecond());
// test(dateTime.MicroSecond()==123456); // dos is not accurate enough
r=TheFs.SetModified(_L("\\F32-TST\\TFSRV\\T_FSRV.CPP"),savedTime);
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.Modified(_L("\\F32-TST\\TFSRV\\T_FSRV.CPP"),checkTime);
- test(r==KErrNone);
+ test_KErrNone(r);
test(checkTime==savedTime);
RFile f;
r=f.Open(TheFs,_L("\\F32-TST\\TFSRV\\T_FSRV.CPP"),EFileWrite);
- test(r==KErrNone);
+ test_KErrNone(r);
dateTime.Set(1997,EJanuary,1,2,55,51,999999);
newTime=dateTime;
r=f.SetModified(newTime);
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.Modified(_L("\\F32-TST\\TFSRV\\T_FSRV.CPP"),checkTime);
- test(r==KErrNone);
+ test_KErrNone(r);
dateTime=checkTime.DateTime();
+ test.Printf(_L("T_FSRV.CPP last modified via RFs::Modified() %d/%d/%d %d:%d:%d.%-06d\n"),dateTime.Day()+1,dateTime.Month()+1,dateTime.Year(),dateTime.Hour(),dateTime.Minute(),dateTime.Second(),dateTime.MicroSecond());
test(dateTime.Year()==1997);
test(dateTime.Month()==EJanuary);
test(dateTime.Day()==1);
@@ -1491,9 +1488,10 @@
test(dateTime.Second()>=50 && dateTime.Second()<=51); // Dos stores seconds %2
r=f.Modified(checkTime);
- test(r==KErrNone);
+ test_KErrNone(r);
dateTime=checkTime.DateTime();
+ test.Printf(_L("T_FSRV.CPP last modified via RFile::Modified() %d/%d/%d %d:%d:%d.%-06d\n"),dateTime.Day()+1,dateTime.Month()+1,dateTime.Year(),dateTime.Hour(),dateTime.Minute(),dateTime.Second(),dateTime.MicroSecond());
test(dateTime.Year()==1997);
test(dateTime.Month()==EJanuary);
test(dateTime.Day()==1);
@@ -1503,9 +1501,10 @@
f.Close();
r=TheFs.Modified(_L("\\F32-TST\\TFSRV\\T_FSRV.CPP"),checkTime);
- test(r==KErrNone);
+ test_KErrNone(r);
dateTime=checkTime.DateTime();
+ test.Printf(_L("T_FSRV.CPP last modified via RFs::Modified() %d/%d/%d %d:%d:%d.%-06d\n"),dateTime.Day()+1,dateTime.Month()+1,dateTime.Year(),dateTime.Hour(),dateTime.Minute(),dateTime.Second(),dateTime.MicroSecond());
test(dateTime.Year()==1997);
test(dateTime.Month()==EJanuary);
test(dateTime.Day()==1);
@@ -1529,23 +1528,27 @@
RFile file;
TInt r=file.Open(TheFs, KFileName, 0 );
- if (r!=KErrNone)
- {
- test.Printf(_L("Error %d opening file %S\n"), r, &KFileName);
- test(0);
- }
+ test_KErrNone(r);
TFileName fileName;
// Check RFile::Name just retuns the file name, without path and drive
r=file.Name(fileName);
- test(r==KErrNone);
- test(fileName==KFileName());
+ test_KErrNone(r);
+ if (fileName != KFileName)
+ {
+ test.Printf(_L("%S\n"), &fileName);
+ test(0);
+ }
// Check RFile::FullName returns the complete file name and path
r=file.FullName(fileName);
- test(r==KErrNone);
- test(fileName.Mid(2)==KFileNameAndPath); // chop off drive letter + ':'
+ test_KErrNone(r);
+ if (fileName.Mid(2)!=KFileNameAndPath) // chop off drive letter + ':'
+ {
+ test.Printf(_L("%S\n"), &fileName);
+ test(0);
+ }
file.Close();
@@ -1565,13 +1568,7 @@
TInt r=file.Replace(TheFs,fileName,EFileWrite);
if (r==KErrDiskFull)
return(r);
- if (r!=KErrNone)
- {
- test.Printf(_L("ERROR:: Replace returned %d\n"),r);
- test(0);
- //test.Getch();
- return(KErrDiskFull);
- }
+ test_KErrNone(r);
if (!IsTestingLFFS())
r=file.SetSize(LargeFileSize);
@@ -1588,14 +1585,7 @@
file.Close();
return(r);
}
- if (r!=KErrNone)
- {
- test.Printf(_L("ERROR:: SetSize/Write returned %d\n"),r);
- test(0);
- //test.Getch();
- file.Close();
- return(KErrDiskFull);
- }
+ test_KErrNone(r);
file.Close();
// r=TheFs.CheckDisk(fileName);
@@ -1618,12 +1608,12 @@
TBuf<128> fileName=aBaseName;
fileName.AppendNum(aX);
TInt r=TheFs.Delete(fileName);
- test(r==KErrNone);
+ test_KErrNone(r);
// r=TheFs.CheckDisk(fileName);
// if (r!=KErrNone && r!=KErrNotSupported)
// {
// test.Printf(_L("ERROR:: CheckDisk returned %d\n"),r);
-// test(r==KErrNone);
+// test_KErrNone(r);
// }
test.Printf(_L("Deleted File %d\n"),aX);
return(KErrNone);
@@ -1637,43 +1627,37 @@
test.Start(_L("Create and delete large files"));
TInt r=TheFs.MkDirAll(_L("\\F32-TST\\SMALLDIRECTORY\\"));
- test(r==KErrNone || r==KErrAlreadyExists);
+ test_Value(r, r == KErrNone || r==KErrAlreadyExists);
TBuf<128> fileName=_L("\\F32-TST\\SMALLDIRECTORY\\FILE");
r=CreateFileX(fileName,0);
- test(r==KErrNone);
+ test_KErrNone(r);
r=CreateFileX(fileName,1);
- test(r==KErrNone);
+ test_KErrNone(r);
r=DeleteFileX(fileName,0);
- test(r==KErrNone);
+ test_KErrNone(r);
r=CreateFileX(fileName,2);
- test(r==KErrNone);
+ test_KErrNone(r);
r=CreateFileX(fileName,1);
- test(r==KErrNone);
+ test_KErrNone(r);
r=CreateFileX(fileName,3);
- test(r==KErrNone);
+ test_KErrNone(r);
r=DeleteFileX(fileName,1);
- test(r==KErrNone);
+ test_KErrNone(r);
r=CreateFileX(fileName,4);
- test(r==KErrNone);
+ test_KErrNone(r);
r=DeleteFileX(fileName,2);
- test(r==KErrNone);
+ test_KErrNone(r);
r=DeleteFileX(fileName,3);
- test(r==KErrNone);
+ test_KErrNone(r);
r=DeleteFileX(fileName,4);
- test(r==KErrNone);
+ test_KErrNone(r);
r=CreateFileX(fileName,1);
- test(r==KErrNone);
+ test_KErrNone(r);
r=DeleteFileX(fileName,1);
- test(r==KErrNone);
+ test_KErrNone(r);
r=TheFs.CheckDisk(fileName);
- if (r!=KErrNone && r!=KErrNotSupported)
- {
- test.Printf(_L("ERROR:: CheckDisk returned %d\n"),r);
- test(0);
- //test.Getch();
- }
-
+ test_Value(r, r == KErrNone || r == KErrNotSupported);
test.End();
}
@@ -1685,18 +1669,18 @@
test.Start(_L("Fill disk to capacity"));
TInt r=TheFs.MkDirAll(_L("\\F32-TST\\BIGDIRECTORY\\"));
- test(r==KErrNone || r==KErrAlreadyExists);
+ test_Value(r, r == KErrNone || r==KErrAlreadyExists);
TInt count=0;
TFileName sessionPath;
r=TheFs.SessionPath(sessionPath);
- test(r==KErrNone);
+ test_KErrNone(r);
TBuf<128> fileName=_L("\\F32-TST\\BIGDIRECTORY\\FILE");
FOREVER
{
TInt r=CreateFileX(fileName,count);
if (r==KErrDiskFull)
break;
- test(r==KErrNone);
+ test_KErrNone(r);
count++;
#if defined(__WINS__)
if (count==32 && sessionPath[0]=='C')
@@ -1705,23 +1689,13 @@
}
r=TheFs.CheckDisk(fileName);
- if (r!=KErrNone && r!=KErrNotSupported)
- {
- test.Printf(_L("ERROR:: CheckDisk returned %d\n"),r);
- test(0);
- //test.Getch();
- }
+ test_Value(r, r == KErrNone || r == KErrNotSupported);
while(count--)
DeleteFileX(fileName,count);
r=TheFs.CheckDisk(fileName);
- if (r!=KErrNone && r!=KErrNotSupported)
- {
- test.Printf(_L("ERROR:: CheckDisk returned %d\n"),r);
- test(0);
- //test.Getch();
- }
+ test_Value(r, r == KErrNone || r == KErrNotSupported);
test.End();
}
@@ -1736,31 +1710,31 @@
fn[0] = gExeFileName[0];
TParse f;
TInt r=TheFs.Parse(fn,f);
- test(r==KErrNone);
+ test_KErrNone(r);
test.Next(_L("Copying file to test directory"));
TParse fCopy;
r=TheFs.Parse(f.NameAndExt(),fCopy);
- test(r==KErrNone);
+ test_KErrNone(r);
RFile f1;
r=f1.Open(TheFs,f.FullName(),EFileStreamText|EFileShareReadersOnly);
- test(r==KErrNone);
+ test_KErrNone(r);
RFile f2;
r=f2.Replace(TheFs,fCopy.FullName(),EFileWrite);
- test(r==KErrNone);
+ test_KErrNone(r);
TBuf8<512> copyBuf;
TInt rem;
r=f1.Size(rem);
- test(r==KErrNone);
+ test_KErrNone(r);
TInt pos=0;
while (rem)
{
TInt s=Min(rem,copyBuf.MaxSize());
r=f1.Read(pos,copyBuf,s);
- test(r==KErrNone);
- test(copyBuf.Length()==s);
+ test_KErrNone(r);
+ test_Value(copyBuf.Length(), copyBuf.Length() == s);
r=f2.Write(pos,copyBuf,s);
- test(r==KErrNone);
+ test_KErrNone(r);
pos+=s;
rem-=s;
}
@@ -1790,26 +1764,26 @@
//========== just create a file
nRes = TheFs.SetErrorCondition(KMyError,0); //-- set up FS error simulation
- test(nRes == KErrNone);
+ test_KErrNone(nRes);
//-- this shall fail immediately
nRes = file.Replace(TheFs, KFileName, EFileWrite);
- test(nRes == KMyError);
+ test_Value(nRes, nRes == KMyError);
nRes = TheFs.SetErrorCondition(KErrNone); //-- disable FS error simulation
file.Close();
//========== create file & duplicate a handle #1
nRes = TheFs.SetErrorCondition(KMyError,1); //-- set up FS error simulation
- test(nRes == KErrNone);
+ test_KErrNone(nRes);
//-- this shall succeed
nRes = file.Replace(TheFs, KFileName, EFileWrite); //-- err cnt -> 0
- test(nRes == KErrNone);
+ test_KErrNone(nRes);
//-- this shall fail inside RFile::Duplicate() half way through in the RFile::DuplicateHandle()
nRes = file1.Duplicate(file);
- test(nRes == KMyError);
+ test_Value(nRes, nRes == KMyError);
file1.Close();
nRes = TheFs.SetErrorCondition(KErrNone); //-- disable FS error simulation
@@ -1817,19 +1791,19 @@
//-- check that the file isn't locked
nRes = TheFs.Delete(KFileName);
- test(nRes == KErrNone);
+ test_KErrNone(nRes);
//========== create file & duplicate a handle #2
nRes = TheFs.SetErrorCondition(KMyError,2); //-- set up FS error simulation
- test(nRes == KErrNone);
+ test_KErrNone(nRes);
//-- this shall succeed
nRes = file.Replace(TheFs, KFileName, EFileWrite); //-- err cnt -> 1
- test(nRes == KErrNone);
+ test_KErrNone(nRes);
//-- this must not fail, because EFsFileAdopt is excluded from the erros simulation
nRes = file1.Duplicate(file);
- test(nRes == KErrNone);
+ test_KErrNone(nRes);
file1.Close();
nRes = TheFs.SetErrorCondition(KErrNone); //-- disable FS error simulation
@@ -1837,7 +1811,7 @@
//-- check that the file isn't locked
nRes = TheFs.Delete(KFileName);
- test(nRes == KErrNone);
+ test_KErrNone(nRes);
//========== crazy loop, for DEF103757
@@ -1859,7 +1833,7 @@
//-- check that the file isn't locked
nRes = TheFs.Delete(KFileName);
- test(nRes == KErrNone);
+ test_KErrNone(nRes);
#endif
@@ -1877,14 +1851,14 @@
F32_Test_Utils::SetConsole(test.Console());
TInt nRes=TheFs.CharToDrive(gDriveToTest, gDrive);
- test(nRes==KErrNone);
+ test_KErrNone(nRes);
PrintDrvInfo(TheFs, gDrive);
TVolumeInfo v;
TInt r=TheFs.Volume(v, CurrentDrive());
- test(r==KErrNone);
+ test_KErrNone(r);
LargeFileSize=Max((TUint32)I64LOW(v.iFree >> 7), (TUint32)65536u);
if (gFirstTime)