[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/qa

[Markus Mohrhard]

 sc/qa/unit/data/contentCSV/new_cond_format_test_export.csv |   22 +++++++++++++
 sc/qa/unit/data/ods/new_cond_format_test_export.ods        |binary
 sc/qa/unit/data/xlsx/new_cond_format_test_export.xlsx      |binary
 sc/qa/unit/subsequent_export-test.cxx                      |    8 ++--
 4 files changed, 26 insertions(+), 4 deletions(-)

New commits:
commit e39803815715d7b4fdfa7e1d4b3ebb07c16ca17e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Jan 4 22:49:49 2016 +0100

    don't use the same files in different unit tests
    
    I currently assume that this is responsible for some of our heisenbugs
    on windows. I think the windows file locking is causing issues when two
    test try to access the same file in parallel. This is more likely to
    happen on the fast windows ci boxes.
    
    Change-Id: I423f6c723c2ec558026867a118972e98279bd2c2
    Reviewed-on: https://gerrit.libreoffice.org/21145
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/qa/unit/data/contentCSV/new_cond_format_test_export.csv b/sc/qa/unit/data/contentCSV/new_cond_format_test_export.csv
new file mode 100644
index 0000000..37893fc
--- /dev/null
+++ b/sc/qa/unit/data/contentCSV/new_cond_format_test_export.csv
@@ -0,0 +1,22 @@
+,top n elements,,bottom n elements,,top n percent,,bottom n percent,,above average,,below average,,above equal average,,below equal average
+,1,,1.00,,1,,1.00,,1,,1.00,,2,,2.00
+,2,,2.00,,2,,2.00,,2,,2.00,,3,,3.00
+,3,,3.00,,3,,3,,3,,3.00,,4,,4.00
+,4,,4,,4,,4,,4,,4.00,,5,,5.00
+,5,,5,,5,,5,,5,,5.00,,6,,6.00
+,6,,6,,6,,6,,6,,6.00,,7,,7.00
+,7,,7,,7,,7,,7,,7.00,,11.00,,11
+,10,,10,,10,,10,,10.00,,10,,10.00,,10.00
+,11,,11,,11,,11,,11.00,,11,,11.00,,11
+,12,,12,,12,,12,,12.00,,12,,12.00,,12
+,13,,13,,13,,13,,13.00,,13,,13.00,,13
+,14,,14,,14,,14,,14.00,,14,,14.00,,14
+,15,,15,,15,,15,,15.00,,15,,15.00,,15
+,16.00,,16,,16,,16,,16.00,,16,,16.00,,16
+,17.00,,17,,17,,17,,17.00,,17,,17.00,,17
+,18.00,,18,,18,,18,,18.00,,18,,18.00,,18
+,19.00,,19,,19.00,,19,,19.00,,19,,19.00,,19
+,20.00,,20,,20.00,,20,,20.00,,20,,20.00,,20
+,1,,1.00,,1,,1.00,,1,,1.00,,2,,2.00
+,2,,2.00,,2,,2.00,,2,,2.00,,2,,2.00
+,3,,3.00,,3,,3,,3,,3.00,,3,,3.00
diff --git a/sc/qa/unit/data/ods/new_cond_format_test_export.ods b/sc/qa/unit/data/ods/new_cond_format_test_export.ods
new file mode 100644
index 0000000..9418c43
Binary files /dev/null and b/sc/qa/unit/data/ods/new_cond_format_test_export.ods differ
diff --git a/sc/qa/unit/data/xlsx/new_cond_format_test_export.xlsx b/sc/qa/unit/data/xlsx/new_cond_format_test_export.xlsx
new file mode 100644
index 0000000..0750188
Binary files /dev/null and b/sc/qa/unit/data/xlsx/new_cond_format_test_export.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index b8dc551..475570e 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -351,13 +351,13 @@ void ScExportTest::testPasswordExport()
 
 void ScExportTest::testConditionalFormatExportODS()
 {
-    ScDocShellRef xShell = loadDoc("new_cond_format_test.", FORMAT_ODS);
+    ScDocShellRef xShell = loadDoc("new_cond_format_test_export.", FORMAT_ODS);
     CPPUNIT_ASSERT(xShell.Is());
 
     ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_ODS);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
-    OUString aCSVFile("new_cond_format_test.");
+    OUString aCSVFile("new_cond_format_test_export.");
     OUString aCSVPath;
     createCSVPath( aCSVFile, aCSVPath );
     testCondFile(aCSVPath, &rDoc, 0);
@@ -367,14 +367,14 @@ void ScExportTest::testConditionalFormatExportODS()
 
 void ScExportTest::testConditionalFormatExportXLSX()
 {
-    ScDocShellRef xShell = loadDoc("new_cond_format_test.", FORMAT_XLSX);
+    ScDocShellRef xShell = loadDoc("new_cond_format_test_export.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xShell.Is());
 
     ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
     {
-        OUString aCSVFile("new_cond_format_test.");
+        OUString aCSVFile("new_cond_format_test_export.");
         OUString aCSVPath;
         createCSVPath( aCSVFile, aCSVPath );
         testCondFile(aCSVPath, &rDoc, 0);