commit 97210d5b150e00676dc168ff6d48829f11a59c8e
author Davide Pesavento <davide.pesavento@lip6.fr> Fri Oct 14 15:45:48 2016 +0200
committer Davide Pesavento <davide.pesavento@lip6.fr> Fri Oct 14 15:45:48 2016 +0200
tree aae8687d948dc9d847ebbe6316352f44f66a82d4
parent 436f3bd9feaf68c993acc80e06bbe7b7ddfc8a18

tests: respect naming conventions and improve nesting of some test suites

Change-Id: I65af858bc6d10197c6ee11111fa9f7c1faa617ef
Refs: #2497

tests/daemon/mgmt/nfd-manager-common-fixture.hpp

diff --git a/tests/daemon/mgmt/nfd-manager-common-fixture.hpp b/tests/daemon/mgmt/nfd-manager-common-fixture.hpp
index 65c5dcc..fb2dbc2 100644
--- a/tests/daemon/mgmt/nfd-manager-common-fixture.hpp
+++ b/tests/daemon/mgmt/nfd-manager-common-fixture.hpp
@@ -23,10 +23,10 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NFD_TESTS_NFD_MGMT_NFD_MANAGER_COMMON_FIXTURE_HPP
-#define NFD_TESTS_NFD_MGMT_NFD_MANAGER_COMMON_FIXTURE_HPP
+#ifndef NFD_TESTS_DAEMON_MGMT_NFD_MANAGER_COMMON_FIXTURE_HPP
+#define NFD_TESTS_DAEMON_MGMT_NFD_MANAGER_COMMON_FIXTURE_HPP
 
-#include "manager-common-fixture.hpp"
+#include "tests/manager-common-fixture.hpp"
 #include "fw/forwarder.hpp"
 #include "mgmt/command-authenticator.hpp"
 
@@ -58,7 +58,7 @@
 class CommandSuccess
 {
 public:
-  ControlResponse
+  static ControlResponse
   getExpected()
   {
     return ControlResponse()
@@ -71,7 +71,7 @@
 class CommandFailure
 {
 public:
-  ControlResponse
+  static ControlResponse
   getExpected()
   {
     return ControlResponse()
@@ -83,4 +83,4 @@
 } // namespace tests
 } // namespace nfd
 
-#endif // NFD_TESTS_NFD_MGMT_NFD_MANAGER_COMMON_FIXTURE_HPP
+#endif // NFD_TESTS_DAEMON_MGMT_NFD_MANAGER_COMMON_FIXTURE_HPP