diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-13 15:28:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-13 15:28:13 -0400 |
| commit | 2268bf38339178f93b317693c0a6808807301d64 (patch) | |
| tree | 0a17c21975babce8422b9b62a1683947f5a58f2c /indra/test/llpermissions_tut.cpp | |
| parent | d233d8836b610b5e5ca76a1e3bb4d63dc3592e66 (diff) | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
merge changes for 3.5.3-release
Diffstat (limited to 'indra/test/llpermissions_tut.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/test/llpermissions_tut.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/test/llpermissions_tut.cpp b/indra/test/llpermissions_tut.cpp index bf6766424c..bc2c87ba46 100644..100755 --- a/indra/test/llpermissions_tut.cpp +++ b/indra/test/llpermissions_tut.cpp @@ -407,7 +407,7 @@ namespace tut LLFILE* fp = LLFile::fopen("linden_file.dat","w+"); if(!fp) { - llerrs << "file coudnt be opened\n" << llendl; + llerrs << "file couldn't be opened\n" << llendl; return; } LLPermissions perm,perm1; @@ -425,15 +425,15 @@ namespace tut perm.initMasks(base, ownerp, everyone, groupp, next); - perm.exportFile(fp); + ensure("Permissions export failed", perm.exportFile(fp)); fclose(fp); fp = LLFile::fopen("linden_file.dat","r+"); if(!fp) { - llerrs << "file coudnt be opened\n" << llendl; + llerrs << "file couldn't be opened\n" << llendl; return; } - perm1.importFile(fp); + ensure("Permissions import failed", perm1.importFile(fp)); fclose(fp); ensure_equals("exportFile()/importFile():failed to export and import the data ", perm1, perm); } @@ -461,7 +461,7 @@ namespace tut std::istringstream istream(ostream.str()); perm1.importLegacyStream(istream); - ensure_equals("exportLegacyStream()/importLegacyStream():failed to export and import the data ", perm1, perm); + ensure_equals("exportStream()/importStream():failed to export and import the data ", perm1, perm); } template<> template<> |