Merge in from trunk r68684 - r69046

[wxWidgets.git] / tests / streams / tempfile.cpp

diff --git a/tests/streams/tempfile.cpp b/tests/streams/tempfile.cpp
index 9fe28801e2ade21da1cc62059e2a6caf7b2659ce..560127464bc0c62733e0f1b7187247ab2d2528e2 100644 (file)
--- a/tests/streams/tempfile.cpp
+++ b/tests/streams/tempfile.cpp
@@ -4,7 +4,7 @@
 // Author:      Mike Wetherell
 // RCS-ID:      $Id$
 // Copyright:   (c) 2005 Mike Wetherell
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "testprec.h"
@@ -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(_T("wxtest"), &file);
-    file.Write("Before", 6);
-}
-
+#include "testfile.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // The test case