Remove search path test.

PDAL · Jul 27, 2020 · 3b8f58e · 3b8f58e
1 parent 6b801d4
commit 3b8f58e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 41 deletions.
diff --git a/pdal/PluginDirectory.cpp b/pdal/PluginDirectory.cpp
@@ -59,9 +59,7 @@ StringList pluginSearchPaths()
 
         for (std::string s : possiblePaths)
         {
-            std::cerr << "Path/Canonical = " << s << " / ";
             s = FileUtils::toCanonicalPath(s);
-            std::cerr << s << "!\n";
             if (s.size() && !Utils::contains(searchPaths, s))
                 searchPaths.push_back(s);
         }
@@ -141,11 +139,6 @@ PluginDirectory::PluginDirectory()
     }
 }
 
-StringList PluginDirectory::test_pluginSearchPaths()
-{
-    return pluginSearchPaths();
-}
-
 std::string PluginDirectory::test_validPlugin(const std::string& path,
     const StringList& types)
 {

diff --git a/pdal/PluginDirectory.hpp b/pdal/PluginDirectory.hpp
@@ -69,7 +69,6 @@ class PluginDirectory
 
 private:
     static PluginDirectory *m_instance;
-    PDAL_DLL static StringList test_pluginSearchPaths();
     PDAL_DLL static std::string test_validPlugin(const std::string& path,
         const StringList& types);
 };

diff --git a/test/unit/PluginManagerTest.cpp b/test/unit/PluginManagerTest.cpp
@@ -56,7 +56,11 @@ struct DummyPlugin : Filter
 
     static PF_ExitFunc initPlugin() // PF_InitFunc
     {
-        PluginInfo pi { "filters.dummytest", "A dummy plugin registered at run-time", "http://somewhere" };
+        PluginInfo pi {
+            "filters.dummytest",
+            "A dummy plugin registered at run-time",
+            "http://somewhere"
+        };
         pdal::PluginManager<Stage>::registerPlugin<DummyPlugin>(pi);
     }
 
@@ -81,38 +85,6 @@ TEST(PluginManagerTest, CreateObject)
     EXPECT_NE(p.get(), nullptr);
 }
 
-TEST(PluginManagerTest, SearchPaths)
-{
-    std::string curPath;
-    int set = Utils::getenv("PDAL_DRIVER_PATH", curPath);
-    Utils::unsetenv("PDAL_DRIVER_PATH");
-
-    StringList paths = PluginDirectory::test_pluginSearchPaths();
-    EXPECT_TRUE(Utils::contains(paths, Config::pluginInstallPath()));
-
-#ifdef _WIN32
-    Utils::setenv("PDAL_DRIVER_PATH", "C:\foo\bar;D:\baz");
-#else
-    Utils::setenv("PDAL_DRIVER_PATH", "/foo/bar://baz");
-#endif
-    paths = PluginDirectory::test_pluginSearchPaths();
-    EXPECT_EQ(paths.size(), 2U);
-
-#ifdef _WIN32
-    EXPECT_TRUE(Utils::contains(paths, "C:\foo\bar"));
-    EXPECT_TRUE(Utils::contains(paths, "D:\baz"));
-#else
-    EXPECT_TRUE(Utils::contains(paths, "/foo/bar"));
-    EXPECT_TRUE(Utils::contains(paths, "//baz"));
-#endif
-    Utils::setenv("PDAL_DRIVER_PATH", "/this/is/a/path");
-    paths = PluginDirectory::test_pluginSearchPaths();
-    EXPECT_EQ(paths.size(), 1U);
-    EXPECT_TRUE(Utils::contains(paths, "/this/is/a/path"));
-
-    if (set == 0)
-        Utils::setenv("PDAL_DRIVER_PATH", curPath);
-}
 
 TEST(PluginManagerTest, validnames)
 {