You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by gr...@apache.org on 2017/08/12 00:10:06 UTC
[2/4] mesos git commit: Improved the readability of some
assertions/expectations.
Improved the readability of some assertions/expectations.
Prefer checking whether a container is empty instead of checking its
size.
Review: https://reviews.apache.org/r/61511/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/65278909
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/65278909
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/65278909
Branch: refs/heads/master
Commit: 652789093058930fbd2009f3e502b2dd13b89a4f
Parents: 92feb52
Author: Gastón Kleiman <ga...@mesosphere.io>
Authored: Fri Aug 11 17:01:57 2017 -0700
Committer: Greg Mann <gr...@gmail.com>
Committed: Fri Aug 11 17:01:57 2017 -0700
----------------------------------------------------------------------
src/tests/api_tests.cpp | 164 +++++++++----------
src/tests/check_tests.cpp | 34 ++--
src/tests/container_logger_tests.cpp | 10 +-
src/tests/containerizer/appc_spec_tests.cpp | 4 +-
.../containerizer/cgroups_isolator_tests.cpp | 26 +--
src/tests/containerizer/cgroups_tests.cpp | 2 +-
src/tests/containerizer/cni_isolator_tests.cpp | 2 +-
src/tests/containerizer/cpu_isolator_tests.cpp | 4 +-
.../docker_containerizer_tests.cpp | 58 +++----
.../docker_volume_isolator_tests.cpp | 12 +-
.../environment_secret_isolator_tests.cpp | 2 +-
.../containerizer/io_switchboard_tests.cpp | 4 +-
.../linux_capabilities_isolator_tests.cpp | 4 +-
.../linux_filesystem_isolator_tests.cpp | 12 +-
.../containerizer/memory_isolator_tests.cpp | 2 +-
.../containerizer/memory_pressure_tests.cpp | 4 +-
.../containerizer/mesos_containerizer_tests.cpp | 2 +-
src/tests/containerizer/port_mapping_tests.cpp | 16 +-
.../posix_rlimits_isolator_tests.cpp | 10 +-
src/tests/containerizer/routing_tests.cpp | 2 +-
.../containerizer/runtime_isolator_tests.cpp | 6 +-
src/tests/containerizer/xfs_quota_tests.cpp | 2 +-
src/tests/default_executor_tests.cpp | 20 +--
src/tests/dynamic_weights_tests.cpp | 2 +-
src/tests/exception_tests.cpp | 2 +-
src/tests/fault_tolerance_tests.cpp | 16 +-
src/tests/fetcher_cache_tests.cpp | 8 +-
src/tests/group_tests.cpp | 8 +-
src/tests/health_check_tests.cpp | 42 ++---
src/tests/hook_tests.cpp | 10 +-
src/tests/http_fault_tolerance_tests.cpp | 8 +-
src/tests/master_authorization_tests.cpp | 28 ++--
src/tests/master_maintenance_tests.cpp | 24 +--
src/tests/master_quota_tests.cpp | 4 +-
src/tests/master_slave_reconciliation_tests.cpp | 12 +-
src/tests/master_tests.cpp | 98 +++++------
src/tests/master_validation_tests.cpp | 34 ++--
src/tests/oversubscription_tests.cpp | 32 ++--
src/tests/partition_tests.cpp | 2 +-
src/tests/persistent_volume_tests.cpp | 4 +-
src/tests/reconciliation_tests.cpp | 2 +-
src/tests/registrar_tests.cpp | 12 +-
src/tests/registrar_zookeeper_tests.cpp | 2 +-
src/tests/resource_offers_tests.cpp | 10 +-
src/tests/scheduler_driver_tests.cpp | 2 +-
src/tests/scheduler_tests.cpp | 24 +--
src/tests/slave_authorization_tests.cpp | 6 +-
src/tests/slave_recovery_tests.cpp | 76 ++++-----
src/tests/slave_tests.cpp | 80 ++++-----
src/tests/state_tests.cpp | 22 +--
src/tests/status_update_manager_tests.cpp | 14 +-
src/tests/upgrade_tests.cpp | 2 +-
52 files changed, 494 insertions(+), 494 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/api_tests.cpp b/src/tests/api_tests.cpp
index 75f7a58..3ab4740 100644
--- a/src/tests/api_tests.cpp
+++ b/src/tests/api_tests.cpp
@@ -369,7 +369,7 @@ TEST_P(MasterAPITest, GetExecutors)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("test");
@@ -456,7 +456,7 @@ TEST_P(MasterAPITest, GetState)
driver.start();
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
ContentType contentType = GetParam();
@@ -473,8 +473,8 @@ TEST_P(MasterAPITest, GetState)
const v1::master::Response::GetState& getState = v1Response->get_state();
ASSERT_EQ(1u, getState.get_frameworks().frameworks_size());
ASSERT_EQ(1u, getState.get_agents().agents_size());
- ASSERT_EQ(0u, getState.get_tasks().tasks_size());
- ASSERT_EQ(0u, getState.get_executors().executors_size());
+ ASSERT_TRUE(getState.get_tasks().tasks().empty());
+ ASSERT_TRUE(getState.get_executors().executors().empty());
}
TaskInfo task = createTask(offers.get()[0], "", DEFAULT_EXECUTOR_ID);
@@ -516,7 +516,7 @@ TEST_P(MasterAPITest, GetState)
const v1::master::Response::GetState& getState = v1Response->get_state();
ASSERT_EQ(1u, getState.get_tasks().tasks_size());
- ASSERT_EQ(0u, getState.get_tasks().completed_tasks_size());
+ ASSERT_TRUE(getState.get_tasks().completed_tasks().empty());
}
acknowledgement = FUTURE_PROTOBUF(
@@ -551,7 +551,7 @@ TEST_P(MasterAPITest, GetState)
const v1::master::Response::GetState& getState = v1Response->get_state();
ASSERT_EQ(1u, getState.get_tasks().completed_tasks_size());
- ASSERT_EQ(0u, getState.get_tasks().tasks_size());
+ ASSERT_TRUE(getState.get_tasks().tasks().empty());
}
EXPECT_CALL(exec, shutdown(_))
@@ -579,10 +579,10 @@ TEST_P(MasterAPITest, GetTasksNoRunningTask)
ASSERT_TRUE(v1Response->IsInitialized());
ASSERT_EQ(v1::master::Response::GET_TASKS, v1Response->type());
- ASSERT_EQ(0, v1Response->get_tasks().pending_tasks().size());
- ASSERT_EQ(0, v1Response->get_tasks().tasks().size());
- ASSERT_EQ(0, v1Response->get_tasks().completed_tasks().size());
- ASSERT_EQ(0, v1Response->get_tasks().orphan_tasks().size());
+ ASSERT_TRUE(v1Response->get_tasks().pending_tasks().empty());
+ ASSERT_TRUE(v1Response->get_tasks().tasks().empty());
+ ASSERT_TRUE(v1Response->get_tasks().completed_tasks().empty());
+ ASSERT_TRUE(v1Response->get_tasks().orphan_tasks().empty());
}
@@ -614,7 +614,7 @@ TEST_P(MasterAPITest, GetTasks)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("test");
@@ -698,7 +698,7 @@ TEST_P(MasterAPITest, GetTasks)
AWAIT_READY(v1Response);
ASSERT_TRUE(v1Response->IsInitialized());
ASSERT_EQ(v1::master::Response::GET_TASKS, v1Response->type());
- ASSERT_EQ(0, v1Response->get_tasks().tasks().size());
+ ASSERT_TRUE(v1Response->get_tasks().tasks().empty());
ASSERT_EQ(1, v1Response->get_tasks().completed_tasks().size());
ASSERT_EQ(v1::TaskState::TASK_FINISHED,
v1Response->get_tasks().completed_tasks(0).state());
@@ -1262,7 +1262,7 @@ TEST_P(MasterAPITest, UpdateAndGetMaintenanceSchedule)
AWAIT_READY(v1Response);
v1::maintenance::Schedule schedule =
v1Response->get_maintenance_schedule().schedule();
- ASSERT_EQ(0, schedule.windows().size());
+ ASSERT_TRUE(schedule.windows().empty());
}
{
@@ -1361,8 +1361,8 @@ TEST_P(MasterAPITest, GetMaintenanceStatus)
v1::maintenance::ClusterStatus status =
v1Response->get_maintenance_status().status();
- ASSERT_EQ(0, status.draining_machines().size());
- ASSERT_EQ(0, status.down_machines().size());
+ ASSERT_TRUE(status.draining_machines().empty());
+ ASSERT_TRUE(status.down_machines().empty());
}
{
@@ -1377,7 +1377,7 @@ TEST_P(MasterAPITest, GetMaintenanceStatus)
v1::maintenance::ClusterStatus status =
v1Response->get_maintenance_status().status();
ASSERT_EQ(2, status.draining_machines().size());
- ASSERT_EQ(0, status.down_machines().size());
+ ASSERT_TRUE(status.down_machines().empty());
}
}
@@ -1585,10 +1585,10 @@ TEST_P(MasterAPITest, SubscribeAgentEvents)
const v1::master::Response::GetState& getState =
event->get().subscribed().get_state();
- EXPECT_EQ(0u, getState.get_frameworks().frameworks_size());
- EXPECT_EQ(0u, getState.get_agents().agents_size());
- EXPECT_EQ(0u, getState.get_tasks().tasks_size());
- EXPECT_EQ(0u, getState.get_executors().executors_size());
+ EXPECT_TRUE(getState.get_frameworks().frameworks().empty());
+ EXPECT_TRUE(getState.get_agents().agents().empty());
+ EXPECT_TRUE(getState.get_tasks().tasks().empty());
+ EXPECT_TRUE(getState.get_executors().executors().empty());
// Start one agent.
Future<SlaveRegisteredMessage> agentRegisteredMessage =
@@ -1740,7 +1740,7 @@ TEST_P(MasterAPITest, GetAgentsFiltering)
EXPECT_FALSE(resource.has_role());
EXPECT_FALSE(resource.has_allocation_info());
EXPECT_FALSE(resource.has_reservation());
- EXPECT_EQ(0, resource.reservations_size());
+ EXPECT_TRUE(resource.reservations().empty());
}
vector<RepeatedPtrField<v1::Resource>> resourceFields = {
@@ -1763,14 +1763,14 @@ TEST_P(MasterAPITest, GetAgentsFiltering)
EXPECT_TRUE(resource.has_reservation());
EXPECT_FALSE(resource.reservation().has_role());
- EXPECT_NE(0, resource.reservations_size());
+ EXPECT_FALSE(resource.reservations().empty());
foreach (const v1::Resource::ReservationInfo& reservation,
resource.reservations()) {
EXPECT_EQ(roleSuperhero, reservation.role());
}
} else {
EXPECT_FALSE(resource.has_reservation());
- EXPECT_EQ(0, resource.reservations_size());
+ EXPECT_TRUE(resource.reservations().empty());
}
}
}
@@ -1832,14 +1832,14 @@ TEST_P(MasterAPITest, GetAgentsFiltering)
hasReservedResources = true;
EXPECT_FALSE(resource.has_reservation());
- EXPECT_NE(0, resource.reservations_size());
+ EXPECT_FALSE(resource.reservations().empty());
foreach (const v1::Resource::ReservationInfo& reservation,
resource.reservations()) {
EXPECT_EQ(roleMuggle, reservation.role());
}
} else {
EXPECT_FALSE(resource.has_reservation());
- EXPECT_EQ(0, resource.reservations_size());
+ EXPECT_TRUE(resource.reservations().empty());
}
}
}
@@ -1925,7 +1925,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(MasterAPITest, GetRecoveredAgents)
ASSERT_EQ(1, v1Response->get_agents().agents_size());
ASSERT_EQ(agentId,
v1Response->get_agents().agents(0).agent_info().id());
- ASSERT_EQ(0, v1Response->get_agents().recovered_agents_size());
+ ASSERT_TRUE(v1Response->get_agents().recovered_agents().empty());
}
// Stop the slave while the master is down.
@@ -1951,7 +1951,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(MasterAPITest, GetRecoveredAgents)
AWAIT_READY(v1Response);
ASSERT_TRUE(v1Response->IsInitialized());
ASSERT_EQ(v1::master::Response::GET_AGENTS, v1Response->type());
- ASSERT_EQ(0u, v1Response->get_agents().agents_size());
+ ASSERT_TRUE(v1Response->get_agents().agents().empty());
ASSERT_EQ(1u, v1Response->get_agents().recovered_agents_size());
ASSERT_EQ(agentId, v1Response->get_agents().recovered_agents(0).id());
}
@@ -1981,7 +1981,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(MasterAPITest, GetRecoveredAgents)
ASSERT_TRUE(v1Response->IsInitialized());
ASSERT_EQ(v1::master::Response::GET_AGENTS, v1Response->type());
ASSERT_EQ(1u, v1Response->get_agents().agents_size());
- ASSERT_EQ(0u, v1Response->get_agents().recovered_agents_size());
+ ASSERT_TRUE(v1Response->get_agents().recovered_agents().empty());
}
}
@@ -2045,7 +2045,7 @@ TEST_P(MasterAPITest, Subscribe)
v1::FrameworkID frameworkId(subscribed->framework_id());
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
// Create event stream after seeing first offer but before first task is
// launched. We should see one framework, one agent and zero task/executor.
@@ -2085,8 +2085,8 @@ TEST_P(MasterAPITest, Subscribe)
EXPECT_EQ(1u, getState.get_frameworks().frameworks_size());
EXPECT_EQ(1u, getState.get_agents().agents_size());
- EXPECT_EQ(0u, getState.get_tasks().tasks_size());
- EXPECT_EQ(0u, getState.get_executors().executors_size());
+ EXPECT_TRUE(getState.get_tasks().tasks().empty());
+ EXPECT_TRUE(getState.get_executors().executors().empty());
event = decoder.read();
EXPECT_TRUE(event.isPending());
@@ -2217,10 +2217,10 @@ TEST_P(MasterAPITest, FrameworksEvent)
const v1::master::Response::GetState& getState =
event->get().subscribed().get_state();
- EXPECT_EQ(0u, getState.get_frameworks().frameworks_size());
- EXPECT_EQ(0u, getState.get_agents().agents_size());
- EXPECT_EQ(0u, getState.get_tasks().tasks_size());
- EXPECT_EQ(0u, getState.get_executors().executors_size());
+ EXPECT_TRUE(getState.get_frameworks().frameworks().empty());
+ EXPECT_TRUE(getState.get_agents().agents().empty());
+ EXPECT_TRUE(getState.get_tasks().tasks().empty());
+ EXPECT_TRUE(getState.get_executors().executors().empty());
event = decoder.read();
EXPECT_TRUE(event.isPending());
@@ -2532,7 +2532,7 @@ TEST_P(MasterAPITest, RemoveQuota)
AWAIT_READY(v1Response);
ASSERT_TRUE(v1Response->IsInitialized());
ASSERT_EQ(v1::master::Response::GET_QUOTA, v1Response->type());
- ASSERT_EQ(0, v1Response->get_quota().status().infos().size());
+ ASSERT_TRUE(v1Response->get_quota().status().infos().empty());
}
}
@@ -2624,7 +2624,7 @@ TEST_P(MasterAPITest, CreateAndDestroyVolumes)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -3315,7 +3315,7 @@ TEST_P(AgentAPITest, GetContainers)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -3345,7 +3345,7 @@ TEST_P(AgentAPITest, GetContainers)
AWAIT_READY(v1Response);
ASSERT_TRUE(v1Response->IsInitialized());
ASSERT_EQ(v1::agent::Response::GET_CONTAINERS, v1Response->type());
- ASSERT_EQ(0, v1Response->get_containers().containers_size());
+ ASSERT_TRUE(v1Response->get_containers().containers().empty());
}
driver.launchTasks(offer.id(), {task});
@@ -3567,7 +3567,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetFrameworks)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
TaskInfo task;
@@ -3597,8 +3597,8 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetFrameworks)
AWAIT_READY(v1Response);
ASSERT_TRUE(v1Response->IsInitialized());
ASSERT_EQ(v1::agent::Response::GET_FRAMEWORKS, v1Response->type());
- ASSERT_EQ(0, v1Response->get_frameworks().frameworks_size());
- ASSERT_EQ(0, v1Response->get_frameworks().completed_frameworks_size());
+ ASSERT_TRUE(v1Response->get_frameworks().frameworks().empty());
+ ASSERT_TRUE(v1Response->get_frameworks().completed_frameworks().empty());
}
driver.launchTasks(offer.id(), {task});
@@ -3618,7 +3618,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetFrameworks)
ASSERT_TRUE(v1Response->IsInitialized());
ASSERT_EQ(v1::agent::Response::GET_FRAMEWORKS, v1Response->type());
ASSERT_EQ(1, v1Response->get_frameworks().frameworks_size());
- ASSERT_EQ(0, v1Response->get_frameworks().completed_frameworks_size());
+ ASSERT_TRUE(v1Response->get_frameworks().completed_frameworks().empty());
}
// Make sure the executor terminated.
@@ -3642,7 +3642,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetFrameworks)
AWAIT_READY(v1Response);
ASSERT_TRUE(v1Response->IsInitialized());
ASSERT_EQ(v1::agent::Response::GET_FRAMEWORKS, v1Response->type());
- ASSERT_EQ(0, v1Response->get_frameworks().frameworks_size());
+ ASSERT_TRUE(v1Response->get_frameworks().frameworks().empty());
ASSERT_EQ(1, v1Response->get_frameworks().completed_frameworks_size());
}
}
@@ -3670,7 +3670,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetExecutors)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
TaskInfo task;
@@ -3700,8 +3700,8 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetExecutors)
AWAIT_READY(v1Response);
ASSERT_TRUE(v1Response->IsInitialized());
ASSERT_EQ(v1::agent::Response::GET_EXECUTORS, v1Response->type());
- ASSERT_EQ(0, v1Response->get_executors().executors_size());
- ASSERT_EQ(0, v1Response->get_executors().completed_executors_size());
+ ASSERT_TRUE(v1Response->get_executors().executors().empty());
+ ASSERT_TRUE(v1Response->get_executors().completed_executors().empty());
}
driver.launchTasks(offer.id(), {task});
@@ -3721,7 +3721,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetExecutors)
ASSERT_TRUE(v1Response->IsInitialized());
ASSERT_EQ(v1::agent::Response::GET_EXECUTORS, v1Response->type());
ASSERT_EQ(1, v1Response->get_executors().executors_size());
- ASSERT_EQ(0, v1Response->get_executors().completed_executors_size());
+ ASSERT_TRUE(v1Response->get_executors().completed_executors().empty());
}
// Make sure the executor terminated.
@@ -3749,7 +3749,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetExecutors)
AWAIT_READY(v1Response);
ASSERT_TRUE(v1Response->IsInitialized());
ASSERT_EQ(v1::agent::Response::GET_EXECUTORS, v1Response->type());
- ASSERT_EQ(0, v1Response->get_executors().executors_size());
+ ASSERT_TRUE(v1Response->get_executors().executors().empty());
ASSERT_EQ(1, v1Response->get_executors().completed_executors_size());
}
}
@@ -3777,7 +3777,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetTasks)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
TaskInfo task;
@@ -3807,11 +3807,11 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetTasks)
AWAIT_READY(v1Response);
ASSERT_TRUE(v1Response->IsInitialized());
ASSERT_EQ(v1::agent::Response::GET_TASKS, v1Response->type());
- ASSERT_EQ(0, v1Response->get_tasks().pending_tasks_size());
- ASSERT_EQ(0, v1Response->get_tasks().queued_tasks_size());
- ASSERT_EQ(0, v1Response->get_tasks().launched_tasks_size());
- ASSERT_EQ(0, v1Response->get_tasks().terminated_tasks_size());
- ASSERT_EQ(0, v1Response->get_tasks().completed_tasks_size());
+ ASSERT_TRUE(v1Response->get_tasks().pending_tasks().empty());
+ ASSERT_TRUE(v1Response->get_tasks().queued_tasks().empty());
+ ASSERT_TRUE(v1Response->get_tasks().launched_tasks().empty());
+ ASSERT_TRUE(v1Response->get_tasks().terminated_tasks().empty());
+ ASSERT_TRUE(v1Response->get_tasks().completed_tasks().empty());
}
driver.launchTasks(offer.id(), {task});
@@ -3830,11 +3830,11 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetTasks)
AWAIT_READY(v1Response);
ASSERT_TRUE(v1Response->IsInitialized());
ASSERT_EQ(v1::agent::Response::GET_TASKS, v1Response->type());
- ASSERT_EQ(0, v1Response->get_tasks().pending_tasks_size());
- ASSERT_EQ(0, v1Response->get_tasks().queued_tasks_size());
+ ASSERT_TRUE(v1Response->get_tasks().pending_tasks().empty());
+ ASSERT_TRUE(v1Response->get_tasks().queued_tasks().empty());
ASSERT_EQ(1, v1Response->get_tasks().launched_tasks_size());
- ASSERT_EQ(0, v1Response->get_tasks().terminated_tasks_size());
- ASSERT_EQ(0, v1Response->get_tasks().completed_tasks_size());
+ ASSERT_TRUE(v1Response->get_tasks().terminated_tasks().empty());
+ ASSERT_TRUE(v1Response->get_tasks().completed_tasks().empty());
}
Clock::pause();
@@ -3869,10 +3869,10 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetTasks)
AWAIT_READY(v1Response);
ASSERT_TRUE(v1Response->IsInitialized());
ASSERT_EQ(v1::agent::Response::GET_TASKS, v1Response->type());
- ASSERT_EQ(0, v1Response->get_tasks().pending_tasks_size());
- ASSERT_EQ(0, v1Response->get_tasks().queued_tasks_size());
- ASSERT_EQ(0, v1Response->get_tasks().launched_tasks_size());
- ASSERT_EQ(0, v1Response->get_tasks().terminated_tasks_size());
+ ASSERT_TRUE(v1Response->get_tasks().pending_tasks().empty());
+ ASSERT_TRUE(v1Response->get_tasks().queued_tasks().empty());
+ ASSERT_TRUE(v1Response->get_tasks().launched_tasks().empty());
+ ASSERT_TRUE(v1Response->get_tasks().terminated_tasks().empty());
ASSERT_EQ(1, v1Response->get_tasks().completed_tasks_size());
}
@@ -3940,7 +3940,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetState)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
TaskInfo task;
@@ -3973,9 +3973,9 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetState)
ASSERT_EQ(v1::agent::Response::GET_STATE, v1Response->type());
const v1::agent::Response::GetState& getState = v1Response->get_state();
- ASSERT_EQ(0u, getState.get_frameworks().frameworks_size());
- ASSERT_EQ(0u, getState.get_tasks().launched_tasks_size());
- ASSERT_EQ(0u, getState.get_executors().executors_size());
+ ASSERT_TRUE(getState.get_frameworks().frameworks().empty());
+ ASSERT_TRUE(getState.get_tasks().launched_tasks().empty());
+ ASSERT_TRUE(getState.get_executors().executors().empty());
}
driver.launchTasks(offer.id(), {task});
@@ -3998,11 +3998,11 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetState)
const v1::agent::Response::GetState& getState = v1Response->get_state();
ASSERT_EQ(1u, getState.get_frameworks().frameworks_size());
- ASSERT_EQ(0u, getState.get_frameworks().completed_frameworks_size());
+ ASSERT_TRUE(getState.get_frameworks().completed_frameworks().empty());
ASSERT_EQ(1u, getState.get_tasks().launched_tasks_size());
- ASSERT_EQ(0u, getState.get_tasks().completed_tasks_size());
+ ASSERT_TRUE(getState.get_tasks().completed_tasks().empty());
ASSERT_EQ(1u, getState.get_executors().executors_size());
- ASSERT_EQ(0u, getState.get_executors().completed_executors_size());
+ ASSERT_TRUE(getState.get_executors().completed_executors().empty());
}
Clock::pause();
@@ -4052,11 +4052,11 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetState)
ASSERT_EQ(v1::agent::Response::GET_STATE, v1Response->type());
const v1::agent::Response::GetState& getState = v1Response->get_state();
- ASSERT_EQ(0u, getState.get_frameworks().frameworks_size());
+ ASSERT_TRUE(getState.get_frameworks().frameworks().empty());
ASSERT_EQ(1u, getState.get_frameworks().completed_frameworks_size());
- ASSERT_EQ(0u, getState.get_tasks().launched_tasks_size());
+ ASSERT_TRUE(getState.get_tasks().launched_tasks().empty());
ASSERT_EQ(1u, getState.get_tasks().completed_tasks_size());
- ASSERT_EQ(0u, getState.get_executors().executors_size());
+ ASSERT_TRUE(getState.get_executors().executors().empty());
ASSERT_EQ(1u, getState.get_executors().completed_executors_size());
}
}
@@ -4685,7 +4685,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, LaunchNestedContainerSession)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Future<TaskStatus> status;
EXPECT_CALL(sched, statusUpdate(_, _))
@@ -4806,7 +4806,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Future<TaskStatus> status;
EXPECT_CALL(sched, statusUpdate(_, _))
@@ -4902,7 +4902,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Future<TaskStatus> status;
EXPECT_CALL(sched, statusUpdate(_, _))
@@ -5019,7 +5019,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Future<TaskStatus> status;
EXPECT_CALL(sched, statusUpdate(_, _))
@@ -5130,7 +5130,7 @@ TEST_P(AgentAPITest, AttachContainerOutputFailure)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
EXPECT_CALL(exec, registered(_, _, _, _));
@@ -5214,7 +5214,7 @@ TEST_F(AgentAPITest, AttachContainerInputFailure)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
EXPECT_CALL(exec, registered(_, _, _, _));
@@ -5323,7 +5323,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Future<TaskStatus> status;
EXPECT_CALL(sched, statusUpdate(_, _))
@@ -5685,7 +5685,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPIStreamingTest,
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -5929,7 +5929,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/check_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/check_tests.cpp b/src/tests/check_tests.cpp
index 0810851..cc7be31 100644
--- a/src/tests/check_tests.cpp
+++ b/src/tests/check_tests.cpp
@@ -284,7 +284,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
v1::FrameworkID frameworkId(subscribed->framework_id());
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -433,7 +433,7 @@ TEST_F(CommandExecutorCheckTest, CommandCheckStatusChange)
v1::FrameworkID frameworkId(subscribed->framework_id());
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -553,7 +553,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
v1::FrameworkID frameworkId(subscribed->framework_id());
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -656,7 +656,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
v1::FrameworkID frameworkId(subscribed->framework_id());
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -777,7 +777,7 @@ TEST_F(CommandExecutorCheckTest, CommandCheckTimeout)
v1::FrameworkID frameworkId(subscribed->framework_id());
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -882,7 +882,7 @@ TEST_F(CommandExecutorCheckTest, CommandCheckAndHealthCheckNoShadowing)
v1::FrameworkID frameworkId(subscribed->framework_id());
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -1034,7 +1034,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(CommandExecutorCheckTest, HTTPCheckDelivered)
v1::FrameworkID frameworkId(subscribed->framework_id());
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -1167,7 +1167,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(CommandExecutorCheckTest, TCPCheckDelivered)
v1::FrameworkID frameworkId(subscribed->framework_id());
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -1377,7 +1377,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -1571,7 +1571,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -1732,7 +1732,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -1877,7 +1877,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -2045,7 +2045,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(DefaultExecutorCheckTest, CommandCheckTimeout)
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -2193,7 +2193,7 @@ TEST_F(DefaultExecutorCheckTest, CommandCheckAndHealthCheckNoShadowing)
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -2366,7 +2366,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -2509,7 +2509,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(DefaultExecutorCheckTest, HTTPCheckDelivered)
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -2658,7 +2658,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(DefaultExecutorCheckTest, TCPCheckDelivered)
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/container_logger_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/container_logger_tests.cpp b/src/tests/container_logger_tests.cpp
index 2ebff80..97e7979 100644
--- a/src/tests/container_logger_tests.cpp
+++ b/src/tests/container_logger_tests.cpp
@@ -183,7 +183,7 @@ TEST_F(ContainerLoggerTest, DefaultToSandbox)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// We'll start a task that outputs to stdout.
TaskInfo task = createTask(offers.get()[0], "echo 'Hello World!'");
@@ -284,7 +284,7 @@ TEST_F(ContainerLoggerTest, LOGROTATE_RotateInSandbox)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Start a task that spams stdout with 11 MB of (mostly blank) output.
// The logrotate container logger module is loaded with parameters that limit
@@ -434,7 +434,7 @@ TEST_F(ContainerLoggerTest, LOGROTATE_CustomRotateOptions)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const string customConfig = "some-custom-logrotate-option";
@@ -540,7 +540,7 @@ TEST_F(ContainerLoggerTest, LOGROTATE_ModuleFDOwnership)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Start a task that will keep running until the end of the test.
TaskInfo task = createTask(offers.get()[0], "sleep 100");
@@ -665,7 +665,7 @@ TEST_P(UserContainerLoggerTest, ROOT_LOGROTATE_RotateWithSwitchUserTrueOrFalse)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Start a task that spams stdout with 3 MB of (mostly blank) output.
// The logrotate container logger module is loaded with parameters that limit
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/containerizer/appc_spec_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/appc_spec_tests.cpp b/src/tests/containerizer/appc_spec_tests.cpp
index 9bc8253..5530401 100644
--- a/src/tests/containerizer/appc_spec_tests.cpp
+++ b/src/tests/containerizer/appc_spec_tests.cpp
@@ -223,8 +223,8 @@ TEST_F(AppcSpecTest, ValidateImageManifestWithNullExec)
// Check app object.
ASSERT_TRUE(imageManifest->has_app());
EXPECT_FALSE(imageManifest->app().has_workingdirectory());
- EXPECT_EQ(0, imageManifest->app().environment_size());
- EXPECT_EQ(0, imageManifest->app().exec_size());
+ EXPECT_TRUE(imageManifest->app().environment().empty());
+ EXPECT_TRUE(imageManifest->app().exec().empty());
// Check annotations.
ASSERT_EQ(imageManifest->annotations_size(), 8);
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/containerizer/cgroups_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/cgroups_isolator_tests.cpp b/src/tests/containerizer/cgroups_isolator_tests.cpp
index 6724211..ca5b48c 100644
--- a/src/tests/containerizer/cgroups_isolator_tests.cpp
+++ b/src/tests/containerizer/cgroups_isolator_tests.cpp
@@ -154,7 +154,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PERF_NET_CLS_UserCgroup)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Launch a task with the command executor.
CommandInfo command;
@@ -293,7 +293,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_RevocableCpu)
// Initially the framework will get all regular resources.
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
EXPECT_TRUE(Resources(offers1.get()[0].resources()).revocable().empty());
Future<vector<Offer>> offers2;
@@ -309,7 +309,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_RevocableCpu)
// Now the framework will get revocable resources.
AWAIT_READY(offers2);
- EXPECT_NE(0u, offers2->size());
+ EXPECT_FALSE(offers2->empty());
EXPECT_EQ(allocatedResources(cpus, frameworkInfo.role()),
Resources(offers2.get()[0].resources()));
@@ -394,7 +394,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_CFS_EnableCfs)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Generate random numbers to max out a single core. We'll run this
// for 0.5 seconds of wall time so it should consume approximately
@@ -516,7 +516,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_LimitSwap)
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
@@ -603,7 +603,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PidsAndTids)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
CommandInfo command;
command.set_shell(false);
@@ -1011,7 +1011,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PERF_Sample)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 120");
@@ -1127,7 +1127,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PERF_PerfForward)
driver.start();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
Future<TaskStatus> statusRunning1;
EXPECT_CALL(sched, statusUpdate(&driver, _))
@@ -1190,7 +1190,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PERF_PerfForward)
AWAIT_READY(__recover);
AWAIT_READY(offers2);
- EXPECT_NE(0u, offers2->size());
+ EXPECT_FALSE(offers2->empty());
// The first container should not report any perf statistics.
usage = containerizer->usage(containerId1);
@@ -1288,7 +1288,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_MemoryForward)
driver.start();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
Future<TaskStatus> statusRunning1;
EXPECT_CALL(sched, statusUpdate(&driver, _))
@@ -1348,7 +1348,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_MemoryForward)
AWAIT_READY(__recover);
AWAIT_READY(offers2);
- EXPECT_NE(0u, offers2->size());
+ EXPECT_FALSE(offers2->empty());
// The first container should not report memory statistics.
usage = containerizer->usage(containerId1);
@@ -1444,7 +1444,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_MemoryBackward)
driver.start();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
Future<TaskStatus> statusRunning1;
EXPECT_CALL(sched, statusUpdate(&driver, _))
@@ -1503,7 +1503,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_MemoryBackward)
AWAIT_READY(__recover);
AWAIT_READY(offers2);
- EXPECT_NE(0u, offers2->size());
+ EXPECT_FALSE(offers2->empty());
// The first container should not report memory statistics.
usage = containerizer->usage(containerId1);
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/containerizer/cgroups_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/cgroups_tests.cpp b/src/tests/containerizer/cgroups_tests.cpp
index 506fc7f..c5d83e6 100644
--- a/src/tests/containerizer/cgroups_tests.cpp
+++ b/src/tests/containerizer/cgroups_tests.cpp
@@ -844,7 +844,7 @@ TEST_F(CgroupsAnyHierarchyWithFreezerTest, ROOT_CGROUPS_AssignThreads)
Try<set<pid_t>> cgroupThreads =
cgroups::threads(hierarchy, TEST_CGROUPS_ROOT);
EXPECT_SOME(cgroupThreads);
- EXPECT_EQ(0u, cgroupThreads->size());
+ EXPECT_TRUE(cgroupThreads->empty());
// Assign ourselves to the test cgroup.
ASSERT_SOME(cgroups::assign(hierarchy, TEST_CGROUPS_ROOT, ::getpid()));
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/containerizer/cni_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/cni_isolator_tests.cpp b/src/tests/containerizer/cni_isolator_tests.cpp
index 60c85ad..02e1956 100644
--- a/src/tests/containerizer/cni_isolator_tests.cpp
+++ b/src/tests/containerizer/cni_isolator_tests.cpp
@@ -1435,7 +1435,7 @@ TEST_P(DefaultExecutorCniTest, ROOT_VerifyContainerIP)
}
AWAIT_READY(offers);
- ASSERT_NE(0, offers->offers().size());
+ ASSERT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/containerizer/cpu_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/cpu_isolator_tests.cpp b/src/tests/containerizer/cpu_isolator_tests.cpp
index 0e86318..f7cab58 100644
--- a/src/tests/containerizer/cpu_isolator_tests.cpp
+++ b/src/tests/containerizer/cpu_isolator_tests.cpp
@@ -106,7 +106,7 @@ TEST_P(CpuIsolatorTest, ROOT_UserCpuUsage)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Max out a single core in userspace. This will run for at most one
// second.
@@ -197,7 +197,7 @@ TEST_P(CpuIsolatorTest, ROOT_SystemCpuUsage)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Generating random numbers is done by the kernel and will max out
// a single core and run almost exclusively in the kernel, i.e.,
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/containerizer/docker_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_containerizer_tests.cpp b/src/tests/containerizer/docker_containerizer_tests.cpp
index fa91bcf..6856ca2 100644
--- a/src/tests/containerizer/docker_containerizer_tests.cpp
+++ b/src/tests/containerizer/docker_containerizer_tests.cpp
@@ -232,7 +232,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch_Executor)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -358,7 +358,7 @@ TEST_F(DockerContainerizerTest, DISABLED_ROOT_DOCKER_Launch_Executor_Bridged)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -476,7 +476,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -626,7 +626,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Kill)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -754,7 +754,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_TaskKillingCapability)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -875,7 +875,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Usage)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -1021,7 +1021,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Update)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -1461,7 +1461,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_SkipRecoverNonDocker)
// A MesosContainerizer task shouldn't be recovered by
// DockerContainerizer.
- EXPECT_EQ(0u, containers->size());
+ EXPECT_TRUE(containers->empty());
}
@@ -1605,7 +1605,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_LaunchWithPersistentVolumes)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -1765,7 +1765,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_RecoverPersistentVolumes)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -1929,7 +1929,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_RecoverOrphanedPersistentVolumes)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -2093,7 +2093,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Logs)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -2233,7 +2233,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Default_CMD)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -2366,7 +2366,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Default_CMD_Override)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -2504,7 +2504,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Default_CMD_Args)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -2644,7 +2644,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_SlaveRecoveryTaskContainer)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -2805,7 +2805,7 @@ TEST_F(DockerContainerizerTest,
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -2976,7 +2976,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_NC_PortMapping)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -3126,7 +3126,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_LaunchSandboxWithColon)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -3243,7 +3243,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DestroyWhileFetching)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -3363,7 +3363,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DestroyWhilePulling)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -3502,7 +3502,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_ExecutorCleanupWhenLaunchFailed)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -3610,7 +3610,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_FetchFailure)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -3721,7 +3721,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DockerPullFailure)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -3841,7 +3841,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DockerInspectDiscard)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -4127,7 +4127,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_CGROUPS_CFS_CgroupsEnableCFS)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -4267,7 +4267,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Non_Root_Sandbox)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -4421,7 +4421,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DefaultDNS)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -4597,7 +4597,7 @@ TEST_F(DockerContainerizerIPv6Test, ROOT_DOCKER_LaunchIPv6HostNetwork)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/containerizer/docker_volume_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_volume_isolator_tests.cpp b/src/tests/containerizer/docker_volume_isolator_tests.cpp
index 866af61..ed7d438 100644
--- a/src/tests/containerizer/docker_volume_isolator_tests.cpp
+++ b/src/tests/containerizer/docker_volume_isolator_tests.cpp
@@ -269,7 +269,7 @@ TEST_F(DockerVolumeIsolatorTest, ROOT_CommandTaskNoRootfsWithVolumes)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -423,7 +423,7 @@ TEST_F(DockerVolumeIsolatorTest, ROOT_CommandTaskNoRootfsFailedWithSameVolumes)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -527,7 +527,7 @@ TEST_F(DockerVolumeIsolatorTest, ROOT_CommandTaskNoRootfsSlaveRecovery)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -720,7 +720,7 @@ TEST_F(DockerVolumeIsolatorTest,
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -854,7 +854,7 @@ TEST_F(DockerVolumeIsolatorTest,
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -989,7 +989,7 @@ TEST_F(DockerVolumeIsolatorTest,
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/containerizer/environment_secret_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/environment_secret_isolator_tests.cpp b/src/tests/containerizer/environment_secret_isolator_tests.cpp
index b034cee..2ba156f 100644
--- a/src/tests/containerizer/environment_secret_isolator_tests.cpp
+++ b/src/tests/containerizer/environment_secret_isolator_tests.cpp
@@ -81,7 +81,7 @@ TEST_F(EnvironmentSecretIsolatorTest, ResolveSecret)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ EXPECT_FALSE(offers->empty());
const string commandString = strings::format(
"env; test \"$%s\" = \"%s\"",
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/containerizer/io_switchboard_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/io_switchboard_tests.cpp b/src/tests/containerizer/io_switchboard_tests.cpp
index 742143a..de42be9 100644
--- a/src/tests/containerizer/io_switchboard_tests.cpp
+++ b/src/tests/containerizer/io_switchboard_tests.cpp
@@ -965,7 +965,7 @@ TEST_F(IOSwitchboardTest, DISABLED_RecoverThenKillSwitchboardContainerDestroyed)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Launch a task with tty to start the switchboard server.
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -1085,7 +1085,7 @@ TEST_F(IOSwitchboardTest, ContainerAttachAfterSlaveRestart)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Future<TaskStatus> statusRunning;
EXPECT_CALL(sched, statusUpdate(_, _))
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/containerizer/linux_capabilities_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/linux_capabilities_isolator_tests.cpp b/src/tests/containerizer/linux_capabilities_isolator_tests.cpp
index 6d95d60..a1ff9b5 100644
--- a/src/tests/containerizer/linux_capabilities_isolator_tests.cpp
+++ b/src/tests/containerizer/linux_capabilities_isolator_tests.cpp
@@ -255,7 +255,7 @@ TEST_P(LinuxCapabilitiesIsolatorTest, ROOT_Ping)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// We use 'ping' as the command since it has file capabilities
// (`NET_RAW` and `NET_ADMIN` in permitted set). This allows us to
@@ -390,7 +390,7 @@ TEST_P(LinuxCapabilitiesIsolatorTest, ROOT_NestedPing)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
Resources resources = Resources::parse("cpus:0.1;mem:32;disk:32").get();
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/containerizer/linux_filesystem_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/linux_filesystem_isolator_tests.cpp b/src/tests/containerizer/linux_filesystem_isolator_tests.cpp
index f9cab2f..7713187 100644
--- a/src/tests/containerizer/linux_filesystem_isolator_tests.cpp
+++ b/src/tests/containerizer/linux_filesystem_isolator_tests.cpp
@@ -1039,7 +1039,7 @@ TEST_F(LinuxFilesystemIsolatorMesosTest,
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -1110,7 +1110,7 @@ TEST_F(LinuxFilesystemIsolatorMesosTest,
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -1204,7 +1204,7 @@ TEST_F(LinuxFilesystemIsolatorMesosTest,
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -1474,7 +1474,7 @@ TEST_F(LinuxFilesystemIsolatorMesosTest, ROOT_SandboxEnvironmentVariable)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -1558,7 +1558,7 @@ TEST_F(LinuxFilesystemIsolatorMesosTest,
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
// We request a sandbox (1MB) that is smaller than the persistent
// volume (4MB) and attempt to create a file in that volume that is
@@ -1652,7 +1652,7 @@ TEST_F(LinuxFilesystemIsolatorMesosTest,
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
// We create a shared volume which shall be used by the task to
// write to that volume.
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/containerizer/memory_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/memory_isolator_tests.cpp b/src/tests/containerizer/memory_isolator_tests.cpp
index b7b7acd..a7028da 100644
--- a/src/tests/containerizer/memory_isolator_tests.cpp
+++ b/src/tests/containerizer/memory_isolator_tests.cpp
@@ -106,7 +106,7 @@ TEST_P(MemoryIsolatorTest, ROOT_MemUsage)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 120");
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/containerizer/memory_pressure_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/memory_pressure_tests.cpp b/src/tests/containerizer/memory_pressure_tests.cpp
index 8a43c4f..eec2e05 100644
--- a/src/tests/containerizer/memory_pressure_tests.cpp
+++ b/src/tests/containerizer/memory_pressure_tests.cpp
@@ -113,7 +113,7 @@ TEST_F(MemoryPressureMesosTest, CGROUPS_ROOT_Statistics)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -234,7 +234,7 @@ TEST_F(MemoryPressureMesosTest, CGROUPS_ROOT_SlaveRecovery)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/containerizer/mesos_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/mesos_containerizer_tests.cpp b/src/tests/containerizer/mesos_containerizer_tests.cpp
index 1fc56c4..e61a85d 100644
--- a/src/tests/containerizer/mesos_containerizer_tests.cpp
+++ b/src/tests/containerizer/mesos_containerizer_tests.cpp
@@ -1258,7 +1258,7 @@ TEST_F(MesosContainerizerRecoverTest, SkipRecoverNonMesosContainers)
Future<hashset<ContainerID>> containers = containerizer.get()->containers();
AWAIT_READY(containers);
- EXPECT_EQ(0u, containers->size());
+ EXPECT_TRUE(containers->empty());
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/containerizer/port_mapping_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/port_mapping_tests.cpp b/src/tests/containerizer/port_mapping_tests.cpp
index 84b39b1..544eaef 100644
--- a/src/tests/containerizer/port_mapping_tests.cpp
+++ b/src/tests/containerizer/port_mapping_tests.cpp
@@ -1915,7 +1915,7 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_RecoverMixedContainers)
driver.start();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
Offer offer1 = offers1.get()[0];
@@ -1972,7 +1972,7 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_RecoverMixedContainers)
Clock::resume();
AWAIT_READY(offers2);
- EXPECT_NE(0u, offers2->size());
+ EXPECT_FALSE(offers2->empty());
Offer offer2 = offers2.get()[0];
@@ -2084,7 +2084,7 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_CleanUpOrphan)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Start a long running task using network islator.
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -2143,11 +2143,11 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_CleanUpOrphan)
ip::classifiers(eth0, ingress::HANDLE);
EXPECT_SOME(classifiers);
- EXPECT_EQ(0u, classifiers->size());
+ EXPECT_TRUE(classifiers->empty());
classifiers = ip::classifiers(lo, ingress::HANDLE);
EXPECT_SOME(classifiers);
- EXPECT_EQ(0u, classifiers->size());
+ EXPECT_TRUE(classifiers->empty());
// Expect no 'veth' devices.
Try<set<string>> links = net::links();
@@ -2159,7 +2159,7 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_CleanUpOrphan)
// Expect no files in bind mount directory.
Try<list<string>> files = os::ls(slave::PORT_MAPPING_BIND_MOUNT_ROOT());
ASSERT_SOME(files);
- EXPECT_EQ(0u, files->size());
+ EXPECT_TRUE(files->empty());
driver.stop();
driver.join();
@@ -2205,7 +2205,7 @@ TEST_F(PortMappingMesosTest, ROOT_NetworkNamespaceHandleSymlink)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Start a long running task using network islator.
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -2298,7 +2298,7 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_RecoverMixedKnownAndUnKnownOrphans)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/containerizer/posix_rlimits_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/posix_rlimits_isolator_tests.cpp b/src/tests/containerizer/posix_rlimits_isolator_tests.cpp
index bf25049..0030cd1 100644
--- a/src/tests/containerizer/posix_rlimits_isolator_tests.cpp
+++ b/src/tests/containerizer/posix_rlimits_isolator_tests.cpp
@@ -85,7 +85,7 @@ TEST_F(PosixRLimitsIsolatorTest, InvalidLimits)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(
offers.get()[0].slave_id(),
@@ -154,7 +154,7 @@ TEST_F(PosixRLimitsIsolatorTest, UnsetLimits)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(
offers.get()[0].slave_id(),
@@ -234,7 +234,7 @@ TEST_F(PosixRLimitsIsolatorTest, BothSoftAndHardLimitSet)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(
offers.get()[0].slave_id(),
@@ -301,7 +301,7 @@ TEST_F(PosixRLimitsIsolatorTest, TaskExceedingLimit)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
// The task attempts to use an infinite amount of CPU time.
TaskInfo task = createTask(
@@ -386,7 +386,7 @@ TEST_F(PosixRLimitsIsolatorTest, NestedContainers)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
Future<TaskStatus> taskStatuses[4];
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/containerizer/routing_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/routing_tests.cpp b/src/tests/containerizer/routing_tests.cpp
index d05b3b1..f2e4622 100644
--- a/src/tests/containerizer/routing_tests.cpp
+++ b/src/tests/containerizer/routing_tests.cpp
@@ -1333,7 +1333,7 @@ TEST_F(RoutingVethTest, ROOT_IPFilterRemove)
ip::classifiers(TEST_VETH_LINK, ingress::HANDLE);
ASSERT_SOME(classifiers);
- EXPECT_EQ(0u, classifiers->size());
+ EXPECT_TRUE(classifiers->empty());
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/containerizer/runtime_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/runtime_isolator_tests.cpp b/src/tests/containerizer/runtime_isolator_tests.cpp
index fbca31a..8bf6a11 100644
--- a/src/tests/containerizer/runtime_isolator_tests.cpp
+++ b/src/tests/containerizer/runtime_isolator_tests.cpp
@@ -386,7 +386,7 @@ TEST_F(DockerRuntimeIsolatorTest, ROOT_INTERNET_CURL_NestedSimpleCommand)
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
@@ -505,7 +505,7 @@ TEST_F(DockerRuntimeIsolatorTest, ROOT_NestedDockerDefaultCmdLocalPuller)
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
@@ -625,7 +625,7 @@ TEST_F(DockerRuntimeIsolatorTest, ROOT_NestedDockerDefaultEntryptLocalPuller)
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/containerizer/xfs_quota_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/xfs_quota_tests.cpp b/src/tests/containerizer/xfs_quota_tests.cpp
index c220a6b..11dc7f5 100644
--- a/src/tests/containerizer/xfs_quota_tests.cpp
+++ b/src/tests/containerizer/xfs_quota_tests.cpp
@@ -801,7 +801,7 @@ TEST_F(ROOT_XFS_QuotaTest, NoCheckpointRecovery)
AWAIT_READY(usage2);
// We should have no executors left because we didn't checkpoint.
- ASSERT_EQ(0, usage2->executors().size());
+ ASSERT_TRUE(usage2->executors().empty());
Try<std::list<string>> sandboxes = os::glob(path::join(
slave::paths::getSandboxRootDir(mountPoint.get()),
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/default_executor_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/default_executor_tests.cpp b/src/tests/default_executor_tests.cpp
index b977631..3ac9f29 100644
--- a/src/tests/default_executor_tests.cpp
+++ b/src/tests/default_executor_tests.cpp
@@ -172,7 +172,7 @@ TEST_P(DefaultExecutorTest, TaskRunning)
executorInfo.mutable_resources()->CopyFrom(resources);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -305,7 +305,7 @@ TEST_P(DefaultExecutorTest, KillTask)
executorInfo.mutable_resources()->CopyFrom(resources);
AWAIT_READY(offers1);
- EXPECT_NE(0, offers1->offers().size());
+ EXPECT_FALSE(offers1->offers().empty());
const v1::Offer& offer1 = offers1->offers(0);
const v1::AgentID& agentId = offer1.agent_id();
@@ -592,7 +592,7 @@ TEST_P(DefaultExecutorTest, KillTaskGroupOnTaskFailure)
executorInfo.mutable_resources()->CopyFrom(resources);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -771,7 +771,7 @@ TEST_P(DefaultExecutorTest, TaskUsesExecutor)
executorInfo.mutable_resources()->CopyFrom(resources);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -871,7 +871,7 @@ TEST_P(DefaultExecutorTest, ROOT_ContainerStatusForTask)
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
@@ -988,7 +988,7 @@ TEST_P(DefaultExecutorTest, CommitSuicideOnTaskFailure)
executorInfo.mutable_resources()->CopyFrom(resources);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -1124,7 +1124,7 @@ TEST_P(DefaultExecutorTest, CommitSuicideOnKillTask)
executorInfo.mutable_resources()->CopyFrom(resources);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -1329,7 +1329,7 @@ TEST_P(DefaultExecutorTest, ReservedResources)
executorInfo.mutable_resources()->CopyFrom(reserved);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const v1::AgentID& agentId = offer.agent_id();
@@ -1497,7 +1497,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(
executorInfo.mutable_resources()->CopyFrom(executorResources);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
@@ -1625,7 +1625,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(
executorInfo.mutable_resources()->CopyFrom(unreserved);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/dynamic_weights_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/dynamic_weights_tests.cpp b/src/tests/dynamic_weights_tests.cpp
index 3c86325..da9b53d 100644
--- a/src/tests/dynamic_weights_tests.cpp
+++ b/src/tests/dynamic_weights_tests.cpp
@@ -113,7 +113,7 @@ protected:
convertToHashmap(weightInfos.get());
if (_weights.isNone()) {
- EXPECT_EQ(0u, weights.size());
+ EXPECT_TRUE(weights.empty());
} else if (_weights == GET_WEIGHTS1) {
EXPECT_EQ(1u, weights.size());
EXPECT_EQ(2.0, weights["role1"]);
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/exception_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/exception_tests.cpp b/src/tests/exception_tests.cpp
index b5b657c..0e72cdf 100644
--- a/src/tests/exception_tests.cpp
+++ b/src/tests/exception_tests.cpp
@@ -161,7 +161,7 @@ TEST_F(ExceptionTest, DisallowSchedulerCallbacksOnAbort)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// None of these callbacks should be invoked.
EXPECT_CALL(sched, offerRescinded(&driver, _))
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/fault_tolerance_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp
index 5b82135..5ac38a8 100644
--- a/src/tests/fault_tolerance_tests.cpp
+++ b/src/tests/fault_tolerance_tests.cpp
@@ -221,7 +221,7 @@ TEST_F(FaultToleranceTest, ReregisterCompletedFrameworks)
AWAIT_READY(frameworkId);
EXPECT_NE("", frameworkId->value());
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Step 3. Create/launch a task.
TaskInfo task =
@@ -951,7 +951,7 @@ TEST_F(FaultToleranceTest, DisconnectedSchedulerLaunchLost)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
AWAIT_READY(message);
@@ -1014,7 +1014,7 @@ TEST_F(FaultToleranceTest, DisconnectedSchedulerLaunchDropped)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
AWAIT_READY(message);
@@ -1076,7 +1076,7 @@ TEST_F(FaultToleranceTest, SchedulerFailoverStatusUpdate)
driver1.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Launch a task.
TaskInfo task;
@@ -1286,7 +1286,7 @@ TEST_F(FaultToleranceTest, ForwardStatusUpdateUnknownExecutor)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
TaskInfo task;
@@ -1375,7 +1375,7 @@ TEST_F(FaultToleranceTest, SchedulerFailoverExecutorToFrameworkMessage)
driver1.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
@@ -1475,7 +1475,7 @@ TEST_F(FaultToleranceTest, SchedulerFailoverFrameworkToExecutorMessage)
driver1.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Future<TaskStatus> status;
EXPECT_CALL(sched1, statusUpdate(&driver1, _))
@@ -1702,7 +1702,7 @@ TEST_F(FaultToleranceTest, SchedulerExit)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
AWAIT_READY(offers);
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/fetcher_cache_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fetcher_cache_tests.cpp b/src/tests/fetcher_cache_tests.cpp
index 17bd95f..e2ecb10 100644
--- a/src/tests/fetcher_cache_tests.cpp
+++ b/src/tests/fetcher_cache_tests.cpp
@@ -575,7 +575,7 @@ Try<vector<FetcherCacheTest::Task>> FetcherCacheTest::launchTasks(
(offers.isFailed() ? offers.failure() : "discarded"));
}
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const Offer offer = offers.get()[0];
vector<TaskInfo> tasks;
@@ -659,7 +659,7 @@ TEST_F(FetcherCacheTest, LocalUncached)
EXPECT_EQ(0u, fetcherProcess->cacheSize());
ASSERT_SOME(fetcherProcess->cacheFiles());
- EXPECT_EQ(0u, fetcherProcess->cacheFiles()->size());
+ EXPECT_TRUE(fetcherProcess->cacheFiles()->empty());
const string path = path::join(task->runDirectory.string(), COMMAND_NAME);
EXPECT_TRUE(isExecutable(path));
@@ -837,7 +837,7 @@ TEST_F(FetcherCacheTest, CachedFallback)
EXPECT_EQ(0u, fetcherProcess->cacheSize());
ASSERT_SOME(fetcherProcess->cacheFiles());
- EXPECT_EQ(0u, fetcherProcess->cacheFiles()->size());
+ EXPECT_TRUE(fetcherProcess->cacheFiles()->empty());
verifyCacheMetrics();
}
@@ -876,7 +876,7 @@ TEST_F(FetcherCacheTest, LocalUncachedExtract)
EXPECT_EQ(0u, fetcherProcess->cacheSize());
ASSERT_SOME(fetcherProcess->cacheFiles());
- EXPECT_EQ(0u, fetcherProcess->cacheFiles()->size());
+ EXPECT_TRUE(fetcherProcess->cacheFiles()->empty());
verifyCacheMetrics();
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/group_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/group_tests.cpp b/src/tests/group_tests.cpp
index f2e37cc..8fe09e4 100644
--- a/src/tests/group_tests.cpp
+++ b/src/tests/group_tests.cpp
@@ -74,7 +74,7 @@ TEST_F(GroupTest, Group)
memberships = group.watch(memberships.get());
AWAIT_READY(memberships);
- EXPECT_EQ(0u, memberships->size());
+ EXPECT_TRUE(memberships->empty());
ASSERT_TRUE(membership->cancelled().isReady());
ASSERT_TRUE(membership->cancelled().get());
@@ -185,7 +185,7 @@ TEST_F(GroupTest, GroupCancelWithDisconnect)
memberships = group.watch(memberships.get());
AWAIT_READY(memberships);
- EXPECT_EQ(0u, memberships->size());
+ EXPECT_TRUE(memberships->empty());
ASSERT_TRUE(membership->cancelled().isReady());
ASSERT_TRUE(membership->cancelled().get());
@@ -216,7 +216,7 @@ TEST_F(GroupTest, GroupWatchWithSessionExpiration)
server->expireSession(session->get());
AWAIT_READY(memberships);
- EXPECT_EQ(0u, memberships->size());
+ EXPECT_TRUE(memberships->empty());
AWAIT_READY(membership->cancelled());
ASSERT_FALSE(membership->cancelled().get());
@@ -428,7 +428,7 @@ TEST_F(GroupTest, LabelledGroup)
memberships = group.watch(memberships.get());
AWAIT_READY(memberships);
- EXPECT_EQ(0u, memberships->size());
+ EXPECT_TRUE(memberships->empty());
ASSERT_TRUE(membership->cancelled().isReady());
ASSERT_TRUE(membership->cancelled().get());
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/health_check_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/health_check_tests.cpp b/src/tests/health_check_tests.cpp
index e824d1b..2d7aefd 100644
--- a/src/tests/health_check_tests.cpp
+++ b/src/tests/health_check_tests.cpp
@@ -325,7 +325,7 @@ TEST_F(HealthCheckTest, HealthyTask)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
vector<TaskInfo> tasks =
populateTasks(SLEEP_COMMAND(120), "exit 0", offers.get()[0]);
@@ -468,7 +468,7 @@ TEST_F(HealthCheckTest, ROOT_HealthyTaskWithContainerImage)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Make use of 'populateTasks()' to avoid duplicate code.
vector<TaskInfo> tasks =
@@ -603,7 +603,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HealthCheckTest, ROOT_DOCKER_DockerHealthyTask)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
ContainerInfo containerInfo;
containerInfo.set_type(ContainerInfo::DOCKER);
@@ -698,7 +698,7 @@ TEST_F(HealthCheckTest, HealthyTaskNonShell)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
CommandInfo command;
command.set_shell(false);
@@ -764,7 +764,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HealthCheckTest, HealthStatusChange)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Create a temporary file.
Try<string> temporaryPath = os::mktemp(path::join(os::getcwd(), "XXXXXX"));
@@ -876,7 +876,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
ContainerInfo containerInfo;
containerInfo.set_type(ContainerInfo::DOCKER);
@@ -1012,7 +1012,7 @@ TEST_F(HealthCheckTest, ConsecutiveFailures)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
vector<TaskInfo> tasks = populateTasks(
SLEEP_COMMAND(120), "exit 1", offers.get()[0], 0, 4);
@@ -1101,7 +1101,7 @@ TEST_F(HealthCheckTest, EnvironmentSetup)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
map<string, string> env;
env["STATUS"] = "0";
@@ -1157,7 +1157,7 @@ TEST_F(HealthCheckTest, GracePeriod)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
#ifndef __WINDOWS__
const string falseCommand = "false";
@@ -1219,7 +1219,7 @@ TEST_F(HealthCheckTest, CheckCommandTimeout)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
vector<TaskInfo> tasks = populateTasks(
SLEEP_COMMAND(120),
@@ -1291,7 +1291,7 @@ TEST_F(HealthCheckTest, HealthyToUnhealthyTransitionWithinGracePeriod)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Create a temporary file.
const string tmpPath = path::join(os::getcwd(), "healthyToUnhealthy");
@@ -1369,7 +1369,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HealthCheckTest, HealthyTaskViaHTTP)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const uint16_t testPort = getFreePort().get();
@@ -1458,7 +1458,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HealthCheckTest, HealthyTaskViaHTTPWithoutType)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const uint16_t testPort = getFreePort().get();
@@ -1538,7 +1538,7 @@ TEST_F(HealthCheckTest, HealthyTaskViaTCP)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const uint16_t testPort = getFreePort().get();
@@ -1621,7 +1621,7 @@ TEST_F(HealthCheckTest, ROOT_INTERNET_CURL_HealthyTaskViaHTTPWithContainerImage)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const uint16_t testPort = getFreePort().get();
@@ -1709,7 +1709,7 @@ TEST_F(HealthCheckTest,
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const uint16_t testPort = getFreePort().get();
@@ -1804,7 +1804,7 @@ TEST_F(HealthCheckTest, ROOT_INTERNET_CURL_HealthyTaskViaTCPWithContainerImage)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const uint16_t testPort = getFreePort().get();
@@ -1904,7 +1904,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const uint16_t testPort = getFreePort().get();
@@ -2035,7 +2035,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const uint16_t testPort = getFreePort().get();
@@ -2171,7 +2171,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const uint16_t testPort = getFreePort().get();
@@ -2315,7 +2315,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ EXPECT_FALSE(offers->empty());
Future<TaskStatus> statusRunning;
Future<TaskStatus> statusHealthy;
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/hook_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/hook_tests.cpp b/src/tests/hook_tests.cpp
index 04edbf8..c5acbd0 100644
--- a/src/tests/hook_tests.cpp
+++ b/src/tests/hook_tests.cpp
@@ -176,7 +176,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HookTest, VerifyMasterLaunchTaskHook)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
@@ -373,7 +373,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HookTest, VerifySlaveLaunchExecutorHook)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Launch a task with the command executor.
TaskInfo task;
@@ -891,7 +891,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -1018,7 +1018,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HookTest, ROOT_DOCKER_VerifySlavePostFetchHook)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(
offers.get()[0].slave_id(),
@@ -1103,7 +1103,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Resources resources = offers.get()[0].resources();
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/http_fault_tolerance_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/http_fault_tolerance_tests.cpp b/src/tests/http_fault_tolerance_tests.cpp
index 8fcd56d..f05aee8 100644
--- a/src/tests/http_fault_tolerance_tests.cpp
+++ b/src/tests/http_fault_tolerance_tests.cpp
@@ -386,7 +386,7 @@ TEST_F(HttpFaultToleranceTest, SchedulerFailoverStatusUpdate)
v1::FrameworkID frameworkId(subscribed->framework_id());
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
EXPECT_CALL(*executor, connected(_))
.WillOnce(v1::executor::SendSubscribe(frameworkId, evolve(executorId)));
@@ -567,7 +567,7 @@ TEST_F(HttpFaultToleranceTest, SchedulerFailoverExecutorToFrameworkMessage)
v1::FrameworkID frameworkId(subscribed->framework_id());
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
EXPECT_CALL(*executor, connected(_))
.WillOnce(v1::executor::SendSubscribe(frameworkId, evolve(executorId)));
@@ -739,7 +739,7 @@ TEST_F(HttpFaultToleranceTest, SchedulerFailoverFrameworkToExecutorMessage)
v1::FrameworkID frameworkId(subscribed->framework_id());
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
EXPECT_CALL(*executor, connected(_))
.WillOnce(v1::executor::SendSubscribe(frameworkId, evolve(executorId)));
@@ -908,7 +908,7 @@ TEST_F(HttpFaultToleranceTest, SchedulerExit)
v1::FrameworkID frameworkId(subscribed->framework_id());
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
EXPECT_CALL(*executor, connected(_))
.WillOnce(v1::executor::SendSubscribe(frameworkId, evolve(executorId)));