[Libreoffice-commits] core.git: basic/qa

[Mike Kaganski (via logerrit)]

 basic/qa/cppunit/basic_coverage.cxx |    4 ++--
 basic/qa/cppunit/test_vba.cxx       |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 357c0e2a4a07aca48a69fbc2616b7002401b3267
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri Jul 2 20:44:27 2021 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Fri Jul 2 21:53:39 2021 +0200

    Move utility code out of test directories
    
    This simplifies iteration over the test files, and avoids relying
    on file URLs being the same (e.g., having no /./ segments).
    
    Change-Id: I227785806e474a3a2dffeb46df21617eae43327e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118329
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Jenkins

diff --git a/basic/qa/basic_coverage/_test_asserts.bas b/basic/qa/cppunit/_test_asserts.bas
similarity index 100%
rename from basic/qa/basic_coverage/_test_asserts.bas
rename to basic/qa/cppunit/_test_asserts.bas
diff --git a/basic/qa/vba_tests/_test_asserts.vb b/basic/qa/cppunit/_test_asserts.vb
similarity index 100%
rename from basic/qa/vba_tests/_test_asserts.vb
rename to basic/qa/cppunit/_test_asserts.vb
diff --git a/basic/qa/cppunit/basic_coverage.cxx b/basic/qa/cppunit/basic_coverage.cxx
index 22ce4e52b6b5..0f0722917232 100644
--- a/basic/qa/cppunit/basic_coverage.cxx
+++ b/basic/qa/cppunit/basic_coverage.cxx
@@ -64,7 +64,7 @@ void Coverage::process_directory(const OUString& sDirName)
     osl::Directory aDir(sDirName);
     osl::DirectoryItem aItem;
     osl::FileStatus aFileStatus(osl_FileStatus_Mask_FileURL|osl_FileStatus_Mask_Type);
-    OUString sMacroUtilsURL = m_directories.getURLFromSrc(u"basic/qa/basic_coverage/") + "_test_asserts.bas";
+    OUString sMacroUtilsURL = m_directories.getURLFromSrc(u"basic/qa/cppunit/_test_asserts.bas");
 
     if(aDir.open() == osl::FileBase::E_None)
     {
@@ -74,7 +74,7 @@ void Coverage::process_directory(const OUString& sDirName)
             if(aFileStatus.isRegular())
             {
                 OUString sFileURL = aFileStatus.getFileURL();
-                if(sFileURL.endsWith(".bas") && sFileURL != sMacroUtilsURL)
+                if (sFileURL.endsWith(".bas"))
                 {
                     MacroSnippet testMacro;
                     testMacro.LoadSourceFromFile("TestUtil", sMacroUtilsURL);
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 9a3cbe8baab9..8c43575f8f51 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -146,7 +146,7 @@ void VBATest::testMiscVBAFunctions()
         "win32compatb.vb" // same methods, different signatures.
     };
     OUString sMacroPathURL = m_directories.getURLFromSrc(u"/basic/qa/vba_tests/");
-    OUString sMacroUtilsURL = sMacroPathURL + "_test_asserts.vb";
+    OUString sMacroUtilsURL = m_directories.getURLFromSrc(u"/basic/qa/cppunit/_test_asserts.vb");
     // Some test data expects the uk locale
     LanguageTag aLocale(LANGUAGE_ENGLISH_UK);
     SvtSysLocaleOptions aLocalOptions;