[Libreoffice-commits] core.git: unotest/source

[Stephan Bergmann]

 unotest/source/cpp/filters-test.cxx |  115 ++++++++++++++++++++----------------
 1 file changed, 66 insertions(+), 49 deletions(-)

New commits:
commit 82fb80ec22e58d27b5b454da9dc095cef2fc3025
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Aug 24 16:56:29 2015 +0200

    Make test order deterministic
    
    Change-Id: I9980034f0cb948acd6bb20aaf0fc27928ac68913

diff --git a/unotest/source/cpp/filters-test.cxx b/unotest/source/cpp/filters-test.cxx
index bc4292c..d088a97 100644
--- a/unotest/source/cpp/filters-test.cxx
+++ b/unotest/source/cpp/filters-test.cxx
@@ -7,6 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <sal/config.h>
+
+#include <set>
+
 #include <unotest/filters-test.hxx>
 #include <osl/file.hxx>
 #include <osl/thread.h>
@@ -60,71 +64,84 @@ void FiltersTest::recursiveScan(filterStatus nExpected,
     CPPUNIT_ASSERT(osl::FileBase::E_None == aDir.open());
     osl::DirectoryItem aItem;
     osl::FileStatus aFileStatus(osl_FileStatus_Mask_FileURL|osl_FileStatus_Mask_Type);
+    std::set<OUString> dirs;
+    std::set<OUString> files;
     while (aDir.getNextItem(aItem) == osl::FileBase::E_None)
     {
         aItem.getFileStatus(aFileStatus);
         OUString sURL = aFileStatus.getFileURL();
         if (aFileStatus.getFileType() == osl::FileStatus::Directory)
         {
-            recursiveScan(nExpected, rFilter, sURL, rUserData,
-                nFilterFlags, nClipboardID, nFilterVersion, bExport);
+            dirs.insert(sURL);
         }
         else
         {
-            OUString sTmpFile;
-            bool bEncrypted = false;
-
-            sal_Int32 nLastSlash = sURL.lastIndexOf('/');
+            files.insert(sURL);
+        }
+    }
+    for (auto const & sURL: dirs) {
+        recursiveScan(nExpected, rFilter, sURL, rUserData,
+            nFilterFlags, nClipboardID, nFilterVersion, bExport);
+    }
+    for (auto const & sURL: files) {
+        OUString sTmpFile;
+        bool bEncrypted = false;
 
-            if ((nLastSlash != -1) && (nLastSlash+1 < sURL.getLength()))
-            {
-                //ignore .files
-                if (sURL[nLastSlash+1] == '.')
-                    continue;
-
-                if (
-                    (sURL.match("BID", nLastSlash+1)) ||
-                    (sURL.match("CVE", nLastSlash+1)) ||
-                    (sURL.match("EDB", nLastSlash+1))
-                   )
-                {
-                    bEncrypted = true;
-                }
-            }
+        sal_Int32 nLastSlash = sURL.lastIndexOf('/');
 
-            OString aRes(OUStringToOString(sURL,
-                osl_getThreadTextEncoding()));
+        if ((nLastSlash != -1) && (nLastSlash+1 < sURL.getLength()))
+        {
+            //ignore .files
+            if (sURL[nLastSlash+1] == '.')
+                continue;
 
-            if (bEncrypted)
+            if (
+                (sURL.match("BID", nLastSlash+1)) ||
+                (sURL.match("CVE", nLastSlash+1)) ||
+                (sURL.match("EDB", nLastSlash+1))
+               )
             {
-                CPPUNIT_ASSERT(osl::FileBase::E_None == osl::FileBase::createTempFile(NULL, NULL, &sTmpFile));
-                decode(sURL, sTmpFile);
-                sURL = sTmpFile;
+                bEncrypted = true;
             }
+        }
 
-            //output name early, so in the case of a hang, the name of
-            //the hanging input file is visible
-            fprintf(stderr, "%s,", aRes.getStr());
-            sal_uInt32 nStartTime = osl_getGlobalTimer();
-            bool bRes;
-            if (!bExport)
-                bRes = load(rFilter, sURL, rUserData, nFilterFlags,
-                            nClipboardID, nFilterVersion);
-            else
-                bRes = save(rFilter, sURL, rUserData, nFilterFlags,
-                            nClipboardID, nFilterVersion);
-            sal_uInt32 nEndTime = osl_getGlobalTimer();
-
-            if (bEncrypted)
-                CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, osl::File::remove(sTmpFile));
-
-            fprintf(stderr, "%s,%" SAL_PRIuUINT32"\n",
-                bRes?"Pass":"Fail",nEndTime-nStartTime);
-            if (nExpected == test::indeterminate)
-                continue;
-            filterStatus nResult = bRes ? test::pass : test::fail;
-            CPPUNIT_ASSERT_MESSAGE(aRes.getStr(), nResult == nExpected);
+        OString aRes(OUStringToOString(sURL,
+            osl_getThreadTextEncoding()));
+
+        OUString realUrl;
+        if (bEncrypted)
+        {
+            CPPUNIT_ASSERT(osl::FileBase::E_None == osl::FileBase::createTempFile(NULL, NULL, &sTmpFile));
+            decode(sURL, sTmpFile);
+            realUrl = sTmpFile;
         }
+        else
+        {
+            realUrl = sURL;
+        }
+
+        //output name early, so in the case of a hang, the name of
+        //the hanging input file is visible
+        fprintf(stderr, "%s,", aRes.getStr());
+        sal_uInt32 nStartTime = osl_getGlobalTimer();
+        bool bRes;
+        if (!bExport)
+            bRes = load(rFilter, realUrl, rUserData, nFilterFlags,
+                        nClipboardID, nFilterVersion);
+        else
+            bRes = save(rFilter, realUrl, rUserData, nFilterFlags,
+                        nClipboardID, nFilterVersion);
+        sal_uInt32 nEndTime = osl_getGlobalTimer();
+
+        if (bEncrypted)
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, osl::File::remove(sTmpFile));
+
+        fprintf(stderr, "%s,%" SAL_PRIuUINT32"\n",
+            bRes?"Pass":"Fail",nEndTime-nStartTime);
+        if (nExpected == test::indeterminate)
+            continue;
+        filterStatus nResult = bRes ? test::pass : test::fail;
+        CPPUNIT_ASSERT_MESSAGE(aRes.getStr(), nResult == nExpected);
     }
     CPPUNIT_ASSERT(osl::FileBase::E_None == aDir.close());
 }