From 5520d562221815e1df8b8b3312e81358b55f901e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 1 Nov 2017 14:45:06 +0100
Subject: [PATCH] Remove test input file in file stream unit tests only once

Don't remove the files in the test cases classes dtors, this was
inconsistent with how they were created: we either need to create the
file in the ctor and destroy it in the dtor or do both only once
globally.

Implement the second solution using the helper AutoRemoveFile instead of
a simple static bool in GetInFileName() implementations.
---
 tests/streams/ffilestream.cpp | 41 +++++++++++++++++++++++++----------
 tests/streams/filestream.cpp  | 41 +++++++++++++++++++++++++----------
 2 files changed, 58 insertions(+), 24 deletions(-)

diff --git a/tests/streams/ffilestream.cpp b/tests/streams/ffilestream.cpp
index 47470ad4d1..1586701a0e 100644
--- a/tests/streams/ffilestream.cpp
+++ b/tests/streams/ffilestream.cpp
@@ -37,7 +37,6 @@ class ffileStream : public BaseStreamTestCase<wxFFileInputStream, wxFFileOutputS
 {
 public:
     ffileStream();
-    virtual ~ffileStream();
 
     CPPUNIT_TEST_SUITE(ffileStream);
         // Base class stream tests the ffileStream supports.
@@ -80,13 +79,6 @@ ffileStream::ffileStream()
     m_bEofAtLastRead = false;
 }
 
-ffileStream::~ffileStream()
-{
-    // Remove the temp test file...
-    ::wxRemoveFile(FILENAME_FFILEINSTREAM);
-    ::wxRemoveFile(FILENAME_FFILEOUTSTREAM);
-}
-
 wxFFileInputStream *ffileStream::DoCreateInStream()
 {
     wxFFileInputStream *pFileInStream = new wxFFileInputStream(GetInFileName());
@@ -107,12 +99,37 @@ void ffileStream::DoDeleteOutStream()
 
 wxString ffileStream::GetInFileName() const
 {
-    static bool bFileCreated = false;
-    if (!bFileCreated)
+    class AutoRemoveFile
     {
-        // Create the file only once
-        bFileCreated = true;
+    public:
+        AutoRemoveFile()
+        {
+            m_created = false;
+        }
 
+        ~AutoRemoveFile()
+        {
+            if ( m_created )
+                wxRemoveFile(FILENAME_FFILEINSTREAM);
+        }
+
+        bool ShouldCreate()
+        {
+            if ( m_created )
+                return false;
+
+            m_created = true;
+
+            return true;
+        }
+
+    private:
+        bool m_created;
+    };
+
+    static AutoRemoveFile autoFile;
+    if ( autoFile.ShouldCreate() )
+    {
         // Make sure we have a input file...
         char buf[DATABUFFER_SIZE];
         wxFFileOutputStream out(FILENAME_FFILEINSTREAM);
diff --git a/tests/streams/filestream.cpp b/tests/streams/filestream.cpp
index 86a5b49af4..cfa638f97f 100644
--- a/tests/streams/filestream.cpp
+++ b/tests/streams/filestream.cpp
@@ -37,7 +37,6 @@ class fileStream : public BaseStreamTestCase<wxFileInputStream, wxFileOutputStre
 {
 public:
     fileStream();
-    virtual ~fileStream();
 
     CPPUNIT_TEST_SUITE(fileStream);
         // Base class stream tests the fileStream supports.
@@ -79,13 +78,6 @@ fileStream::fileStream()
     m_bSeekInvalidBeyondEnd = false;
 }
 
-fileStream::~fileStream()
-{
-    // Remove the temp test file...
-    ::wxRemoveFile(FILENAME_FILEINSTREAM);
-    ::wxRemoveFile(FILENAME_FILEOUTSTREAM);
-}
-
 wxFileInputStream *fileStream::DoCreateInStream()
 {
     wxFileInputStream *pFileInStream = new wxFileInputStream(GetInFileName());
@@ -106,12 +98,37 @@ void fileStream::DoDeleteOutStream()
 
 wxString fileStream::GetInFileName() const
 {
-    static bool bFileCreated = false;
-    if (!bFileCreated)
+    class AutoRemoveFile
     {
-        // Create the file only once
-        bFileCreated = true;
+    public:
+        AutoRemoveFile()
+        {
+            m_created = false;
+        }
 
+        ~AutoRemoveFile()
+        {
+            if ( m_created )
+                wxRemoveFile(FILENAME_FILEINSTREAM);
+        }
+
+        bool ShouldCreate()
+        {
+            if ( m_created )
+                return false;
+
+            m_created = true;
+
+            return true;
+        }
+
+    private:
+        bool m_created;
+    };
+
+    static AutoRemoveFile autoFile;
+    if ( autoFile.ShouldCreate() )
+    {
         // Make sure we have a input file...
         char buf[DATABUFFER_SIZE];
         wxFileOutputStream out(FILENAME_FILEINSTREAM);