[3796] ccsession.cc|h renamed to command_interpreter.cc|h

diff --git a/src/bin/d2/bundy_d2_controller.h b/src/bin/d2/bundy_d2_controller.h
index 8ea0337f573ec8dbfbc23a97e56a7d5a6111de77..91c2439a1e36976311072711d3e620cc75a3d60f 100644 (file)
--- a/src/bin/d2/bundy_d2_controller.h
+++ b/src/bin/d2/bundy_d2_controller.h
@@ -18,7 +18,7 @@
 #include <asiolink/io_service.h>
 #include <cc/data.h>
 #include <cc/session.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <d2/d2_log.h>
 #include <d2/d_controller.h>
 #include <d2/d_process.h>

diff --git a/src/bin/d2/d2_process.cc b/src/bin/d2/d2_process.cc
index 702602ada4de4097a787e754fe9e5733b24d59ae..daed1b4fc84359addc9b2b43d79d1d70f9461070 100644 (file)
--- a/src/bin/d2/d2_process.cc
+++ b/src/bin/d2/d2_process.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <d2/d2_log.h>
 #include <d2/d2_cfg_mgr.h>
 #include <d2/d2_process.h>

diff --git a/src/bin/d2/d_cfg_mgr.cc b/src/bin/d2/d_cfg_mgr.cc
index 974a25bfd1c3ca21ff6c7caab771defd25266376..06c857a7a69c15065eee019e1d4db5c2da695b0e 100644 (file)
--- a/src/bin/d2/d_cfg_mgr.cc
+++ b/src/bin/d2/d_cfg_mgr.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <d2/d2_log.h>
 #include <dhcp/libdhcp++.h>
 #include <d2/d_cfg_mgr.h>

diff --git a/src/bin/d2/d_controller.cc b/src/bin/d2/d_controller.cc
index 9c20ce18d9604bfc65decc0a2944c94a5d2cff37..9686f936692814c750ef17df6c13de4d77a6a243 100644 (file)
--- a/src/bin/d2/d_controller.cc
+++ b/src/bin/d2/d_controller.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 #include <d2/d2_log.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <d2/d_controller.h>
 #include <exceptions/exceptions.h>
 #include <log/logger_support.h>

diff --git a/src/bin/d2/tests/bundy_d2_controller_unittests.cc b/src/bin/d2/tests/bundy_d2_controller_unittests.cc
index 05747261f224800787b3fcee2757ff0dd657ed19..acc4c5ee17ad5b433c7f67eb2e5db847d007248a 100644 (file)
--- a/src/bin/d2/tests/bundy_d2_controller_unittests.cc
+++ b/src/bin/d2/tests/bundy_d2_controller_unittests.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <d_test_stubs.h>
 #include <d2/bundy_d2_controller.h>
 #include <d2/spec_config.h>

diff --git a/src/bin/d2/tests/d2_controller_unittests.cc b/src/bin/d2/tests/d2_controller_unittests.cc
index 24215379431d65b320ca7669b8656754091ee618..95695ac9ecb739e8484f007f0dfa74692cea4da9 100644 (file)
--- a/src/bin/d2/tests/d2_controller_unittests.cc
+++ b/src/bin/d2/tests/d2_controller_unittests.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <d_test_stubs.h>
 #include <d2/d2_controller.h>
 #include <d2/d2_process.h>

diff --git a/src/bin/d2/tests/d2_process_unittests.cc b/src/bin/d2/tests/d2_process_unittests.cc
index b31f0b1d4909e9924bad7650a00b7de7a0085be1..9cfbdbfac6e3ce048298c891da2f27ec04168cfa 100644 (file)
--- a/src/bin/d2/tests/d2_process_unittests.cc
+++ b/src/bin/d2/tests/d2_process_unittests.cc
@@ -15,7 +15,7 @@
 #include <config.h>
 
 #include <asiolink/io_service.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <d2/d2_process.h>
 #include <dhcp_ddns/ncr_io.h>
 #include <d_test_stubs.h>

diff --git a/src/bin/d2/tests/d_cfg_mgr_unittests.cc b/src/bin/d2/tests/d_cfg_mgr_unittests.cc
index 1c1e23b51617f14a0b3276643031aa9c5ea8c615..37e3dad988f0971c826b87a09eb7c4dd21babe85 100644 (file)
--- a/src/bin/d2/tests/d_cfg_mgr_unittests.cc
+++ b/src/bin/d2/tests/d_cfg_mgr_unittests.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <config/module_spec.h>
 #include <dhcpsrv/parsers/dhcp_parsers.h>
 #include <d2/d_cfg_mgr.h>

diff --git a/src/bin/d2/tests/d_controller_unittests.cc b/src/bin/d2/tests/d_controller_unittests.cc
index b676019059cd60971c4eaeb7a960b9f980c4a9d7..ef48b5bbf11b029a03f14ee8ffc9fd9fb5419856 100644 (file)
--- a/src/bin/d2/tests/d_controller_unittests.cc
+++ b/src/bin/d2/tests/d_controller_unittests.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <d_test_stubs.h>
 #include <d2/spec_config.h>
 

diff --git a/src/bin/d2/tests/d_test_stubs.h b/src/bin/d2/tests/d_test_stubs.h
index ab50ae709c61c347a4145fbcf61b90062ff9518d..232b93392334bbd9f40968623ba2503978196e39 100644 (file)
--- a/src/bin/d2/tests/d_test_stubs.h
+++ b/src/bin/d2/tests/d_test_stubs.h
@@ -18,7 +18,7 @@
 #include <asiolink/io_service.h>
 
 #include <cc/data.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 
 #include <d2/d_controller.h>
 #include <d2/d_cfg_mgr.h>

diff --git a/src/bin/dhcp4/bundy_controller.cc b/src/bin/dhcp4/bundy_controller.cc
index c5757485f0f992e428b90af4e393a71f98199406..465ad663dbf07649ce81157286c166ad7946c767 100644 (file)
--- a/src/bin/dhcp4/bundy_controller.cc
+++ b/src/bin/dhcp4/bundy_controller.cc
@@ -17,7 +17,7 @@
 #include <asiolink/asiolink.h>
 #include <cc/data.h>
 #include <cc/session.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <dhcp/iface_mgr.h>
 #include <dhcp4/json_config_parser.h>
 #include <dhcp4/ctrl_dhcp4_srv.h>

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.h b/src/bin/dhcp4/ctrl_dhcp4_srv.h
index ba8fc95b4d1f0d8d00efe67e60d83b1df21ef5f8..686098bcff3dac97c0089ea594e001e9a6e89aac 100644 (file)
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.h
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.h
@@ -17,7 +17,7 @@
 
 #include <asiolink/asiolink.h>
 #include <cc/data.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <dhcp4/dhcp4_srv.h>
 
 namespace isc {

diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index 418b978b0ebfaad28ce2a11518c865d9828c516f..5b22a6a9be2855220994f18cb44885c6cdd7dd04 100644 (file)
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <dhcp4/dhcp4_log.h>
 #include <dhcp/libdhcp++.h>
 #include <dhcp/option_definition.h>

diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc
index 7cb289ca06d2fd36978b81a7bb0fa59f36c50fe2..67a1e3043233763d2acf85185b45b72c07513201 100644 (file)
--- a/src/bin/dhcp4/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp4/tests/config_parser_unittest.cc
@@ -17,7 +17,7 @@
 #include <arpa/inet.h>
 #include <gtest/gtest.h>
 
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <dhcp4/dhcp4_srv.h>
 #include <dhcp4/json_config_parser.h>
 #include <dhcp/option4_addrlst.h>

diff --git a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
index 5f111b4fb9786c70e855d66f1994f5f58d430c3c..d1b72ff41bcd03150fada1e80cc9aedf4b40afd5 100644 (file)
--- a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <dhcp/dhcp4.h>
 #include <dhcp4/ctrl_dhcp4_srv.h>
 #include <hooks/hooks_manager.h>

diff --git a/src/bin/dhcp4/tests/d2_unittest.h b/src/bin/dhcp4/tests/d2_unittest.h
index 673b8662dbdf15c1cfd14640664120b381fff4e4..a86086bb1e10d117abb660dc2d37b805e7a8e697 100644 (file)
--- a/src/bin/dhcp4/tests/d2_unittest.h
+++ b/src/bin/dhcp4/tests/d2_unittest.h
@@ -18,7 +18,7 @@
 #define D2_UNITTEST_H
 
 #include <dhcp4/dhcp4_srv.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 
 #include <gtest/gtest.h>
 

diff --git a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
index f44e7627eef29762063a2a72a32d2c2db9f61bb5..47ebb263a6eba77bf73a6ecba2c52516831bb05e 100644 (file)
--- a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
@@ -16,7 +16,7 @@
 #include <sstream>
 
 #include <asiolink/io_address.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <dhcp4/tests/dhcp4_test_utils.h>
 #include <dhcp/tests/pkt_captures.h>
 #include <dhcp/dhcp4.h>
@@ -42,7 +42,6 @@
 #include <gtest/gtest.h>
 #include <hooks/server_hooks.h>
 #include <hooks/hooks_manager.h>
-#include <config/ccsession.h>
 
 #include <boost/scoped_ptr.hpp>
 

diff --git a/src/bin/dhcp4/tests/dhcp4_test_utils.cc b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
index 32e834aedfb258cefc2140916caf549283390363..ee3684bfdea0755f58f243dac9bc4f83cacf3fa4 100644 (file)
--- a/src/bin/dhcp4/tests/dhcp4_test_utils.cc
+++ b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
@@ -16,7 +16,7 @@
 
 #include <asiolink/io_address.h>
 #include <cc/data.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <dhcp4/json_config_parser.h>
 #include <dhcp4/tests/dhcp4_test_utils.h>
 #include <dhcp/option4_addrlst.h>

diff --git a/src/bin/dhcp4/tests/dhcp4_test_utils.h b/src/bin/dhcp4/tests/dhcp4_test_utils.h
index f3ba99cedd0640721711ba76c16c8d057b94389b..512e70aace5f0c3a99e1ad913b830b3781e712ff 100644 (file)
--- a/src/bin/dhcp4/tests/dhcp4_test_utils.h
+++ b/src/bin/dhcp4/tests/dhcp4_test_utils.h
@@ -30,7 +30,7 @@
 #include <dhcpsrv/lease_mgr_factory.h>
 #include <dhcp4/dhcp4_srv.h>
 #include <asiolink/io_address.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <list>
 
 #include <boost/shared_ptr.hpp>

diff --git a/src/bin/dhcp4/tests/kea_controller_unittest.cc b/src/bin/dhcp4/tests/kea_controller_unittest.cc
index d98621ed0e962a261cd4df56a018c351a218a4d9..2235bdbbad5718cdd3a0857440552c298e82a1ba 100644 (file)
--- a/src/bin/dhcp4/tests/kea_controller_unittest.cc
+++ b/src/bin/dhcp4/tests/kea_controller_unittest.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <dhcp/dhcp4.h>
 #include <dhcp4/ctrl_dhcp4_srv.h>
 #include <dhcpsrv/cfgmgr.h>

diff --git a/src/bin/dhcp6/bundy_controller.cc b/src/bin/dhcp6/bundy_controller.cc
index c4e12062c11805117811b2111ae04f0951459d60..02f31ab57ccde60a29632db9b9bee6c6a92922e0 100644 (file)
--- a/src/bin/dhcp6/bundy_controller.cc
+++ b/src/bin/dhcp6/bundy_controller.cc
@@ -17,7 +17,7 @@
 #include <asiolink/asiolink.h>
 #include <cc/data.h>
 #include <cc/session.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <dhcp/iface_mgr.h>
 #include <dhcpsrv/dhcp_config_parser.h>
 #include <dhcpsrv/cfgmgr.h>

diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.h b/src/bin/dhcp6/ctrl_dhcp6_srv.h
index 780a9a2154d941ba167bef64a5a322da2d2f9d2a..cf5fa18bd9174cfa052af158e887a87b3e03469a 100644 (file)
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.h
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.h
@@ -17,7 +17,7 @@
 
 #include <asiolink/asiolink.h>
 #include <cc/data.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <dhcp6/dhcp6_srv.h>
 
 namespace isc {

diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc
index 1ca364129de7b1110f5dee2ac2ee9c6afa894553..0d960b8eb7e3e027c863e23d575c32fddb83f913 100644 (file)
--- a/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@ -16,7 +16,7 @@
 
 #include <asiolink/io_address.h>
 #include <cc/data.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <dhcp/libdhcp++.h>
 #include <dhcp6/json_config_parser.h>
 #include <dhcp6/dhcp6_log.h>

diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc
index f843b160ea3f2b5461c6fbd8de647cd05bd44f49..a0c624c761aa2541588569c982daa2450b3a8905 100644 (file)
--- a/src/bin/dhcp6/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp6/tests/config_parser_unittest.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <dhcp/libdhcp++.h>
 #include <dhcp/option6_ia.h>
 #include <dhcp/iface_mgr.h>

diff --git a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
index 110adc8fbb99052dfa9f21ab5adff85bff290c11..f0b53c81ed955be4029601d2939d03bfe66a474d 100644 (file)
--- a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <dhcpsrv/cfgmgr.h>
 #include <dhcp6/ctrl_dhcp6_srv.h>
 #include <hooks/hooks_manager.h>

diff --git a/src/bin/dhcp6/tests/d2_unittest.h b/src/bin/dhcp6/tests/d2_unittest.h
index 8a77c9bc70dc2071ce528c0986fe87138c472182..4a2a029e7907de58a6d3a34e72093d43c82fe2bb 100644 (file)
--- a/src/bin/dhcp6/tests/d2_unittest.h
+++ b/src/bin/dhcp6/tests/d2_unittest.h
@@ -18,7 +18,7 @@
 #define D2_UNITTEST_H
 
 #include <dhcp6/dhcp6_srv.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 
 #include <gtest/gtest.h>
 

diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index 8548d9947da655075a656a6904b46a8f68387e82..4e3d13afe4b78f00c7a388aa58abb1988023f7c7 100644 (file)
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -42,7 +42,7 @@
 #include <dhcp6/tests/dhcp6_test_utils.h>
 #include <dhcp6/tests/dhcp6_client.h>
 #include <dhcp/tests/pkt_captures.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <boost/pointer_cast.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <gtest/gtest.h>

diff --git a/src/bin/dhcp6/tests/dhcp6_test_utils.cc b/src/bin/dhcp6/tests/dhcp6_test_utils.cc
index 83a466a1055c6c544c10bf99466c06c650867073..9fe610e5724c2f13d4e6970f8496df362eb35d41 100644 (file)
--- a/src/bin/dhcp6/tests/dhcp6_test_utils.cc
+++ b/src/bin/dhcp6/tests/dhcp6_test_utils.cc
@@ -16,7 +16,7 @@
 #include <gtest/gtest.h>
 #include <dhcp6/tests/dhcp6_test_utils.h>
 #include <dhcp6/json_config_parser.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <string.h>
 
 using namespace isc::data;

diff --git a/src/bin/dhcp6/tests/hooks_unittest.cc b/src/bin/dhcp6/tests/hooks_unittest.cc
index 40c3de83cfc9a005968001d228f785fbfd4fd517..a83ce22d1fc3b4427d3bcfbad79bf8dc7afe1992 100644 (file)
--- a/src/bin/dhcp6/tests/hooks_unittest.cc
+++ b/src/bin/dhcp6/tests/hooks_unittest.cc
@@ -29,7 +29,7 @@
 
 #include <dhcp6/tests/dhcp6_test_utils.h>
 #include <dhcp/tests/pkt_captures.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <boost/scoped_ptr.hpp>
 #include <gtest/gtest.h>
 #include <unistd.h>

diff --git a/src/bin/dhcp6/tests/kea_controller_unittest.cc b/src/bin/dhcp6/tests/kea_controller_unittest.cc
index dfed9fc4d10afffba1bf4714ffe6fb677f8b6160..00b6182b2d449f7ab730be66b5f1fc5b6a31d524 100644 (file)
--- a/src/bin/dhcp6/tests/kea_controller_unittest.cc
+++ b/src/bin/dhcp6/tests/kea_controller_unittest.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <dhcp/dhcp6.h>
 #include <dhcp6/ctrl_dhcp6_srv.h>
 #include <dhcpsrv/cfgmgr.h>

diff --git a/src/lib/config/Makefile.am b/src/lib/config/Makefile.am
index 32e56831f63dffafba19f78707d948e37f63f630..c295caa045b6aaad063e3e94067a29350acefa1e 100644 (file)
--- a/src/lib/config/Makefile.am
+++ b/src/lib/config/Makefile.am
@@ -17,7 +17,7 @@ BUILT_SOURCES = config_messages.h config_messages.cc
 lib_LTLIBRARIES = libkea-cfgclient.la
 libkea_cfgclient_la_SOURCES = config_data.h config_data.cc
 libkea_cfgclient_la_SOURCES += module_spec.h module_spec.cc
-libkea_cfgclient_la_SOURCES += ccsession.cc ccsession.h
+libkea_cfgclient_la_SOURCES += command_interpreter.cc command_interpreter.h
 libkea_cfgclient_la_SOURCES += config_log.h config_log.cc
 
 libkea_cfgclient_la_LIBADD = $(top_builddir)/src/lib/cc/libkea-cc.la

diff --git a/src/lib/config/ccsession.cc b/src/lib/config/command_interpreter.cc
similarity index 98%
rename from src/lib/config/ccsession.cc
rename to src/lib/config/command_interpreter.cc
index 6b8bf30b0a8b972f8cc9016057d37700ba57de7e..7a87ad09271c189165b267a609d2b893468678d7 100644 (file)
--- a/src/lib/config/ccsession.cc
+++ b/src/lib/config/command_interpreter.cc
@@ -36,7 +36,7 @@
 #include <exceptions/exceptions.h>
 
 #include <config/config_log.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 
 #include <log/logger_support.h>
 #include <log/logger_specification.h>
@@ -167,6 +167,9 @@ parseCommand(ConstElementPtr& arg, ConstElementPtr command) {
     return (cmd->stringValue());
 }
 
+/// @todo: The code below should be reviewed whether it's still in use. If it is,
+/// it should be moved to a separate file.
+
 namespace {
 // Temporary workaround functions for missing functionality in
 // getValue() (main problem described in ticket #993)

diff --git a/src/lib/config/ccsession.h b/src/lib/config/command_interpreter.h
similarity index 100%
rename from src/lib/config/ccsession.h
rename to src/lib/config/command_interpreter.h

diff --git a/src/lib/config/tests/Makefile.am b/src/lib/config/tests/Makefile.am
index 6a7abe13434db6843e851b8abe0deb298b004a31..6fb947c911b022e9ace56eb34b53cb64b741f1c0 100644 (file)
--- a/src/lib/config/tests/Makefile.am
+++ b/src/lib/config/tests/Makefile.am
@@ -17,7 +17,8 @@ TESTS_ENVIRONMENT = \
 TESTS =
 if HAVE_GTEST
 TESTS += run_unittests
-run_unittests_SOURCES = ccsession_unittests.cc module_spec_unittests.cc config_data_unittests.cc run_unittests.cc
+run_unittests_SOURCES = command_interpreter_unittests.cc module_spec_unittests.cc
+run_unittests_SOURCES += config_data_unittests.cc run_unittests.cc
 
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)

diff --git a/src/lib/config/tests/ccsession_unittests.cc b/src/lib/config/tests/command_interpreter_unittests.cc
similarity index 96%
rename from src/lib/config/tests/ccsession_unittests.cc
rename to src/lib/config/tests/command_interpreter_unittests.cc
index c6fe8c7eb9a793e1dda818b5507965d3474c7e7b..34ab774e48ccbc6f3b7d05f893a088e0ff91a9f9 100644 (file)
--- a/src/lib/config/tests/ccsession_unittests.cc
+++ b/src/lib/config/tests/command_interpreter_unittests.cc
@@ -15,7 +15,7 @@
 #include <config.h>
 
 #include <gtest/gtest.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <config/tests/data_def_unittests_config.h>
 #include <log/logger_name.h>
 #include <boost/scoped_ptr.hpp>
@@ -37,16 +37,7 @@ el(const std::string& str) {
     return (Element::fromJSON(str));
 }
 
-class CCSessionTest : public ::testing::Test {
-protected:
-    CCSessionTest()
-    {
-    }
-    ~CCSessionTest() {
-    }
-};
-
-TEST_F(CCSessionTest, createAnswer) {
+TEST(CommandInterpreterTest, createAnswer) {
     ConstElementPtr answer;
     answer = createAnswer();
     EXPECT_EQ("{ \"result\": 0 }", answer->str());
@@ -62,7 +53,7 @@ TEST_F(CCSessionTest, createAnswer) {
               answer->str());
 }
 
-TEST_F(CCSessionTest, parseAnswer) {
+TEST(CommandInterpreterTest, parseAnswer) {
     ConstElementPtr answer;
     ConstElementPtr arg;
     int rcode;
@@ -92,7 +83,7 @@ TEST_F(CCSessionTest, parseAnswer) {
     EXPECT_EQ("[ \"just\", \"some\", \"data\" ]", arg->str());
 }
 
-TEST_F(CCSessionTest, createCommand) {
+TEST(CommandInterpreterTest, createCommand) {
     ConstElementPtr command;
     ConstElementPtr arg;
 
@@ -115,7 +106,7 @@ TEST_F(CCSessionTest, createCommand) {
               command->str());
 }
 
-TEST_F(CCSessionTest, parseCommand) {
+TEST(CommandInterpreterTest, parseCommand) {
     ConstElementPtr arg;
     std::string cmd;
 

diff --git a/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc b/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc
index 24448271e9e7025785af9c0eb641e730fc321ece..db8e5bb6fe5f2611e2b0a23357f72e0ccb6aca5a 100644 (file)
--- a/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc
+++ b/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <dhcpsrv/lease_mgr_factory.h>
 #include <dhcpsrv/parsers/dbaccess_parser.h>
 #include <log/logger_support.h>

diff --git a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
index 51e12f1cae85b80f9a637d90675ee5cc7eaeff9a..c5e62b136e613a9c907c612fe071801805b1dccf 100644 (file)
--- a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
+++ b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
@@ -13,7 +13,7 @@
 // PERFORMANCE OF THIS SOFTWARE.
 
 #include <config.h>
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <cc/data.h>
 #include <dhcp/option.h>
 #include <dhcp/option_custom.h>

diff --git a/src/lib/dhcpsrv/testutils/config_result_check.cc b/src/lib/dhcpsrv/testutils/config_result_check.cc
index b56bc9e53764428dbcd3605b8cf266b84d589aaf..0fc67d32a1ea4dd7877969fbbac80662947540d2 100644 (file)
--- a/src/lib/dhcpsrv/testutils/config_result_check.cc
+++ b/src/lib/dhcpsrv/testutils/config_result_check.cc
@@ -12,7 +12,7 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#include <config/ccsession.h>
+#include <config/command_interpreter.h>
 #include <dhcpsrv/testutils/config_result_check.h>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/constants.hpp>