2 files changed, 49 insertions, 1 deletions
diff --git a/icespider/unittests/config/custom.properties b/icespider/unittests/config/custom.properties
new file mode 100644
index 0000000..302ea34
--- /dev/null
+++ b/icespider/unittests/config/custom.properties
@@ -0,0 +1 @@
+InFile=something
diff --git a/icespider/unittests/testApp.cpp b/icespider/unittests/testApp.cpp
index 67cec50..e19096f 100644
--- a/icespider/unittests/testApp.cpp
+++ b/icespider/unittests/testApp.cpp
@@ -90,7 +90,54 @@ class TestRequest : public IHttpRequest {
 		const HttpMethod method;
 };
 
-BOOST_FIXTURE_TEST_SUITE(c, Core);
+class CoreWithProps : public Core {
+	public:
+		CoreWithProps() :
+			Core({
+				"--Custom.Prop=value"
+			})
+		{
+		}
+};
+
+BOOST_FIXTURE_TEST_SUITE(props, CoreWithProps);
+
+BOOST_AUTO_TEST_CASE( properties )
+{
+	BOOST_REQUIRE_EQUAL("Test",
+			this->communicator->getProperties()->getProperty("TestIceSpider.TestApi"));
+	BOOST_REQUIRE_EQUAL("value",
+			this->communicator->getProperties()->getProperty("Custom.Prop"));
+}
+
+BOOST_AUTO_TEST_SUITE_END();
+
+class CoreWithFileProps : public Core {
+	public:
+		CoreWithFileProps() :
+			Core({
+				"--IceSpider.Config=config/custom.properties",
+				"--Custom.Prop=value"
+			})
+		{
+		}
+};
+
+BOOST_FIXTURE_TEST_SUITE(fileProps, CoreWithFileProps);
+
+BOOST_AUTO_TEST_CASE( properties )
+{
+	BOOST_REQUIRE_EQUAL("",
+			this->communicator->getProperties()->getProperty("TestIceSpider.TestApi"));
+	BOOST_REQUIRE_EQUAL("something",
+			this->communicator->getProperties()->getProperty("InFile"));
+	BOOST_REQUIRE_EQUAL("value",
+			this->communicator->getProperties()->getProperty("Custom.Prop"));
+}
+
+BOOST_AUTO_TEST_SUITE_END();
+
+BOOST_FIXTURE_TEST_SUITE(defaultProps, Core);
 
 BOOST_AUTO_TEST_CASE( testCoreSettings )
 {