Removing some instances of Poco::File from Kernel

Author: peterfpeterson

Framework/Kernel/src/FileDescriptor.cpp

@@ -7,9 +7,7 @@
 #include "MantidKernel/FileDescriptor.h"
 #include "MantidKernel/Strings.h"
 
-#include <Poco/Path.h>
 #include <filesystem>
-
 #include <stdexcept>
 
 namespace Mantid::Kernel {
@@ -177,7 +175,7 @@ bool FileDescriptor::isXML() const { return (this->isAscii() && this->extension(
  */
 void FileDescriptor::initialize(const std::string &filename) {
   m_filename = filename;
-  m_extension = Mantid::Kernel::Strings::toLower("." + Poco::Path(filename).getExtension());
+  m_extension = Mantid::Kernel::Strings::toLower(std::filesystem::path(filename).extension().string());
 
   m_file.open(m_filename.c_str(), std::ios::in | std::ios::binary);
   if (!m_file)

Framework/Kernel/src/FileValidator.cpp

@@ -75,9 +75,9 @@ std::string FileValidator::checkValidity(const std::string &value) const {
   // create a variable for the absolute path to be used in error messages
   std::string abspath(value);
   if (!value.empty()) {
-    Poco::Path path(value);
-    if (path.isAbsolute())
-      abspath = path.toString();
+    std::filesystem::path path(value);
+    if (path.is_absolute())
+      abspath = std::filesystem::absolute(path).string();
   }
 
   // If the file is required to exist check it is there

Framework/Kernel/src/NexusDescriptor.cpp

@@ -11,11 +11,9 @@
 #include <nexus/NeXusException.hpp>
 // clang-format on
 
-#include <filesystem>
-#include <Poco/Path.h>
-
 #include <algorithm>
 #include <cstring>
+#include <filesystem>
 #include <string>
 
 namespace Mantid::Kernel {
@@ -211,7 +209,7 @@ bool NexusDescriptor::classTypeExists(const std::string &classType) const {
  */
 void NexusDescriptor::initialize(const std::string &filename) {
   m_filename = filename;
-  m_extension = "." + Poco::Path(filename).getExtension();
+  m_extension = std::filesystem::path(filename).extension().string();
 
   m_file = std::make_unique<::NeXus::File>(this->filename());
 

Framework/Kernel/test/AttenuationProfileTest.h

@@ -25,6 +25,9 @@ class AttenuationProfileTest : public CxxTest::TestSuite {
 
   void testLoadAttenuationFile() {
     std::string path = Mantid::Kernel::ConfigService::Instance().getFullPath("AttenuationProfile.DAT", false, 0);
+    TS_ASSERT(!path.empty());
+    std::cout << "***" << path << "***\n";
+    auto profile = AttenuationProfile(path, "");
     TS_ASSERT_THROWS_NOTHING(auto profile = AttenuationProfile(path, ""));
   }
 

Framework/Kernel/test/DirectoryValidatorTest.h

@@ -9,7 +9,6 @@
 #include <cxxtest/TestSuite.h>
 
 #include "MantidKernel/DirectoryValidator.h"
-#include <Poco/File.h>
 #include <filesystem>
 #include <fstream>
 

Framework/Kernel/test/FileDescriptorTest.h

@@ -12,7 +12,6 @@
 #include "MantidKernel/ConfigService.h"
 #include "MantidKernel/FileDescriptor.h"
 
-#include <Poco/Path.h>
 #include <filesystem>
 
 using Mantid::Kernel::FileDescriptor;
@@ -29,18 +28,18 @@ class FileDescriptorTest : public CxxTest::TestSuite {
     cfg.reset();
     const auto &dataPaths = cfg.getDataSearchDirs();
     for (const auto &dataPath : dataPaths) {
-      Poco::Path nxsPath(dataPath, "CNCS_7860_event.nxs");
-      if (std::filesystem::exists(nxsPath.toString()))
-        m_testNexusPath = nxsPath.toString();
-      Poco::Path nonNxsPath(dataPath, "CSP79590.raw");
-      if (std::filesystem::exists(nonNxsPath.toString()))
-        m_testNonNexusPath = nonNxsPath.toString();
-      Poco::Path asciiPath(dataPath, "AsciiExample.txt");
-      if (std::filesystem::exists(asciiPath.toString()))
-        m_testAsciiPath = asciiPath.toString();
-      Poco::Path emptyFilePath(dataPath, "emptyFile.txt");
-      if (std::filesystem::exists(emptyFilePath.toString()))
-        m_emptyFilePath = emptyFilePath.toString();
+      const auto nxsPath = std::filesystem::path(dataPath) / "CNCS_7860_event.nxs";
+      if (std::filesystem::exists(nxsPath))
+        m_testNexusPath = nxsPath.string();
+      const auto nonNxsPath = std::filesystem::path(dataPath) / "CSP79590.raw";
+      if (std::filesystem::exists(nonNxsPath))
+        m_testNonNexusPath = nonNxsPath.string();
+      const auto asciiPath = std::filesystem::path(dataPath) / "AsciiExample.txt";
+      if (std::filesystem::exists(asciiPath))
+        m_testAsciiPath = asciiPath.string();
+      const auto emptyFilePath = std::filesystem::path(dataPath) / "emptyFile.txt";
+      if (std::filesystem::exists(emptyFilePath))
+        m_emptyFilePath = emptyFilePath.string();
 
       if (!m_testNexusPath.empty() && !m_testNonNexusPath.empty() && !m_testAsciiPath.empty() &&
           !m_emptyFilePath.empty())

Framework/Kernel/test/NexusDescriptorTest.h

@@ -13,7 +13,6 @@
 #include <filesystem>
 #include <memory>
 
-#include <Poco/Path.h>
 #include <nexus/NeXusFile.hpp>
 
 #include <cstdio>
@@ -31,17 +30,17 @@ class NexusDescriptorTest : public CxxTest::TestSuite {
     using Mantid::Kernel::ConfigService;
     auto dataPaths = ConfigService::Instance().getDataSearchDirs();
     for (auto &dataPath : dataPaths) {
-      Poco::Path hdf5Path(dataPath, "CNCS_7860_event.nxs");
-      if (std::filesystem::exists(hdf5Path.toString()))
-        m_testHDF5Path = hdf5Path.toString();
+      const auto hdf5Path = std::filesystem::path(dataPath) / "CNCS_7860_event.nxs";
+      if (std::filesystem::exists(hdf5Path))
+        m_testHDF5Path = hdf5Path.string();
 
-      Poco::Path hdf4Path(dataPath, "argus0026287.nxs");
-      if (std::filesystem::exists(hdf4Path.toString()))
-        m_testHDF4Path = hdf4Path.toString();
+      const auto hdf4Path = std::filesystem::path(dataPath) / "argus0026287.nxs";
+      if (std::filesystem::exists(hdf4Path))
+        m_testHDF4Path = hdf4Path.string();
 
-      Poco::Path nonhdf5Path(dataPath, "CSP79590.raw");
-      if (std::filesystem::exists(nonhdf5Path.toString()))
-        m_testNonHDFPath = nonhdf5Path.toString();
+      const auto nonhdf5Path = std::filesystem::path(dataPath) / "CSP79590.raw";
+      if (std::filesystem::exists(nonhdf5Path))
+        m_testNonHDFPath = nonhdf5Path.string();
 
       if (!m_testHDF5Path.empty() && !m_testHDF4Path.empty() && !m_testNonHDFPath.empty())
         break;

Framework/Kernel/test/NexusHDF5DescriptorTest.h

@@ -9,7 +9,6 @@
 #include "MantidKernel/ConfigService.h"
 #include "MantidKernel/NexusHDF5Descriptor.h"
 
-#include "Poco/Path.h"
 #include <filesystem>
 
 #include <cstddef> // std::size_t
@@ -21,9 +20,9 @@ std::string getFullPath(const std::string &filename) {
   using Mantid::Kernel::ConfigService;
   auto dataPaths = ConfigService::Instance().getDataSearchDirs();
   for (auto &dataPath : dataPaths) {
-    Poco::Path hdf5Path(dataPath, filename);
-    if (std::filesystem::exists(hdf5Path.toString())) {
-      return hdf5Path.toString();
+    const auto hdf5Path = std::filesystem::path(dataPath) / filename;
+    if (std::filesystem::exists(hdf5Path)) {
+      return hdf5Path.string();
     }
   }
   return std::string();