From caa96da73962c44562fe5744a5850855a2658fa0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 12 Sep 2009 22:40:35 +0000 Subject: [PATCH] Extract TestFile class in a separate header. This allows to reuse it in the other tests which need to create a temporary file automatically destroyed on test exit. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/streams/tempfile.cpp | 24 +----------------------- tests/testfile.h | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 23 deletions(-) create mode 100644 tests/testfile.h diff --git a/tests/streams/tempfile.cpp b/tests/streams/tempfile.cpp index bd1d3e29ee..7c5c1f323d 100644 --- a/tests/streams/tempfile.cpp +++ b/tests/streams/tempfile.cpp @@ -24,29 +24,7 @@ #if wxUSE_STREAMS && wxUSE_FILE - -/////////////////////////////////////////////////////////////////////////////// -// Self deleting test file - -class TestFile -{ -public: - TestFile(); - ~TestFile() { if (wxFileExists(m_name)) wxRemoveFile(m_name); } - wxString GetName() const { return m_name; } -private: - wxString m_name; -}; - -// Initialise with a test pattern so we can see if the file is replaced -// -TestFile::TestFile() -{ - wxFile file; - m_name = wxFileName::CreateTempFileName(wxT("wxtest"), &file); - file.Write("Before", 6); -} - +#include "testfile.h" /////////////////////////////////////////////////////////////////////////////// // The test case diff --git a/tests/testfile.h b/tests/testfile.h new file mode 100644 index 0000000000..d982ee9334 --- /dev/null +++ b/tests/testfile.h @@ -0,0 +1,38 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: tests/testfile.h +// Purpose: TestFile class +// Author: Mike Wetherell +// RCS-ID: $Id$ +// Copyright: (c) 2005 Mike Wetherell +// Licence: wxWidgets licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_TESTS_TEMPFILE_H_ +#define _WX_TESTS_TEMPFILE_H_ + +#include "wx/filefn.h" +#include "wx/filename.h" + +// ---------------------------------------------------------------------------- +// TestFile: self deleting test file in temporary directory +// ---------------------------------------------------------------------------- + +class TestFile +{ +public: + TestFile() + { + wxFile file; + m_name = wxFileName::CreateTempFileName(wxT("wxtest"), &file); + file.Write("Before", 6); + } + + ~TestFile() { if (wxFileExists(m_name)) wxRemoveFile(m_name); } + wxString GetName() const { return m_name; } + +private: + wxString m_name; +}; + +#endif // _WX_TESTS_TEMPFILE_H_ +