You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2015/02/23 07:00:42 UTC
[7/7] mesos git commit: Enclosed tests in "mesos::internal::tests"
namespace.
Enclosed tests in "mesos::internal::tests" namespace.
Enclosed tests in "mesos::internal::tests" namespace or
"mesos::internal::slave" namespace as needed.
The idea was to avoid doing a "using namespace
mesos::internal::slave;" or similar things.
Review: https://reviews.apache.org/r/31279
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e9357070
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e9357070
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e9357070
Branch: refs/heads/master
Commit: e9357070be70b22034e6593fff67d0fbcb5c35db
Parents: 40b5964
Author: Kapil Arya <ka...@mesosphere.io>
Authored: Sun Feb 22 14:01:14 2015 -0800
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Sun Feb 22 22:00:08 2015 -0800
----------------------------------------------------------------------
src/tests/attributes_tests.cpp | 11 ++++++---
src/tests/authentication_tests.cpp | 14 +++++++----
src/tests/authorization_tests.cpp | 13 ++++++----
src/tests/cgroups_isolator_tests.cpp | 13 ++++++----
src/tests/cgroups_tests.cpp | 11 +++++++--
src/tests/composing_containerizer_tests.cpp | 12 +++++++---
src/tests/containerizer_tests.cpp | 15 ++++++++----
src/tests/credentials_tests.cpp | 15 ++++++++----
src/tests/disk_quota_tests.cpp | 12 ++++++----
src/tests/docker_containerizer_tests.cpp | 12 ++++++----
src/tests/docker_tests.cpp | 12 ++++++----
src/tests/exception_tests.cpp | 12 ++++++----
src/tests/external_containerizer_test.cpp | 12 ++++++----
src/tests/fault_tolerance_tests.cpp | 11 ++++++---
src/tests/fetcher_tests.cpp | 16 ++++++++-----
src/tests/files_tests.cpp | 11 ++++++---
src/tests/fs_tests.cpp | 10 +++++---
src/tests/gc_tests.cpp | 12 ++++++----
src/tests/group_tests.cpp | 11 ++++++---
src/tests/health_check_tests.cpp | 12 ++++++----
src/tests/hierarchical_allocator_tests.cpp | 11 ++++++---
src/tests/hook_tests.cpp | 11 ++++++---
src/tests/isolator.hpp | 2 +-
src/tests/isolator_tests.cpp | 13 ++++++----
src/tests/log_tests.cpp | 11 ++++++---
src/tests/logging_tests.cpp | 10 ++++++--
src/tests/master_allocator_tests.cpp | 12 ++++++----
src/tests/master_authorization_tests.cpp | 12 ++++++----
src/tests/master_contender_detector_tests.cpp | 12 ++++++----
src/tests/master_slave_reconciliation_tests.cpp | 11 ++++++---
src/tests/master_tests.cpp | 12 ++++++----
src/tests/master_validation_tests.cpp | 10 ++++++--
src/tests/metrics_tests.cpp | 11 ++++++---
src/tests/module.cpp | 15 ++++++++----
src/tests/module_tests.cpp | 14 ++++++++---
src/tests/monitor_tests.cpp | 12 ++++++----
src/tests/ns_tests.cpp | 11 ++++++---
src/tests/partition_tests.cpp | 12 ++++++----
src/tests/perf_tests.cpp | 8 +++++++
src/tests/persistent_volume_tests.cpp | 15 ++++++++----
src/tests/port_mapping_tests.cpp | 14 ++++++-----
src/tests/protobuf_io_tests.cpp | 12 ++++++----
src/tests/rate_limiting_tests.cpp | 2 --
src/tests/reconciliation_tests.cpp | 12 ++++++----
src/tests/registrar_tests.cpp | 19 +++++++--------
src/tests/registrar_zookeeper_tests.cpp | 12 ++++++----
src/tests/repair_tests.cpp | 15 +++++++-----
src/tests/resource_offers_tests.cpp | 12 ++++++----
src/tests/resources_tests.cpp | 11 ++++++---
src/tests/routing_tests.cpp | 8 +++++++
src/tests/scheduler_tests.cpp | 12 ++++++----
src/tests/shutdown_tests.cpp | 15 ++++++++----
src/tests/slave_recovery_tests.cpp | 14 ++++++-----
src/tests/slave_tests.cpp | 12 ++++++----
src/tests/sorter_tests.cpp | 10 ++++++--
src/tests/state_tests.cpp | 25 ++++++++++++--------
src/tests/status_update_manager_tests.cpp | 13 ++++++----
src/tests/values_tests.cpp | 10 ++++++--
src/tests/zookeeper_tests.cpp | 10 ++++++--
59 files changed, 486 insertions(+), 224 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/attributes_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/attributes_tests.cpp b/src/tests/attributes_tests.cpp
index 240a8ca..2e10eaf 100644
--- a/src/tests/attributes_tests.cpp
+++ b/src/tests/attributes_tests.cpp
@@ -23,11 +23,12 @@
#include "common/attributes.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-
using std::string;
+namespace mesos {
+namespace internal {
+namespace tests {
+
TEST(AttributesTest, Parsing)
{
@@ -65,3 +66,7 @@ TEST(AttributesTest, Equality)
EXPECT_NE(a, Attributes::parse("cpus:45.55;ports:45.55;rack:45.55"));
EXPECT_NE(Attributes::parse(""), a);
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/authentication_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/authentication_tests.cpp b/src/tests/authentication_tests.cpp
index 5220f00..5126ed4 100644
--- a/src/tests/authentication_tests.cpp
+++ b/src/tests/authentication_tests.cpp
@@ -33,19 +33,19 @@
#include "tests/mesos.hpp"
#include "tests/utils.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::slave;
-using namespace mesos::internal::tests;
-
using namespace process;
using mesos::internal::master::Master;
+using mesos::internal::slave::Slave;
using testing::_;
using testing::Eq;
using testing::Return;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class AuthenticationTest : public MesosTest {};
@@ -834,3 +834,7 @@ TEST_F(AuthenticationTest, RejectedSchedulerFailover)
Shutdown();
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/authorization_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/authorization_tests.cpp b/src/tests/authorization_tests.cpp
index a8fa4cc..99bb06c 100644
--- a/src/tests/authorization_tests.cpp
+++ b/src/tests/authorization_tests.cpp
@@ -24,12 +24,13 @@
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using namespace process;
+namespace mesos {
+namespace internal {
+namespace tests {
+
+
class AuthorizationTest : public MesosTest {};
@@ -349,3 +350,7 @@ TEST_F(AuthorizationTest, PrincipalNotOfferedAnyRoleRestrictive)
request3.mutable_roles()->add_values("ads");
AWAIT_EXPECT_EQ(false, authorizer.get()->authorize(request3));
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/cgroups_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cgroups_isolator_tests.cpp b/src/tests/cgroups_isolator_tests.cpp
index 2d9738f..a4ccc8e 100644
--- a/src/tests/cgroups_isolator_tests.cpp
+++ b/src/tests/cgroups_isolator_tests.cpp
@@ -29,13 +29,18 @@
#include "tests/script.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::slave;
-
using std::map;
+namespace mesos {
+namespace internal {
+namespace tests {
+
+
// Run the balloon framework under a mesos containerizer.
TEST_SCRIPT(ContainerizerTest,
ROOT_CGROUPS_BalloonFramework,
"balloon_framework_test.sh")
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/cgroups_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cgroups_tests.cpp b/src/tests/cgroups_tests.cpp
index 1eea57f..75c61aa 100644
--- a/src/tests/cgroups_tests.cpp
+++ b/src/tests/cgroups_tests.cpp
@@ -53,12 +53,15 @@
#include "tests/mesos.hpp" // For TEST_CGROUPS_(HIERARCHY|ROOT).
-using namespace mesos::internal::tests;
-
using namespace process;
using std::set;
+namespace mesos {
+namespace internal {
+namespace tests {
+
+
class CgroupsTest : public ::testing::Test
{
public:
@@ -1029,3 +1032,7 @@ TEST_F(CgroupsAnyHierarchyWithPerfEventTest, ROOT_CGROUPS_Perf)
Future<Nothing> destroy = cgroups::destroy(hierarchy, TEST_CGROUPS_ROOT);
AWAIT_READY(destroy);
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/composing_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/composing_containerizer_tests.cpp b/src/tests/composing_containerizer_tests.cpp
index 5ab5a36..d66f519 100644
--- a/src/tests/composing_containerizer_tests.cpp
+++ b/src/tests/composing_containerizer_tests.cpp
@@ -33,10 +33,7 @@
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::internal;
using namespace mesos::internal::slave;
-using namespace mesos::internal::tests;
using namespace process;
@@ -45,6 +42,11 @@ using std::vector;
using testing::_;
using testing::Return;
+namespace mesos {
+namespace internal {
+namespace tests {
+
+
class ComposingContainerizerTest : public MesosTest {};
class MockContainerizer : public slave::Containerizer
@@ -163,3 +165,7 @@ TEST_F(ComposingContainerizerTest, DestroyWhileLaunching)
launchPromise.set(false);
AWAIT_FAILED(launch);
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer_tests.cpp b/src/tests/containerizer_tests.cpp
index 0c87753..e6e8c8c 100644
--- a/src/tests/containerizer_tests.cpp
+++ b/src/tests/containerizer_tests.cpp
@@ -43,9 +43,7 @@
#include "tests/mesos.hpp"
#include "tests/utils.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::slave;
+using namespace mesos::internal::tests;
using namespace mesos::slave;
@@ -58,6 +56,11 @@ using testing::DoAll;
using testing::Invoke;
using testing::Return;
+namespace mesos {
+namespace internal {
+namespace slave {
+
+
class MesosContainerizerIsolatorPreparationTest :
public tests::TemporaryDirectoryTest
{
@@ -322,7 +325,7 @@ class MockMesosContainerizerProcess : public MesosContainerizerProcess
{
public:
MockMesosContainerizerProcess(
- const Flags& flags,
+ const slave::Flags& flags,
bool local,
Fetcher* fetcher,
const process::Owned<Launcher>& launcher,
@@ -406,3 +409,7 @@ TEST_F(MesosContainerizerDestroyTest, DestroyWhileFetching)
// The container should still exit even if fetch didn't complete.
AWAIT_READY(wait);
}
+
+} // namespace slave {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/credentials_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/credentials_tests.cpp b/src/tests/credentials_tests.cpp
index c0a8ad0..ed67273 100644
--- a/src/tests/credentials_tests.cpp
+++ b/src/tests/credentials_tests.cpp
@@ -28,15 +28,12 @@
#include "tests/mesos.hpp"
#include "tests/utils.hpp"
+using namespace process;
+
using std::map;
using std::string;
using std::vector;
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::slave;
-using namespace mesos::internal::tests;
-
using mesos::internal::master::Master;
using mesos::internal::slave::Slave;
@@ -44,6 +41,10 @@ using process::PID;
using testing::_;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class CredentialsTest : public MesosTest {};
@@ -111,3 +112,7 @@ TEST_F(CredentialsTest, authenticatedSlaveText)
Shutdown();
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/disk_quota_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/disk_quota_tests.cpp b/src/tests/disk_quota_tests.cpp
index 3239ed2..56d82ee 100644
--- a/src/tests/disk_quota_tests.cpp
+++ b/src/tests/disk_quota_tests.cpp
@@ -48,10 +48,6 @@
using namespace process;
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using std::string;
using std::vector;
@@ -65,6 +61,10 @@ using mesos::internal::slave::Fetcher;
using mesos::internal::slave::MesosContainerizer;
using mesos::internal::slave::Slave;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class DiskUsageCollectorTest : public TemporaryDirectoryTest {};
@@ -394,3 +394,7 @@ TEST_F(DiskQuotaTest, ResourceStatistics)
delete containerizer.get();
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/docker_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/docker_containerizer_tests.cpp b/src/tests/docker_containerizer_tests.cpp
index 2105ae2..06cd3d8 100644
--- a/src/tests/docker_containerizer_tests.cpp
+++ b/src/tests/docker_containerizer_tests.cpp
@@ -40,12 +40,8 @@
#include "slave/slave.hpp"
#include "slave/state.hpp"
-
-using namespace mesos;
-using namespace mesos::internal;
using namespace mesos::internal::slave::paths;
using namespace mesos::internal::slave::state;
-using namespace mesos::internal::tests;
using namespace process;
@@ -72,6 +68,10 @@ using testing::Eq;
using testing::Invoke;
using testing::Return;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class MockDocker : public Docker
{
@@ -2597,3 +2597,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DestroyWhilePulling)
Shutdown();
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/docker_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/docker_tests.cpp b/src/tests/docker_tests.cpp
index ef05828..5520c58 100644
--- a/src/tests/docker_tests.cpp
+++ b/src/tests/docker_tests.cpp
@@ -34,15 +34,15 @@
#include "tests/environment.hpp"
#include "tests/flags.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using namespace process;
using std::list;
using std::string;
+namespace mesos {
+namespace internal {
+namespace tests {
+
// This test tests the functionality of the docker's interfaces.
TEST(DockerTest, ROOT_DOCKER_interface)
@@ -316,3 +316,7 @@ TEST(DockerTest, ROOT_DOCKER_CancelPull)
AWAIT_DISCARDED(future);
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/exception_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/exception_tests.cpp b/src/tests/exception_tests.cpp
index 13e6d2d..9af1674 100644
--- a/src/tests/exception_tests.cpp
+++ b/src/tests/exception_tests.cpp
@@ -34,10 +34,6 @@
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using mesos::internal::master::Master;
using mesos::internal::slave::Slave;
@@ -54,6 +50,10 @@ using testing::AtMost;
using testing::Eq;
using testing::Return;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class ExceptionTest : public MesosTest {};
@@ -200,3 +200,7 @@ TEST_F(ExceptionTest, DisallowSchedulerCallbacksOnAbort)
Shutdown();
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/external_containerizer_test.cpp
----------------------------------------------------------------------
diff --git a/src/tests/external_containerizer_test.cpp b/src/tests/external_containerizer_test.cpp
index 45cdeb5..ca6fe50 100644
--- a/src/tests/external_containerizer_test.cpp
+++ b/src/tests/external_containerizer_test.cpp
@@ -42,10 +42,6 @@
#include "tests/mesos.hpp"
#include "tests/flags.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using namespace process;
using mesos::internal::master::Master;
@@ -61,6 +57,10 @@ using testing::Return;
using testing::SaveArg;
using testing::Invoke;
+namespace mesos {
+namespace internal {
+namespace tests {
+
// The external containerizer tests currently rely on a Python script
// which needs the Mesos Python egg being built.
// TODO(tillt): Consider providing tests that do not rely on Python.
@@ -263,3 +263,7 @@ TEST_F(ExternalContainerizerTest, DISABLED_Launch)
}
#endif // MESOS_HAS_PYTHON
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/fault_tolerance_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp
index 17d2f85..9ac75b1 100644
--- a/src/tests/fault_tolerance_tests.cpp
+++ b/src/tests/fault_tolerance_tests.cpp
@@ -51,10 +51,7 @@
#include "tests/containerizer.hpp"
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::internal;
using namespace mesos::internal::protobuf;
-using namespace mesos::internal::tests;
using mesos::internal::master::Master;
@@ -81,6 +78,10 @@ using testing::Not;
using testing::Return;
using testing::SaveArg;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class FaultToleranceTest : public MesosTest {};
@@ -1883,3 +1884,7 @@ TEST_F(FaultToleranceTest, SplitBrainMasters)
Shutdown();
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/fetcher_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fetcher_tests.cpp b/src/tests/fetcher_tests.cpp
index 6af44d8..2438620 100644
--- a/src/tests/fetcher_tests.cpp
+++ b/src/tests/fetcher_tests.cpp
@@ -46,22 +46,22 @@
#include "tests/mesos.hpp"
#include "tests/utils.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::slave;
-using namespace mesos::internal::tests;
-
using namespace process;
+
using process::Subprocess;
using process::Future;
-using slave::Fetcher;
+using mesos::internal::slave::Fetcher;
using std::string;
using std::map;
using mesos::fetcher::FetcherInfo;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class FetcherEnvironmentTest : public ::testing::Test {};
@@ -635,3 +635,7 @@ TEST_F(FetcherTest, ExtractNotExecutable)
ASSERT_SOME(os::rm(path.get()));
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/files_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/files_tests.cpp b/src/tests/files_tests.cpp
index 6317894..53771cd 100644
--- a/src/tests/files_tests.cpp
+++ b/src/tests/files_tests.cpp
@@ -35,9 +35,6 @@
#include "tests/utils.hpp"
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using process::Future;
using process::http::BadRequest;
@@ -47,6 +44,10 @@ using process::http::Response;
using std::string;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class FilesTest : public TemporaryDirectoryTest {};
@@ -297,3 +298,7 @@ TEST_F(FilesTest, DownloadTest)
AWAIT_EXPECT_RESPONSE_HEADER_EQ("image/gif", "Content-Type", response);
AWAIT_EXPECT_RESPONSE_BODY_EQ(data, response);
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/fs_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fs_tests.cpp b/src/tests/fs_tests.cpp
index 946242d..39d212f 100644
--- a/src/tests/fs_tests.cpp
+++ b/src/tests/fs_tests.cpp
@@ -28,9 +28,9 @@
#include "linux/fs.hpp"
-
-using namespace mesos;
-using namespace mesos::internal;
+namespace mesos {
+namespace internal {
+namespace tests {
using fs::MountTable;
using fs::FileSystemTable;
@@ -93,3 +93,7 @@ TEST(FsTest, FileSystemTableRead)
EXPECT_SOME(root);
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/gc_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/gc_tests.cpp b/src/tests/gc_tests.cpp
index 04a453c..deaa6b1 100644
--- a/src/tests/gc_tests.cpp
+++ b/src/tests/gc_tests.cpp
@@ -56,10 +56,6 @@
#include "tests/mesos.hpp"
#include "tests/utils.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using mesos::internal::master::Master;
using mesos::internal::slave::GarbageCollector;
@@ -80,6 +76,10 @@ using testing::AtMost;
using testing::Return;
using testing::SaveArg;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class GarbageCollectorTest : public TemporaryDirectoryTest {};
TEST_F(GarbageCollectorTest, Schedule)
@@ -818,3 +818,7 @@ TEST_F(GarbageCollectorIntegrationTest, Unschedule)
Shutdown(); // Must shutdown before 'isolator' gets deallocated.
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/group_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/group_tests.cpp b/src/tests/group_tests.cpp
index 144ba82..13e89c3 100644
--- a/src/tests/group_tests.cpp
+++ b/src/tests/group_tests.cpp
@@ -33,9 +33,6 @@
#include "zookeeper/authentication.hpp"
#include "zookeeper/group.hpp"
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using zookeeper::Group;
using zookeeper::GroupProcess;
@@ -45,6 +42,10 @@ using std::string;
using testing::_;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class GroupTest : public ZooKeeperTest {};
@@ -433,3 +434,7 @@ TEST_F(GroupTest, LabelledGroup)
ASSERT_TRUE(membership.get().cancelled().isReady());
ASSERT_TRUE(membership.get().cancelled().get());
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/health_check_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/health_check_tests.cpp b/src/tests/health_check_tests.cpp
index 7278f07..157a56a 100644
--- a/src/tests/health_check_tests.cpp
+++ b/src/tests/health_check_tests.cpp
@@ -32,10 +32,6 @@
#include "tests/mesos.hpp"
#include "tests/utils.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using mesos::internal::master::Master;
using mesos::internal::slave::Containerizer;
@@ -58,6 +54,10 @@ using std::queue;
using std::string;
using std::map;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class HealthCheckTest : public MesosTest
{
@@ -615,3 +615,7 @@ TEST_F(HealthCheckTest, DISABLED_GracePeriod)
Shutdown();
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/hierarchical_allocator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/hierarchical_allocator_tests.cpp b/src/tests/hierarchical_allocator_tests.cpp
index 42b172a..93753d1 100644
--- a/src/tests/hierarchical_allocator_tests.cpp
+++ b/src/tests/hierarchical_allocator_tests.cpp
@@ -39,9 +39,6 @@
#include "master/allocator/allocator.hpp"
#include "master/allocator/mesos/hierarchical.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-
using mesos::internal::master::MIN_CPUS;
using mesos::internal::master::MIN_MEM;
@@ -56,6 +53,10 @@ using std::queue;
using std::string;
using std::vector;
+namespace mesos {
+namespace internal {
+namespace tests {
+
struct Allocation
{
@@ -783,3 +784,7 @@ TEST_F(HierarchicalAllocatorTest, Whitelist)
EXPECT_TRUE(allocation.get().resources.contains(slave.id()));
EXPECT_EQ(slave.resources(), sum(allocation.get().resources.values()));
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/hook_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/hook_tests.cpp b/src/tests/hook_tests.cpp
index 44f73ef..f4b4f51 100644
--- a/src/tests/hook_tests.cpp
+++ b/src/tests/hook_tests.cpp
@@ -39,9 +39,6 @@
using std::string;
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
using namespace mesos::modules;
using mesos::internal::master::Master;
@@ -56,6 +53,10 @@ using std::vector;
using testing::_;
using testing::Return;
+namespace mesos {
+namespace internal {
+namespace tests {
+
const char* HOOK_MODULE_LIBRARY_NAME = "testhook";
const char* HOOK_MODULE_NAME = "org_apache_mesos_TestHook";
@@ -270,3 +271,7 @@ TEST_F(HookTest, DISABLED_VerifySlaveLaunchExecutorHook)
// Verify that the file is not present.
EXPECT_FALSE(os::isfile(path.get()));
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/isolator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/isolator.hpp b/src/tests/isolator.hpp
index 3c3dde5..7d1a36e 100644
--- a/src/tests/isolator.hpp
+++ b/src/tests/isolator.hpp
@@ -41,7 +41,7 @@ public:
MOCK_METHOD1(
recover,
- process::Future<Nothing>(const std::list<slave::ExecutorRunState>&));
+ process::Future<Nothing>(const std::list<mesos::slave::ExecutorRunState>&));
virtual process::Future<Option<CommandInfo> > prepare(
const ContainerID& containerId,
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/isolator_tests.cpp b/src/tests/isolator_tests.cpp
index ebed707..f732396 100644
--- a/src/tests/isolator_tests.cpp
+++ b/src/tests/isolator_tests.cpp
@@ -71,11 +71,6 @@
#include "tests/module.hpp"
#include "tests/utils.hpp"
-using namespace mesos;
-
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using namespace process;
using mesos::internal::master::Master;
@@ -109,6 +104,10 @@ using testing::DoAll;
using testing::Return;
using testing::SaveArg;
+namespace mesos {
+namespace internal {
+namespace tests {
+
static int childSetup(int pipes[2])
{
@@ -1143,3 +1142,7 @@ TYPED_TEST(UserCgroupIsolatorTest, ROOT_CGROUPS_UserCgroup)
delete isolator.get();
}
#endif // __linux__
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/log_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/log_tests.cpp b/src/tests/log_tests.cpp
index 0088706..f2dd47c 100644
--- a/src/tests/log_tests.cpp
+++ b/src/tests/log_tests.cpp
@@ -59,10 +59,7 @@
#include "tests/zookeeper.hpp"
#endif
-using namespace mesos;
-using namespace mesos::internal;
using namespace mesos::internal::log;
-using namespace mesos::internal::tests;
using namespace process;
@@ -74,6 +71,10 @@ using testing::_;
using testing::Eq;
using testing::Return;
+namespace mesos {
+namespace internal {
+namespace tests {
+
TEST(NetworkTest, Watch)
{
@@ -2057,3 +2058,7 @@ TEST_F(CoordinatorTest, LearnedOnOneReplica_NotLearnedOnAnother) {}
TEST_F(CoordinatorTest,
LearnedOnOneReplica_NotLearnedOnAnother_AnotherFailsAndRecovers) {}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/logging_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/logging_tests.cpp b/src/tests/logging_tests.cpp
index 842cebc..8901edd 100644
--- a/src/tests/logging_tests.cpp
+++ b/src/tests/logging_tests.cpp
@@ -26,12 +26,14 @@
#include "logging/logging.hpp"
-using namespace mesos::internal;
-
using process::http::BadRequest;
using process::http::OK;
using process::http::Response;
+namespace mesos {
+namespace internal {
+namespace tests {
+
TEST(LoggingTest, Toggle)
{
@@ -78,3 +80,7 @@ TEST(LoggingTest, Toggle)
"Invalid level '-1'.\n",
response);
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/master_allocator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_allocator_tests.cpp b/src/tests/master_allocator_tests.cpp
index 1d6326c..a432d02 100644
--- a/src/tests/master_allocator_tests.cpp
+++ b/src/tests/master_allocator_tests.cpp
@@ -43,10 +43,6 @@
#include "tests/containerizer.hpp"
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using mesos::internal::master::allocator::Allocator;
using mesos::internal::master::allocator::HierarchicalDRFAllocator;
@@ -69,6 +65,10 @@ using testing::DoDefault;
using testing::Eq;
using testing::SaveArg;
+namespace mesos {
+namespace internal {
+namespace tests {
+
template <typename T>
class MasterAllocatorTest : public MesosTest
@@ -1438,3 +1438,7 @@ TYPED_TEST(MasterAllocatorTest, SlaveReregistersFirst)
this->Shutdown();
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/master_authorization_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_authorization_tests.cpp b/src/tests/master_authorization_tests.cpp
index 81d1a6d..55dae40 100644
--- a/src/tests/master_authorization_tests.cpp
+++ b/src/tests/master_authorization_tests.cpp
@@ -41,10 +41,6 @@
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using mesos::internal::master::Master;
using mesos::internal::master::allocator::MesosAllocatorProcess;
@@ -64,6 +60,10 @@ using testing::AtMost;
using testing::DoAll;
using testing::Return;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class MasterAuthorizationTest : public MesosTest {};
@@ -1030,3 +1030,7 @@ TEST_F(MasterAuthorizationTest, FrameworkRemovedBeforeReregistration)
Shutdown();
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/master_contender_detector_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_contender_detector_tests.cpp b/src/tests/master_contender_detector_tests.cpp
index a34b726..f8c7f2c 100644
--- a/src/tests/master_contender_detector_tests.cpp
+++ b/src/tests/master_contender_detector_tests.cpp
@@ -54,10 +54,6 @@
#include "tests/zookeeper.hpp"
#endif
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using namespace zookeeper;
using mesos::internal::master::Master;
@@ -78,6 +74,10 @@ using testing::_;
using testing::AtMost;
using testing::Return;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class MasterContenderDetectorTest : public MesosTest {};
@@ -835,3 +835,7 @@ TEST_F(ZooKeeperMasterContenderDetectorTest,
}
#endif // MESOS_HAS_JAVA
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/master_slave_reconciliation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_slave_reconciliation_tests.cpp b/src/tests/master_slave_reconciliation_tests.cpp
index 11b043f..230f529 100644
--- a/src/tests/master_slave_reconciliation_tests.cpp
+++ b/src/tests/master_slave_reconciliation_tests.cpp
@@ -41,10 +41,7 @@
#include "tests/containerizer.hpp"
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::internal;
using namespace mesos::internal::protobuf;
-using namespace mesos::internal::tests;
using mesos::internal::master::Master;
@@ -62,6 +59,10 @@ using testing::AtMost;
using testing::Return;
using testing::SaveArg;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class MasterSlaveReconciliationTest : public MesosTest {};
@@ -531,3 +532,7 @@ TEST_F(MasterSlaveReconciliationTest, SlaveReregisterTerminalTask)
Shutdown();
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index 9927fd5..24cff38 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -58,10 +58,6 @@
#include "tests/containerizer.hpp"
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using mesos::internal::master::Master;
using mesos::internal::master::allocator::MesosAllocatorProcess;
@@ -88,6 +84,10 @@ using testing::Not;
using testing::Return;
using testing::SaveArg;
+namespace mesos {
+namespace internal {
+namespace tests {
+
// Those of the overall Mesos master/slave/scheduler/driver tests
// that seem vaguely more master than slave-related are in this file.
// The others are in "slave_tests.cpp".
@@ -3048,3 +3048,7 @@ TEST_F(MasterTest, TaskDiscoveryInfo)
Shutdown(); // Must shutdown before 'containerizer' gets deallocated.
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/master_validation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_validation_tests.cpp b/src/tests/master_validation_tests.cpp
index 81c635f..38ddb1d 100644
--- a/src/tests/master_validation_tests.cpp
+++ b/src/tests/master_validation_tests.cpp
@@ -29,12 +29,14 @@
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::internal::tests;
using namespace mesos::internal::master::validation;
using google::protobuf::RepeatedPtrField;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class ResourceValidationTest : public ::testing::Test
{
@@ -197,3 +199,7 @@ TEST_F(DestroyOperationValidationTest, UnknownPersistentVolume)
EXPECT_NONE(operation::validate(destroy, volume));
EXPECT_SOME(operation::validate(destroy, Resources()));
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/metrics_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/metrics_tests.cpp b/src/tests/metrics_tests.cpp
index 2caec5f..6896727 100644
--- a/src/tests/metrics_tests.cpp
+++ b/src/tests/metrics_tests.cpp
@@ -28,12 +28,13 @@
#include "master/master.hpp"
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-
using mesos::internal::master::Master;
using mesos::internal::slave::Slave;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class MetricsTest : public mesos::internal::tests::MesosTest {};
TEST_F(MetricsTest, Master)
@@ -212,3 +213,7 @@ TEST_F(MetricsTest, Slave)
EXPECT_EQ(1u, stats.values.count("slave/disk_used"));
EXPECT_EQ(1u, stats.values.count("slave/disk_percent"));
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/module.cpp
----------------------------------------------------------------------
diff --git a/src/tests/module.cpp b/src/tests/module.cpp
index bfd5aae..b81144f 100644
--- a/src/tests/module.cpp
+++ b/src/tests/module.cpp
@@ -30,11 +30,12 @@
using std::string;
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
using namespace mesos::modules;
+namespace mesos {
+namespace internal {
+namespace tests {
+
static hashmap<ModuleID, string> moduleNames;
@@ -130,7 +131,7 @@ static void addAnonymousModules(Modules* modules)
}
-Try<Nothing> tests::initModules(const Option<Modules>& modules)
+Try<Nothing> initModules(const Option<Modules>& modules)
{
// First get the user provided modules.
Modules mergedModules;
@@ -155,10 +156,14 @@ Try<Nothing> tests::initModules(const Option<Modules>& modules)
// Mapping from module ID to the actual module name.
-Try<string> tests::getModuleName(ModuleID id)
+Try<string> getModuleName(ModuleID id)
{
if (!moduleNames.contains(id)) {
return Error("Module '" + stringify(id) + "' not found");
}
return moduleNames[id];
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/module_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/module_tests.cpp b/src/tests/module_tests.cpp
index 643e712..60497aa 100644
--- a/src/tests/module_tests.cpp
+++ b/src/tests/module_tests.cpp
@@ -35,10 +35,14 @@
using std::string;
-using namespace mesos;
-using namespace mesos::internal::modules;
using namespace mesos::internal::slave;
-using namespace mesos::internal::tests;
+using namespace mesos::modules;
+
+using mesos::slave::Isolator;
+
+namespace mesos {
+namespace internal {
+namespace tests {
const char* DEFAULT_MODULE_LIBRARY_NAME = "examplemodule";
const char* DEFAULT_MODULE_NAME = "org_apache_mesos_TestModule";
@@ -484,3 +488,7 @@ TEST_F(ModuleTest, OlderModuleLibrary)
moduleBase->mesosVersion = "0.1.0";
EXPECT_ERROR(ModuleManager::load(defaultModules));
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/monitor_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/monitor_tests.cpp b/src/tests/monitor_tests.cpp
index a1aca5f..899af44 100644
--- a/src/tests/monitor_tests.cpp
+++ b/src/tests/monitor_tests.cpp
@@ -38,10 +38,6 @@
#include "tests/containerizer.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using process::Clock;
using process::Future;
@@ -57,6 +53,10 @@ using testing::_;
using testing::DoAll;
using testing::Return;
+namespace mesos {
+namespace internal {
+namespace tests {
+
TEST(MonitorTest, Collection)
{
@@ -297,3 +297,7 @@ TEST(MonitorTest, Statistics)
response);
AWAIT_EXPECT_RESPONSE_BODY_EQ("[]", response);
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/ns_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/ns_tests.cpp b/src/tests/ns_tests.cpp
index 046ea26..866f0e7 100644
--- a/src/tests/ns_tests.cpp
+++ b/src/tests/ns_tests.cpp
@@ -40,9 +40,6 @@
#include "tests/flags.hpp"
-
-using namespace mesos::internal;
-
using namespace process;
using std::list;
@@ -50,6 +47,10 @@ using std::set;
using std::string;
using std::vector;
+namespace mesos {
+namespace internal {
+namespace tests {
+
// Helper for cloneChild() which expects an int(void*).
static int cloneChildHelper(void* _func)
@@ -286,3 +287,7 @@ TEST(NsTest, ROOT_destroy)
}
}
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/partition_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/partition_tests.cpp b/src/tests/partition_tests.cpp
index edf46ac..bb96aed 100644
--- a/src/tests/partition_tests.cpp
+++ b/src/tests/partition_tests.cpp
@@ -37,10 +37,6 @@
#include "tests/flags.hpp"
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using mesos::internal::master::Master;
using mesos::internal::master::allocator::MesosAllocatorProcess;
@@ -59,6 +55,10 @@ using testing::AtMost;
using testing::Eq;
using testing::Return;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class PartitionTest : public MesosTest {};
@@ -468,3 +468,7 @@ TEST_F(PartitionTest, OneWayPartitionMasterToSlave)
// Slave should re-register.
AWAIT_READY(slaveReregisteredMessage);
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/perf_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/perf_tests.cpp b/src/tests/perf_tests.cpp
index 55a2dae..16f3226 100644
--- a/src/tests/perf_tests.cpp
+++ b/src/tests/perf_tests.cpp
@@ -33,6 +33,10 @@ using std::string;
using namespace process;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class PerfTest : public ::testing::Test {};
@@ -145,3 +149,7 @@ TEST_F(PerfTest, ROOT_SampleInit)
ASSERT_TRUE(statistics.get().has_task_clock());
EXPECT_LT(0.0, statistics.get().task_clock());
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/persistent_volume_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/persistent_volume_tests.cpp b/src/tests/persistent_volume_tests.cpp
index b4f2298..7c3f9cb 100644
--- a/src/tests/persistent_volume_tests.cpp
+++ b/src/tests/persistent_volume_tests.cpp
@@ -45,18 +45,19 @@
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::tests;
-
using namespace process;
-using mesos::master::Master;
+using mesos::internal::master::Master;
-using mesos::slave::Slave;
+using mesos::internal::slave::Slave;
using std::string;
using std::vector;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class PersistentVolumeTest : public MesosTest
{
@@ -331,3 +332,7 @@ TEST_F(PersistentVolumeTest, PreparePersistentVolume)
Shutdown();
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/port_mapping_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/port_mapping_tests.cpp b/src/tests/port_mapping_tests.cpp
index f15c071..a03de23 100644
--- a/src/tests/port_mapping_tests.cpp
+++ b/src/tests/port_mapping_tests.cpp
@@ -60,12 +60,6 @@
#include "tests/mesos.hpp"
#include "tests/utils.hpp"
-using namespace mesos;
-
-using namespace mesos::internal;
-using namespace mesos::internal::slave;
-using namespace mesos::internal::tests;
-
using namespace process;
using namespace routing;
@@ -92,6 +86,10 @@ using testing::_;
using testing::Eq;
using testing::Return;
+namespace mesos {
+namespace internal {
+namespace tests {
+
// An old glibc might not have this symbol.
#ifndef MNT_DETACH
@@ -2052,3 +2050,7 @@ TEST_F(PortMappingMesosTest, ROOT_CleanUpOrphanTest)
Shutdown();
delete containerizer2.get();
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/protobuf_io_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/protobuf_io_tests.cpp b/src/tests/protobuf_io_tests.cpp
index b2383b0..f5e041c 100644
--- a/src/tests/protobuf_io_tests.cpp
+++ b/src/tests/protobuf_io_tests.cpp
@@ -32,14 +32,14 @@
#include "tests/utils.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using std::string;
using google::protobuf::RepeatedPtrField;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class ProtobufIOTest : public TemporaryDirectoryTest {};
@@ -162,3 +162,7 @@ TEST_F(ProtobufIOTest, RepeatedPtrField)
EXPECT_EQ(expected.Get(i), actual.Get(i));
}
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/rate_limiting_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/rate_limiting_tests.cpp b/src/tests/rate_limiting_tests.cpp
index 8630441..342d77b 100644
--- a/src/tests/rate_limiting_tests.cpp
+++ b/src/tests/rate_limiting_tests.cpp
@@ -32,8 +32,6 @@
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::internal;
using namespace mesos::internal::tests;
using mesos::internal::master::Master;
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/reconciliation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/reconciliation_tests.cpp b/src/tests/reconciliation_tests.cpp
index c21f4cb..b79f85e 100644
--- a/src/tests/reconciliation_tests.cpp
+++ b/src/tests/reconciliation_tests.cpp
@@ -43,10 +43,6 @@
#include "tests/containerizer.hpp"
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using mesos::internal::master::Master;
using mesos::internal::slave::Slave;
@@ -65,6 +61,10 @@ using testing::DoAll;
using testing::Return;
using testing::SaveArg;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class ReconciliationTest : public MesosTest {};
@@ -889,3 +889,7 @@ TEST_F(ReconciliationTest, ReconcileStatusUpdateTaskState)
Shutdown(); // Must shutdown before the detector gets de-allocated.
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/registrar_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/registrar_tests.cpp b/src/tests/registrar_tests.cpp
index 37d9dba..e9fb928 100644
--- a/src/tests/registrar_tests.cpp
+++ b/src/tests/registrar_tests.cpp
@@ -53,19 +53,10 @@
#include "tests/utils.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-
using namespace process;
-using log::Log;
-using log::Replica;
-
-using state::Entry;
-using state::LogStorage;
-using state::Storage;
-
-using state::protobuf::State;
+using mesos::internal::log::Log;
+using mesos::internal::log::Replica;
using std::map;
using std::set;
@@ -85,6 +76,12 @@ namespace mesos {
namespace internal {
namespace master {
+using state::Entry;
+using state::LogStorage;
+using state::Storage;
+
+using state::protobuf::State;
+
// TODO(xujyan): This class copies code from LogStateTest. It would
// be nice to find a common location for log related base tests when
// there are more uses of it.
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/registrar_zookeeper_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/registrar_zookeeper_tests.cpp b/src/tests/registrar_zookeeper_tests.cpp
index 687fe58..42bc2a2 100644
--- a/src/tests/registrar_zookeeper_tests.cpp
+++ b/src/tests/registrar_zookeeper_tests.cpp
@@ -34,10 +34,6 @@
#include "tests/containerizer.hpp"
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using mesos::internal::master::Master;
using mesos::internal::slave::Slave;
@@ -53,6 +49,10 @@ using testing::AtMost;
using testing::DoAll;
using testing::Return;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class RegistrarZooKeeperTest : public MesosZooKeeperTest {};
@@ -123,3 +123,7 @@ TEST_F(RegistrarZooKeeperTest, TaskRunning)
Shutdown(); // Must shutdown before 'containerizer' gets deallocated.
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/repair_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/repair_tests.cpp b/src/tests/repair_tests.cpp
index 62ff724..4d513ed 100644
--- a/src/tests/repair_tests.cpp
+++ b/src/tests/repair_tests.cpp
@@ -29,11 +29,6 @@
#include "tests/mesos.hpp"
-
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using mesos::internal::master::Master;
using process::Future;
@@ -48,6 +43,10 @@ using std::vector;
using testing::_;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class HealthTest : public MesosTest {};
@@ -71,7 +70,7 @@ string stringify(const JsonResponse& response)
object.values["isHealthy"] = response.isHealthy;
- return stringify(object);
+ return ::stringify(object);
}
@@ -199,3 +198,7 @@ TEST_F(HealthTest, ObserveEndpoint)
Shutdown();
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/resource_offers_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/resource_offers_tests.cpp b/src/tests/resource_offers_tests.cpp
index 5e1b0db..d1eb2fc 100644
--- a/src/tests/resource_offers_tests.cpp
+++ b/src/tests/resource_offers_tests.cpp
@@ -34,10 +34,6 @@
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using mesos::internal::master::Master;
using mesos::internal::slave::Slave;
@@ -51,6 +47,10 @@ using testing::_;
using testing::AtMost;
using testing::Return;
+namespace mesos {
+namespace internal {
+namespace tests {
+
// TODO(jieyu): All of the task validation tests have the same flow:
// launch a task, expect an update of a particular format (invalid w/
@@ -927,3 +927,7 @@ TEST_F(ResourceOffersTest, Request)
Shutdown();
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/resources_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/resources_tests.cpp b/src/tests/resources_tests.cpp
index 4744e87..4298d10 100644
--- a/src/tests/resources_tests.cpp
+++ b/src/tests/resources_tests.cpp
@@ -28,15 +28,16 @@
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::internal;
using namespace mesos::internal::master;
-using namespace mesos::internal::tests;
using std::ostringstream;
using std::pair;
using std::string;
+namespace mesos {
+namespace internal {
+namespace tests {
+
TEST(ResourcesTest, Parsing)
{
@@ -977,3 +978,7 @@ TEST(ResourcesOperationTest, CreatePersistentVolume)
EXPECT_ERROR(total.apply(create2));
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/routing_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/routing_tests.cpp b/src/tests/routing_tests.cpp
index 962cff2..6809659 100644
--- a/src/tests/routing_tests.cpp
+++ b/src/tests/routing_tests.cpp
@@ -60,6 +60,10 @@ using std::set;
using std::string;
using std::vector;
+namespace mesos {
+namespace internal {
+namespace tests {
+
static const string TEST_VETH_LINK = "veth-test";
static const string TEST_PEER_LINK = "veth-peer";
@@ -1085,3 +1089,7 @@ TEST_F(RoutingVethTest, ROOT_HandleGeneration)
// will find the handle matches the first filter.
EXPECT_SOME_TRUE(ip::remove(TEST_VETH_LINK, ingress::HANDLE, classifier2));
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/scheduler_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/scheduler_tests.cpp b/src/tests/scheduler_tests.cpp
index 59cb412..4a89a7a 100644
--- a/src/tests/scheduler_tests.cpp
+++ b/src/tests/scheduler_tests.cpp
@@ -47,10 +47,6 @@
#include "tests/containerizer.hpp"
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using mesos::internal::master::Master;
using mesos::internal::slave::Containerizer;
@@ -79,6 +75,10 @@ using testing::AtMost;
using testing::DoAll;
using testing::Return;
+namespace mesos {
+namespace internal {
+namespace tests {
+
class SchedulerTest : public MesosTest
{
@@ -514,3 +514,7 @@ TEST_F(MesosSchedulerDriverTest, ExplicitAcknowledgementsUnsetSlaveID)
Shutdown();
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/shutdown_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/shutdown_tests.cpp b/src/tests/shutdown_tests.cpp
index bb48ee0..b3e999e 100644
--- a/src/tests/shutdown_tests.cpp
+++ b/src/tests/shutdown_tests.cpp
@@ -40,11 +40,6 @@
using std::string;
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::slave;
-using namespace mesos::internal::tests;
-
using mesos::internal::master::Master;
using mesos::internal::slave::Slave;
@@ -61,8 +56,14 @@ using testing::Eq;
using testing::SaveArg;
using testing::Return;
+namespace mesos {
+namespace internal {
+namespace tests {
+
+
class ShutdownTest : public MesosTest {};
+
// Testing /master/shutdown so this endopoint shuts down
// designated framework or return adequate error.
@@ -310,3 +311,7 @@ TEST_F(ShutdownTest, ShutdownEndpointNoHeader)
Shutdown();
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/slave_recovery_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp
index 7fbc434..dc712fc 100644
--- a/src/tests/slave_recovery_tests.cpp
+++ b/src/tests/slave_recovery_tests.cpp
@@ -58,9 +58,6 @@
#include "tests/mesos.hpp"
#include "tests/utils.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::slave;
using namespace mesos::internal::tests;
using namespace process;
@@ -68,9 +65,6 @@ using namespace process;
using google::protobuf::RepeatedPtrField;
using mesos::internal::master::Master;
-using mesos::internal::slave::Containerizer;
-using mesos::internal::slave::Fetcher;
-using mesos::internal::slave::GarbageCollectorProcess;
using std::map;
using std::string;
@@ -83,6 +77,10 @@ using testing::Eq;
using testing::Return;
using testing::SaveArg;
+namespace mesos {
+namespace internal {
+namespace slave {
+
class SlaveStateTest : public TemporaryDirectoryTest {};
@@ -3784,3 +3782,7 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceBackward)
}
#endif // __linux__
+
+} // namespace slave {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 2e0346f..60c9f35 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -58,10 +58,6 @@
#include "tests/flags.hpp"
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using namespace process;
using mesos::internal::master::Master;
@@ -87,6 +83,10 @@ using testing::Return;
using testing::SaveArg;
using testing::Sequence;
+namespace mesos {
+namespace internal {
+namespace tests {
+
// Those of the overall Mesos master/slave/scheduler/driver tests
// that seem vaguely more slave than master-related are in this file.
// The others are in "master_tests.cpp".
@@ -1800,3 +1800,7 @@ TEST_F(SlaveTest, TaskLabels)
Shutdown(); // Must shutdown before 'containerizer' gets deallocated.
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/sorter_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/sorter_tests.cpp b/src/tests/sorter_tests.cpp
index 5cae191..4244235 100644
--- a/src/tests/sorter_tests.cpp
+++ b/src/tests/sorter_tests.cpp
@@ -30,13 +30,15 @@
#include "master/allocator/sorter/drf/sorter.hpp"
-using namespace mesos;
-
using mesos::internal::master::allocator::DRFSorter;
using std::list;
using std::string;
+namespace mesos {
+namespace internal {
+namespace tests {
+
TEST(SorterTest, DRFSorter)
{
@@ -228,3 +230,7 @@ TEST(SorterTest, Update)
EXPECT_EQ(newAllocation.get(), sorter.allocation("a"));
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/state_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/state_tests.cpp b/src/tests/state_tests.cpp
index 398ecaa..b8cddc5 100644
--- a/src/tests/state_tests.cpp
+++ b/src/tests/state_tests.cpp
@@ -59,12 +59,19 @@
#include "tests/zookeeper.hpp"
#endif
-using namespace mesos;
-using namespace mesos::internal;
using namespace mesos::internal::log;
using namespace process;
+using std::list;
+using std::set;
+using std::string;
+using std::vector;
+
+namespace mesos {
+namespace internal {
+namespace tests {
+
using state::LevelDBStorage;
using state::Operation;
using state::Storage;
@@ -75,15 +82,9 @@ using state::ZooKeeperStorage;
using state::protobuf::State;
using state::protobuf::Variable;
-using std::list;
-using std::set;
-using std::string;
-using std::vector;
-
-using mesos::internal::tests::TemporaryDirectoryTest;
+typedef mesos::internal::Registry::Slaves Slaves;
+typedef mesos::internal::Registry::Slave Slave;
-typedef mesos::Registry::Slaves Slaves;
-typedef mesos::Registry::Slave Slave;
void FetchAndStoreAndFetch(State* state)
{
@@ -757,3 +758,7 @@ TEST_F(ZooKeeperStateTest, Names)
Names(state);
}
#endif // MESOS_HAS_JAVA
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/status_update_manager_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/status_update_manager_tests.cpp b/src/tests/status_update_manager_tests.cpp
index 6ff7320..216a22e 100644
--- a/src/tests/status_update_manager_tests.cpp
+++ b/src/tests/status_update_manager_tests.cpp
@@ -47,10 +47,6 @@
#include "tests/mesos.hpp"
-using namespace mesos;
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
-
using mesos::internal::master::Master;
using mesos::internal::slave::Slave;
@@ -68,6 +64,11 @@ using testing::AtMost;
using testing::Return;
using testing::SaveArg;
+namespace mesos {
+namespace internal {
+namespace tests {
+
+
// TODO(benh): Move this into utils, make more generic, and use in
// other tests.
vector<TaskInfo> createTasks(const Offer& offer)
@@ -857,3 +858,7 @@ TEST_F(StatusUpdateManagerTest, LatestTaskState)
Shutdown();
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/values_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/values_tests.cpp b/src/tests/values_tests.cpp
index 35d3b3e..fc35d97 100644
--- a/src/tests/values_tests.cpp
+++ b/src/tests/values_tests.cpp
@@ -28,12 +28,14 @@
#include "master/master.hpp"
-using namespace mesos;
-using namespace mesos::internal;
using namespace mesos::internal::values;
using std::string;
+namespace mesos {
+namespace internal {
+namespace tests {
+
TEST(ValuesTest, ValidInput)
{
@@ -99,3 +101,7 @@ TEST(ValuesTest, SetSubtraction)
EXPECT_EQ(set3, parse("{sda4}").get().set());
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9357070/src/tests/zookeeper_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/zookeeper_tests.cpp b/src/tests/zookeeper_tests.cpp
index 183008e..7d1c066 100644
--- a/src/tests/zookeeper_tests.cpp
+++ b/src/tests/zookeeper_tests.cpp
@@ -36,11 +36,13 @@
#include "tests/zookeeper.hpp"
-using namespace mesos::internal;
-using namespace mesos::internal::tests;
using namespace process;
using namespace zookeeper;
+namespace mesos {
+namespace internal {
+namespace tests {
+
TEST_F(ZooKeeperTest, Auth)
{
@@ -373,3 +375,7 @@ TEST_F(ZooKeeperTest, LeaderContender)
candidated = contender->contend();
AWAIT_READY(candidated);
}
+
+} // namespace tests {
+} // namespace internal {
+} // namespace mesos {