diff options
author | Merov Linden <merov@lindenlab.com> | 2013-05-02 14:09:40 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-05-02 14:09:40 -0700 |
commit | 043f2e0bfd40d29464175de838e3a36aad6e81df (patch) | |
tree | a84a7d8ab7a4b0c3a6afb3a7b2007c9ce4a36afb /indra/test/llpermissions_tut.cpp | |
parent | d07fab9e165e354678f5f8f78d331f8cfe8618d2 (diff) | |
parent | 1beb15c93b139e4494bb90cce30b1c67accb4b08 (diff) |
Pull from viewer-release
Diffstat (limited to 'indra/test/llpermissions_tut.cpp')
-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 --- 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<> |