Use wxCOMPtr throughout wxWebViewIE to simplify the code and reduce the chance of...

[wxWidgets.git] / tests / archive / archivetest.cpp

diff --git a/tests/archive/archivetest.cpp b/tests/archive/archivetest.cpp
index 0b143950e7de6d79fdeca00d616f9324adc8c321..d6ac25692b4be8f5b94510dee9986becc8977c9d 100644 (file)
--- a/tests/archive/archivetest.cpp
+++ b/tests/archive/archivetest.cpp
@@ -51,9 +51,6 @@ using std::auto_ptr;
 #if defined __DMC__ && __DMC__ >= 0x832
 #   define WXARC_MEMBER_TEMPLATES
 #endif
 #if defined __DMC__ && __DMC__ >= 0x832
 #   define WXARC_MEMBER_TEMPLATES
 #endif

-#if defined __MWERKS__ && __MWERKS__ >= 0x2200
-#   define WXARC_MEMBER_TEMPLATES
-#endif

 #if defined __HP_aCC && __HP_aCC > 33300
 #   define WXARC_MEMBER_TEMPLATES
 #endif
 #if defined __HP_aCC && __HP_aCC > 33300
 #   define WXARC_MEMBER_TEMPLATES
 #endif


@@ -335,7 +332,7 @@ private:
 
 TempDir::TempDir()
 {
 
 TempDir::TempDir()
 {

-    wxString tmp = wxFileName::CreateTempFileName(_T("arctest-"));
+    wxString tmp = wxFileName::CreateTempFileName(wxT("arctest-"));

     if (!tmp.empty()) {
         wxRemoveFile(tmp);
         m_original = wxGetCwd();
     if (!tmp.empty()) {
         wxRemoveFile(tmp);
         m_original = wxGetCwd();


@@ -356,26 +353,26 @@ TempDir::~TempDir()
 void TempDir::RemoveDir(wxString& path)
 {
     wxCHECK_RET(!m_tmp.empty() && path.substr(0, m_tmp.length()) == m_tmp,
 void TempDir::RemoveDir(wxString& path)
 {
     wxCHECK_RET(!m_tmp.empty() && path.substr(0, m_tmp.length()) == m_tmp,

-                _T("remove '") + path + _T("' fails safety check"));
+                wxT("remove '") + path + wxT("' fails safety check"));

 
     const wxChar *files[] = {
 
     const wxChar *files[] = {

-        _T("text/empty"),
-        _T("text/small"),
-        _T("bin/bin1000"),
-        _T("bin/bin4095"),
-        _T("bin/bin4096"),
-        _T("bin/bin4097"),
-        _T("bin/bin16384"),
-        _T("zero/zero5"),
-        _T("zero/zero1024"),
-        _T("zero/zero32768"),
-        _T("zero/zero16385"),
-        _T("zero/newname"),
-        _T("newfile"),
+        wxT("text/empty"),
+        wxT("text/small"),
+        wxT("bin/bin1000"),
+        wxT("bin/bin4095"),
+        wxT("bin/bin4096"),
+        wxT("bin/bin4097"),
+        wxT("bin/bin16384"),
+        wxT("zero/zero5"),
+        wxT("zero/zero1024"),
+        wxT("zero/zero32768"),
+        wxT("zero/zero16385"),
+        wxT("zero/newname"),
+        wxT("newfile"),

     };
 
     const wxChar *dirs[] = {
     };
 
     const wxChar *dirs[] = {

-        _T("text/"), _T("bin/"), _T("zero/"), _T("empty/")
+        wxT("text/"), wxT("bin/"), wxT("zero/"), wxT("empty/")

     };
 
     wxString tmp = m_tmp + wxFileName::GetPathSeparator();
     };
 
     wxString tmp = m_tmp + wxFileName::GetPathSeparator();


@@ -389,7 +386,7 @@ void TempDir::RemoveDir(wxString& path)
 
     if (!wxRmdir(m_tmp))
     {
 
     if (!wxRmdir(m_tmp))
     {

-        wxLogSysError(_T("can't remove temporary dir '%s'"), m_tmp.c_str());
+        wxLogSysError(wxT("can't remove temporary dir '%s'"), m_tmp.c_str());

     }
 }
 
     }
 }
 


@@ -409,7 +406,7 @@ void TempDir::RemoveDir(wxString& path)
 #   define WXARC_pclose(fp)
 #endif
 
 #   define WXARC_pclose(fp)
 #endif
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 #   define WXARC_b "b"
 #else
 #   define WXARC_b
 #   define WXARC_b "b"
 #else
 #   define WXARC_b


@@ -580,13 +577,13 @@ void ArchiveTestCase<ClassFactoryT>::CreateArchive(wxOutputStream& out)
         // It should be possible to create a directory entry just by supplying
         // a name that looks like a directory, or alternatively any old name
         // can be identified as a directory using SetIsDir or PutNextDirEntry
         // It should be possible to create a directory entry just by supplying
         // a name that looks like a directory, or alternatively any old name
         // can be identified as a directory using SetIsDir or PutNextDirEntry

-        bool setIsDir = name.Last() == _T('/') && (choices & 1);
+        bool setIsDir = name.Last() == wxT('/') && (choices & 1);

         if (setIsDir)
             name.erase(name.length() - 1);
 
         // provide some context for the error message so that we know which
         // iteration of the loop we were on
         if (setIsDir)
             name.erase(name.length() - 1);
 
         // provide some context for the error message so that we know which
         // iteration of the loop we were on

-        string error_entry((_T(" '") + name + _T("'")).mb_str());
+        string error_entry((wxT(" '") + name + wxT("'")).mb_str());

         string error_context(" failed for entry" + error_entry);
 
         if ((choices & 2) || testEntry.IsText()) {
         string error_context(" failed for entry" + error_entry);
 
         if ((choices & 2) || testEntry.IsText()) {


@@ -613,7 +610,7 @@ void ArchiveTestCase<ClassFactoryT>::CreateArchive(wxOutputStream& out)
                                       testEntry.GetLength()));
         }
 
                                       testEntry.GetLength()));
         }
 

-        if (it->first.Last() != _T('/')) {
+        if (it->first.Last() != wxT('/')) {

             // for non-dirs write the data
             arc->Write(testEntry.GetData(), testEntry.GetSize());
             CPPUNIT_ASSERT_MESSAGE("LastWrite check" + error_context,
             // for non-dirs write the data
             arc->Write(testEntry.GetData(), testEntry.GetSize());
             CPPUNIT_ASSERT_MESSAGE("LastWrite check" + error_context,


@@ -661,7 +658,7 @@ void ArchiveTestCase<ClassFactoryT>::CreateArchive(wxOutputStream& out,
         wxFileName fn(i->first, wxPATH_UNIX);
         TestEntry& entry = *i->second;
         wxDateTime dt = entry.GetDateTime();
         wxFileName fn(i->first, wxPATH_UNIX);
         TestEntry& entry = *i->second;
         wxDateTime dt = entry.GetDateTime();

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

         if (fn.IsDir())
             entry.SetDateTime(wxDateTime());
         else
         if (fn.IsDir())
             entry.SetDateTime(wxDateTime());
         else


@@ -671,7 +668,7 @@ void ArchiveTestCase<ClassFactoryT>::CreateArchive(wxOutputStream& out,
 
     if ((m_options & PipeOut) == 0) {
         wxFileName fn(tmpdir.GetName());
 
     if ((m_options & PipeOut) == 0) {
         wxFileName fn(tmpdir.GetName());

-        fn.SetExt(_T("arc"));
+        fn.SetExt(wxT("arc"));

         wxString tmparc = fn.GetPath(wxPATH_GET_SEPARATOR) + fn.GetFullName();
 
         // call the archiver to create an archive file
         wxString tmparc = fn.GetPath(wxPATH_GET_SEPARATOR) + fn.GetFullName();
 
         // call the archiver to create an archive file


@@ -680,7 +677,7 @@ void ArchiveTestCase<ClassFactoryT>::CreateArchive(wxOutputStream& out,
         // then load the archive file
         {
             wxFFileInputStream in(tmparc);
         // then load the archive file
         {
             wxFFileInputStream in(tmparc);

-            if (in.Ok())
+            if (in.IsOk())

                 out.Write(in);
         }
 
                 out.Write(in);
         }
 


@@ -689,8 +686,8 @@ void ArchiveTestCase<ClassFactoryT>::CreateArchive(wxOutputStream& out,
     else {
         // for the non-seekable test, have the archiver output to "-"
         // and read the archive via a pipe
     else {
         // for the non-seekable test, have the archiver output to "-"
         // and read the archive via a pipe

-        PFileInputStream in(wxString::Format(archiver, _T("-")));
-        if (in.Ok())
+        PFileInputStream in(wxString::Format(archiver, wxT("-")));
+        if (in.IsOk())

             out.Write(in);
     }
 }
             out.Write(in);
     }
 }


@@ -706,10 +703,10 @@ void ArchiveTestCase<ClassFactoryT>::ModifyArchive(wxInputStream& in,
     auto_ptr<OutputStreamT> arcOut(m_factory->NewStream(out));
     EntryT *pEntry;
 
     auto_ptr<OutputStreamT> arcOut(m_factory->NewStream(out));
     EntryT *pEntry;
 

-    const wxString deleteName = _T("bin/bin1000");
-    const wxString renameFrom = _T("zero/zero1024");
-    const wxString renameTo   = _T("zero/newname");
-    const wxString newName    = _T("newfile");
+    const wxString deleteName = wxT("bin/bin1000");
+    const wxString renameFrom = wxT("zero/zero1024");
+    const wxString renameTo   = wxT("zero/newname");
+    const wxString newName    = wxT("newfile");

     const char *newData       = "New file added as a test\n";
 
     arcOut->CopyArchiveMetaData(*arcIn);
     const char *newData       = "New file added as a test\n";
 
     arcOut->CopyArchiveMetaData(*arcIn);


@@ -721,7 +718,7 @@ void ArchiveTestCase<ClassFactoryT>::ModifyArchive(wxInputStream& in,
 
         // provide some context for the error message so that we know which
         // iteration of the loop we were on
 
         // provide some context for the error message so that we know which
         // iteration of the loop we were on

-        string error_entry((_T(" '") + name + _T("'")).mb_str());
+        string error_entry((wxT(" '") + name + wxT("'")).mb_str());

         string error_context(" failed for entry" + error_entry);
 
         if (name == deleteName) {
         string error_context(" failed for entry" + error_entry);
 
         if (name == deleteName) {


@@ -796,7 +793,7 @@ void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in)
 
         // provide some context for the error message so that we know which
         // iteration of the loop we were on
 
         // provide some context for the error message so that we know which
         // iteration of the loop we were on

-        string error_entry((_T(" '") + name + _T("'")).mb_str());
+        string error_entry((wxT(" '") + name + wxT("'")).mb_str());

         string error_context(" failed for entry" + error_entry);
 
         TestEntries::iterator it = m_testEntries.find(name);
         string error_context(" failed for entry" + error_entry);
 
         TestEntries::iterator it = m_testEntries.find(name);


@@ -806,7 +803,7 @@ void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in)
 
         const TestEntry& testEntry = *it->second;
 
 
         const TestEntry& testEntry = *it->second;
 

-#ifndef __WXMSW__
+#ifndef __WINDOWS__

         // On Windows some archivers compensate for Windows DST handling, but
         // other don't, so disable the test for now.
         wxDateTime dt = testEntry.GetDateTime();
         // On Windows some archivers compensate for Windows DST handling, but
         // other don't, so disable the test for now.
         wxDateTime dt = testEntry.GetDateTime();


@@ -824,7 +821,7 @@ void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in)
             "arc->GetLength() == entry->GetSize()" + error_context,
             arc->GetLength() == entry->GetSize());
 
             "arc->GetLength() == entry->GetSize()" + error_context,
             arc->GetLength() == entry->GetSize());
 

-        if (name.Last() != _T('/'))
+        if (name.Last() != wxT('/'))

         {
             CPPUNIT_ASSERT_MESSAGE("!IsDir" + error_context,
                 !entry->IsDir());
         {
             CPPUNIT_ASSERT_MESSAGE("!IsDir" + error_context,
                 !entry->IsDir());


@@ -884,7 +881,7 @@ void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in,
 
     if ((m_options & PipeIn) == 0) {
         wxFileName fn(tmpdir.GetName());
 
     if ((m_options & PipeIn) == 0) {
         wxFileName fn(tmpdir.GetName());

-        fn.SetExt(_T("arc"));
+        fn.SetExt(wxT("arc"));

         wxString tmparc = fn.GetPath(wxPATH_GET_SEPARATOR) + fn.GetFullName();
 
         if (m_options & Stub)
         wxString tmparc = fn.GetPath(wxPATH_GET_SEPARATOR) + fn.GetFullName();
 
         if (m_options & Stub)


@@ -893,7 +890,7 @@ void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in,
         // write the archive to a temporary file
         {
             wxFFileOutputStream out(tmparc);
         // write the archive to a temporary file
         {
             wxFFileOutputStream out(tmparc);

-            if (out.Ok())
+            if (out.IsOk())

                 out.Write(in);
         }
 
                 out.Write(in);
         }
 


@@ -904,8 +901,8 @@ void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in,
     else {
         // for the non-seekable test, have the archiver extract "-" and
         // feed it the archive via a pipe
     else {
         // for the non-seekable test, have the archiver extract "-" and
         // feed it the archive via a pipe

-        PFileOutputStream out(wxString::Format(unarchiver, _T("-")));
-        if (out.Ok())
+        PFileOutputStream out(wxString::Format(unarchiver, wxT("-")));
+        if (out.IsOk())

             out.Write(in);
     }
 
             out.Write(in);
     }
 


@@ -935,11 +932,11 @@ void ArchiveTestCase<ClassFactoryT>::VerifyDir(wxString& path,
 
             bool isDir = wxDirExists(path);
             if (isDir)
 
             bool isDir = wxDirExists(path);
             if (isDir)

-                name += _T("/");
+                name += wxT("/");

 
             // provide some context for the error message so that we know which
             // iteration of the loop we were on
 
             // provide some context for the error message so that we know which
             // iteration of the loop we were on

-            string error_entry((_T(" '") + name + _T("'")).mb_str());
+            string error_entry((wxT(" '") + name + wxT("'")).mb_str());

             string error_context(" failed for entry" + error_entry);
 
             TestEntries::iterator it = m_testEntries.find(name);
             string error_context(" failed for entry" + error_entry);
 
             TestEntries::iterator it = m_testEntries.find(name);


@@ -950,7 +947,7 @@ void ArchiveTestCase<ClassFactoryT>::VerifyDir(wxString& path,
 
             const TestEntry& testEntry = *it->second;
 
 
             const TestEntry& testEntry = *it->second;
 

-#if 0 //ndef __WXMSW__
+#if 0 //ndef __WINDOWS__

             CPPUNIT_ASSERT_MESSAGE("timestamp check" + error_context,
                                    testEntry.GetDateTime() ==
                                    wxFileName(path).GetModificationTime());
             CPPUNIT_ASSERT_MESSAGE("timestamp check" + error_context,
                                    testEntry.GetDateTime() ==
                                    wxFileName(path).GetModificationTime());


@@ -958,7 +955,7 @@ void ArchiveTestCase<ClassFactoryT>::VerifyDir(wxString& path,
             if (!isDir) {
                 wxFFileInputStream in(path);
                 CPPUNIT_ASSERT_MESSAGE(
             if (!isDir) {
                 wxFFileInputStream in(path);
                 CPPUNIT_ASSERT_MESSAGE(

-                    "entry not found in archive" + error_entry, in.Ok());
+                    "entry not found in archive" + error_entry, in.IsOk());

 
                 size_t size = (size_t)in.GetLength();
                 wxCharBuffer buf(size);
 
                 size_t size = (size_t)in.GetLength();
                 wxCharBuffer buf(size);


@@ -1118,8 +1115,8 @@ void ArchiveTestCase<ClassFactoryT>::ReadSimultaneous(TestInputStream& in)
 #endif
 
     // the names of two entries to read
 #endif
 
     // the names of two entries to read

-    const wxChar *name = _T("text/small");
-    const wxChar *name2 = _T("bin/bin1000");
+    const wxChar *name = wxT("text/small");
+    const wxChar *name2 = wxT("bin/bin1000");

 
     // open them
     typename ArchiveCatalog::iterator j;
 
     // open them
     typename ArchiveCatalog::iterator j;


@@ -1240,9 +1237,9 @@ void CorruptionTestCase::CreateArchive(wxOutputStream& out)
 {
     auto_ptr<wxArchiveOutputStream> arc(m_factory->NewStream(out));
 
 {
     auto_ptr<wxArchiveOutputStream> arc(m_factory->NewStream(out));
 

-    arc->PutNextDirEntry(_T("dir"));
-    arc->PutNextEntry(_T("file"));
-    arc->Write(_T("foo"), 3);
+    arc->PutNextDirEntry(wxT("dir"));
+    arc->PutNextEntry(wxT("file"));
+    arc->Write(wxT("foo"), 3);

 }
 
 void CorruptionTestCase::ExtractArchive(wxInputStream& in)
 }
 
 void CorruptionTestCase::ExtractArchive(wxInputStream& in)


@@ -1271,7 +1268,7 @@ int TestId::m_seed = 6219;
 string TestId::MakeId()
 {
     m_seed = (m_seed * 171) % 30269;
 string TestId::MakeId()
 {
     m_seed = (m_seed * 171) % 30269;

-    return string(wxString::Format(_T("%-6d"), m_seed).mb_str());
+    return string(wxString::Format(wxT("%-6d"), m_seed).mb_str());

 }
 
 
 }
 
 


@@ -1282,10 +1279,10 @@ ArchiveTestSuite::ArchiveTestSuite(string name)
   : CppUnit::TestSuite("archive/" + name),
     m_name(name.c_str(), *wxConvCurrent)
 {
   : CppUnit::TestSuite("archive/" + name),
     m_name(name.c_str(), *wxConvCurrent)
 {

-    m_name = _T("wx") + m_name.Left(1).Upper() + m_name.Mid(1).Lower();
-    m_path.AddEnvList(_T("PATH"));
-    m_archivers.push_back(_T(""));
-    m_unarchivers.push_back(_T(""));
+    m_name = wxT("wx") + m_name.Left(1).Upper() + m_name.Mid(1).Lower();
+    m_path.AddEnvList(wxT("PATH"));
+    m_archivers.push_back(wxT(""));
+    m_unarchivers.push_back(wxT(""));

 }
 
 // add the command for an external archiver to the list, testing for it in
 }
 
 // add the command for an external archiver to the list, testing for it in


@@ -1299,9 +1296,9 @@ void ArchiveTestSuite::AddCmd(wxArrayString& cmdlist, const wxString& cmd)
 
 bool ArchiveTestSuite::IsInPath(const wxString& cmd)
 {
 
 bool ArchiveTestSuite::IsInPath(const wxString& cmd)
 {

-    wxString c = cmd.BeforeFirst(_T(' '));
-#ifdef __WXMSW__
-    c += _T(".exe");
+    wxString c = cmd.BeforeFirst(wxT(' '));
+#ifdef __WINDOWS__
+    c += wxT(".exe");

 #endif
     return !m_path.FindValidPath(c).empty();
 }
 #endif
     return !m_path.FindValidPath(c).empty();
 }


@@ -1336,7 +1333,7 @@ ArchiveTestSuite *ArchiveTestSuite::makeSuite()
 
     for (int options = 0; options <= PipeIn; options += PipeIn)
     {
 
     for (int options = 0; options <= PipeIn; options += PipeIn)
     {

-        wxObject *pObj = wxCreateDynamicObject(m_name + _T("ClassFactory"));
+        wxObject *pObj = wxCreateDynamicObject(m_name + wxT("ClassFactory"));

         wxArchiveClassFactory *factory;
         factory = wxDynamicCast(pObj, wxArchiveClassFactory);
 
         wxArchiveClassFactory *factory;
         factory = wxDynamicCast(pObj, wxArchiveClassFactory);
 


@@ -1375,29 +1372,35 @@ string ArchiveTestSuite::Description(const wxString& type,
     wxString descr;
 
     if (genericInterface)
     wxString descr;
 
     if (genericInterface)

-        descr << _T("wxArchive (") << type << _T(")");
+        descr << wxT("wxArchive (") << type << wxT(")");

     else
         descr << type;
 
     if (!archiver.empty()) {
     else
         descr << type;
 
     if (!archiver.empty()) {

-        const wxChar *fn = (options & PipeOut) != 0 ? _T("-") : _T("file");
-        descr << _T(" (") << wxString::Format(archiver, fn) << _T(")");
+        const wxChar *fn = (options & PipeOut) != 0 ? wxT("-") : wxT("file");
+        const wxString cmd = archiver.Contains("%s")
+                             ? wxString::Format(archiver, fn)
+                             : archiver;
+        descr << wxT(" (") << cmd << wxT(")");

     }
     if (!unarchiver.empty()) {
     }
     if (!unarchiver.empty()) {

-        const wxChar *fn = (options & PipeIn) != 0 ? _T("-") : _T("file");
-        descr << _T(" (") << wxString::Format(unarchiver, fn) << _T(")");
+        const wxChar *fn = (options & PipeIn) != 0 ? wxT("-") : wxT("file");
+        const wxString cmd = unarchiver.Contains("%s")
+                             ? wxString::Format(unarchiver, fn)
+                             : unarchiver;
+        descr << wxT(" (") << cmd << wxT(")");

     }
 
     wxString optstr;
 
     if ((options & PipeIn) != 0)
     }
 
     wxString optstr;
 
     if ((options & PipeIn) != 0)

-        optstr += _T("|PipeIn");
+        optstr += wxT("|PipeIn");

     if ((options & PipeOut) != 0)
     if ((options & PipeOut) != 0)

-        optstr += _T("|PipeOut");
+        optstr += wxT("|PipeOut");

     if ((options & Stub) != 0)
     if ((options & Stub) != 0)

-        optstr += _T("|Stub");
+        optstr += wxT("|Stub");

     if (!optstr.empty())
     if (!optstr.empty())

-        optstr = _T(" (") + optstr.substr(1) + _T(")");
+        optstr = wxT(" (") + optstr.substr(1) + wxT(")");

 
     descr << optstr;
 
 
     descr << optstr;