Merge lp:~michihenning/unity-scopes-api/more-unit-tests into lp:unity-scopes-api

[Michi Henning]

More unit tests for middleware factory.

More unit tests for middleware factory.

=== modified file 'test/gtest/unity/api/scopes/internal/CMakeLists.txt'
--- test/gtest/unity/api/scopes/internal/CMakeLists.txt	2013-08-05 06:02:03 +0000
+++ test/gtest/unity/api/scopes/internal/CMakeLists.txt	2013-08-06 01:56:26 +0000
@@ -1,6 +1,8 @@
 add_subdirectory(ConfigBase)
 add_subdirectory(DynamicLoader)
 add_subdirectory(ice_middleware)
+add_subdirectory(MiddlewareFactory)
+add_subdirectory(MiddlewareFactoryConfig)
 add_subdirectory(RegistryConfig)
 add_subdirectory(RuntimeConfig)
 add_subdirectory(RuntimeImpl)

=== added directory 'test/gtest/unity/api/scopes/internal/MiddlewareFactory'
=== added file 'test/gtest/unity/api/scopes/internal/MiddlewareFactory/CMakeLists.txt'
--- test/gtest/unity/api/scopes/internal/MiddlewareFactory/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ test/gtest/unity/api/scopes/internal/MiddlewareFactory/CMakeLists.txt	2013-08-06 01:56:26 +0000
@@ -0,0 +1,7 @@
+configure_file(Factory.ini.in Factory.ini)
+configure_file(Ice.Config.in Ice.Config)
+
+add_executable(MiddlewareFactory_test MiddlewareFactory_test.cpp)
+target_link_libraries(MiddlewareFactory_test ${TESTLIBS})
+
+add_test(MiddlewareFactory MiddlewareFactory_test)

=== added file 'test/gtest/unity/api/scopes/internal/MiddlewareFactory/Factory.ini.in'
--- test/gtest/unity/api/scopes/internal/MiddlewareFactory/Factory.ini.in	1970-01-01 00:00:00 +0000
+++ test/gtest/unity/api/scopes/internal/MiddlewareFactory/Factory.ini.in	2013-08-06 01:56:26 +0000
@@ -0,0 +1,3 @@
+[MiddlewareFactory]
+Ice.Configfile = Ice.Config
+REST.Configfile = REST.Config

=== added file 'test/gtest/unity/api/scopes/internal/MiddlewareFactory/Ice.Config.in'
--- test/gtest/unity/api/scopes/internal/MiddlewareFactory/Ice.Config.in	1970-01-01 00:00:00 +0000
+++ test/gtest/unity/api/scopes/internal/MiddlewareFactory/Ice.Config.in	2013-08-06 01:56:26 +0000
@@ -0,0 +1,4 @@
+Ice.Plugin.IceUDS.cpp.IceUDS=@IceUDS_LIBDIR@/IceUDS,1.0:create_Ice_UDS
+Ice.Warn.UnusedProperties=1
+
+testscope.Endpoints = uds -f testscope-socket

=== added file 'test/gtest/unity/api/scopes/internal/MiddlewareFactory/MiddlewareFactory_test.cpp'
--- test/gtest/unity/api/scopes/internal/MiddlewareFactory/MiddlewareFactory_test.cpp	1970-01-01 00:00:00 +0000
+++ test/gtest/unity/api/scopes/internal/MiddlewareFactory/MiddlewareFactory_test.cpp	2013-08-06 01:56:26 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Michi Henning <[e-mail]>
+ */
+
+#include <unity/api/scopes/internal/MiddlewareFactory.h>
+#include <unity/api/scopes/ScopeExceptions.h>
+
+#include <gtest/gtest.h>
+
+using namespace std;
+using namespace unity::api::scopes;
+using namespace unity::api::scopes::internal;
+
+TEST(MiddlewareFactory, basic)
+{
+    MiddlewareFactory f("Factory.ini");
+    EXPECT_EQ(nullptr, f.find("nosuchscope", "Ice"));
+    MiddlewareBase::SPtr not_found;
+    MiddlewareBase::SPtr mw = f.find("testscope", "Ice");
+    EXPECT_EQ(not_found, mw);
+    mw = f.find("testscope", "NoSuchMiddleware");
+    EXPECT_EQ(not_found, mw);
+}
+
+TEST(MiddlewareFactory, BadKind)
+{
+    try
+    {
+        MiddlewareFactory f("Factory.ini");
+        f.create("somescope", "NoSuchMiddleware", "Ice.Config");
+        FAIL();
+    }
+    catch (ConfigException const& e)
+    {
+        EXPECT_EQ("unity::api::scopes::ConfigException: Invalid middleware kind: NoSuchMiddleware", e.to_string());
+    }
+}
+
+TEST(MiddlewareFactory, BadIniFile)
+{
+    try
+    {
+        MiddlewareFactory f("NoSuchFile.ini");
+        FAIL();
+    }
+    catch (ConfigException const& e)
+    {
+        EXPECT_EQ("unity::api::scopes::ConfigException: cannot instantiate MiddlewareFactory: "
+                  "config file: NoSuchFile.ini:\n"
+                  "    unity::FileException: Could not load ini file NoSuchFile.ini: "
+                  "No such file or directory (errno = 4)",
+                  e.to_string());
+    }
+}

=== added directory 'test/gtest/unity/api/scopes/internal/MiddlewareFactoryConfig'
=== added file 'test/gtest/unity/api/scopes/internal/MiddlewareFactoryConfig/CMakeLists.txt'
--- test/gtest/unity/api/scopes/internal/MiddlewareFactoryConfig/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ test/gtest/unity/api/scopes/internal/MiddlewareFactoryConfig/CMakeLists.txt	2013-08-06 01:56:26 +0000
@@ -0,0 +1,6 @@
+configure_file(Factory.ini.in Factory.ini)
+
+add_executable(MiddlewareFactoryConfig_test MiddlewareFactoryConfig_test.cpp)
+target_link_libraries(MiddlewareFactoryConfig_test ${TESTLIBS})
+
+add_test(MiddlewareFactoryConfig MiddlewareFactoryConfig_test)

=== added file 'test/gtest/unity/api/scopes/internal/MiddlewareFactoryConfig/Factory.ini.in'
--- test/gtest/unity/api/scopes/internal/MiddlewareFactoryConfig/Factory.ini.in	1970-01-01 00:00:00 +0000
+++ test/gtest/unity/api/scopes/internal/MiddlewareFactoryConfig/Factory.ini.in	2013-08-06 01:56:26 +0000
@@ -0,0 +1,3 @@
+[MiddlewareFactory]
+Ice.Configfile = Ice.Config
+REST.Configfile = REST.Config

=== added file 'test/gtest/unity/api/scopes/internal/MiddlewareFactoryConfig/MiddlewareFactoryConfig_test.cpp'
--- test/gtest/unity/api/scopes/internal/MiddlewareFactoryConfig/MiddlewareFactoryConfig_test.cpp	1970-01-01 00:00:00 +0000
+++ test/gtest/unity/api/scopes/internal/MiddlewareFactoryConfig/MiddlewareFactoryConfig_test.cpp	2013-08-06 01:56:26 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Michi Henning <[e-mail]>
+ */
+
+#include <unity/api/scopes/internal/MiddlewareFactoryConfig.h>
+
+#include <gtest/gtest.h>
+
+using namespace std;
+using namespace unity::api::scopes::internal;
+
+TEST(MiddlewareFactoryConfig, basic)
+{
+    MiddlewareFactoryConfig c("Factory.ini");
+    EXPECT_EQ("Ice.Config", c.ice_configfile());
+    EXPECT_EQ("REST.Config", c.rest_configfile());
+}