3 files changed, 70 insertions, 5 deletions
diff --git a/test/core/RegistryTest.cpp b/test/core/RegistryTest.cpp
index e06011a..4450227 100644
--- a/test/core/RegistryTest.cpp
+++ b/test/core/RegistryTest.cpp
@@ -54,9 +54,9 @@ TEST(Registry, locateResource)
 	instance.registerResourceLocator(&locator);
 	
 	ResourceLocator::Location location =
-	    instance.locateResource("path", "", ResourceLocator::Type::DOMAIN);
+	    instance.locateResource("path", "", ResourceLocator::Type::DOMAIN_DESC);
 	ASSERT_TRUE(location.found);
-	ASSERT_EQ(ResourceLocator::Type::DOMAIN, location.type);
+	ASSERT_EQ(ResourceLocator::Type::DOMAIN_DESC, location.type);
 	ASSERT_EQ("path", location.location);
 }
 
diff --git a/test/core/ResourceLocatorTest.cpp b/test/core/ResourceLocatorTest.cpp
index 38cfc3e..ebb164d 100644
--- a/test/core/ResourceLocatorTest.cpp
+++ b/test/core/ResourceLocatorTest.cpp
@@ -48,9 +48,9 @@ TEST(ResourceLocator, locate)
 {
 	TestResourceLocator instance;
 	ResourceLocator::Location location =
-	    instance.locate("path", "", ResourceLocator::Type::DOMAIN);
+	    instance.locate("path", "", ResourceLocator::Type::DOMAIN_DESC);
 	ASSERT_TRUE(location.found);
-	ASSERT_EQ(ResourceLocator::Type::DOMAIN, location.type);
+	ASSERT_EQ(ResourceLocator::Type::DOMAIN_DESC, location.type);
 	ASSERT_EQ("path", location.location);
 }
 
@@ -58,7 +58,7 @@ TEST(ResourceLocator, stream)
 {
 	TestResourceLocator instance;
 	ResourceLocator::Location location =
-	    instance.locate("path", "", ResourceLocator::Type::DOMAIN);
+	    instance.locate("path", "", ResourceLocator::Type::DOMAIN_DESC);
 	std::unique_ptr<std::istream> is = location.stream();
 
 	std::string str;
diff --git a/test/plugins/boost/FileLocatorTest.cpp b/test/plugins/boost/FileLocatorTest.cpp
new file mode 100644
index 0000000..7730492
--- /dev/null
+++ b/test/plugins/boost/FileLocatorTest.cpp
@@ -0,0 +1,65 @@
+/*
+    Ousía
+    Copyright (C) 2014, 2015  Benjamin Paaßen, Andreas Stöckel
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <gtest/gtest.h>
+
+#include <plugins/boost/FileLocator.hpp>
+
+namespace ousia {
+TEST(FileLocator, testAddSearchPath)
+{
+	FileLocator instance;
+	ASSERT_EQ(0, instance.getSearchPaths().size());
+
+	// Add one path for three types.
+	instance.addSearchPath(
+	    ".", {ResourceLocator::Type::DOMAIN_DESC, ResourceLocator::Type::SCRIPT,
+	          ResourceLocator::Type::TYPESYS});
+
+	ASSERT_EQ(3, instance.getSearchPaths().size());
+
+	auto it =
+	    instance.getSearchPaths().find(ResourceLocator::Type::DOMAIN_DESC);
+
+	ASSERT_EQ(1, it->second.size());
+	ASSERT_EQ(".", it->second[0].generic_string());
+
+	it = instance.getSearchPaths().find(ResourceLocator::Type::SCRIPT);
+
+	ASSERT_EQ(1, it->second.size());
+	ASSERT_EQ(".", it->second[0].generic_string());
+
+	it = instance.getSearchPaths().find(ResourceLocator::Type::TYPESYS);
+
+	ASSERT_EQ(1, it->second.size());
+	ASSERT_EQ(".", it->second[0].generic_string());
+
+	// Add another path for only one of those types.
+
+	instance.addSearchPath("..", {ResourceLocator::Type::DOMAIN_DESC});
+
+	ASSERT_EQ(3, instance.getSearchPaths().size());
+
+	auto it =
+	    instance.getSearchPaths().find(ResourceLocator::Type::DOMAIN_DESC);
+
+	ASSERT_EQ(2, it->second.size());
+	ASSERT_EQ(".", it->second[0].generic_string());
+	ASSERT_EQ("..", it->second[1].generic_string());
+}
+}