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:05 UTC
[1/4] mesos git commit: Improved the readability of some
assertions/expectations.
Repository: mesos
Updated Branches:
refs/heads/master 92feb52d9 -> 628d6609b
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/master_authorization_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_authorization_tests.cpp b/src/tests/master_authorization_tests.cpp
index 8d54472..b41b4a1 100644
--- a/src/tests/master_authorization_tests.cpp
+++ b/src/tests/master_authorization_tests.cpp
@@ -135,7 +135,7 @@ TEST_F(MasterAuthorizationTest, AuthorizedTask)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Create an authorized task.
TaskInfo task;
@@ -207,7 +207,7 @@ TEST_F(MasterAuthorizationTest, UnauthorizedTask)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Create an unauthorized task.
TaskInfo task;
@@ -281,7 +281,7 @@ TEST_F(MasterAuthorizationTest, UnauthorizedTaskGroup)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Resources resources =
Resources::parse("cpus:0.1;mem:32;disk:32").get();
@@ -382,7 +382,7 @@ TEST_F(MasterAuthorizationTest, KillTask)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "", DEFAULT_EXECUTOR_ID);
@@ -465,7 +465,7 @@ TEST_F(MasterAuthorizationTest, KillPendingTaskInTaskGroup)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Resources resources =
Resources::parse("cpus:0.1;mem:32;disk:32").get();
@@ -595,7 +595,7 @@ TEST_F(MasterAuthorizationTest, SlaveRemovedLost)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "", DEFAULT_EXECUTOR_ID);
@@ -700,7 +700,7 @@ TEST_F(MasterAuthorizationTest, SlaveRemovedDropped)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "", DEFAULT_EXECUTOR_ID);
@@ -801,7 +801,7 @@ TEST_F(MasterAuthorizationTest, FrameworkRemoved)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "", DEFAULT_EXECUTOR_ID);
@@ -873,7 +873,7 @@ TEST_F(MasterAuthorizationTest, PendingExecutorInfoDiffersOnDifferentSlaves)
ASSERT_SOME(slave1);
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
// Launch the first task with the default executor id.
ExecutorInfo executor1;
@@ -915,7 +915,7 @@ TEST_F(MasterAuthorizationTest, PendingExecutorInfoDiffersOnDifferentSlaves)
ASSERT_SOME(slave2);
AWAIT_READY(offers2);
- EXPECT_NE(0u, offers2->size());
+ EXPECT_FALSE(offers2->empty());
// Now launch the second task with the same executor id but
// a different executor command.
@@ -1534,7 +1534,7 @@ TYPED_TEST(MasterAuthorizerTest, FilterStateEndpoint)
AWAIT_READY(registered);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("test");
@@ -1723,7 +1723,7 @@ TYPED_TEST(MasterAuthorizerTest, FilterFrameworksEndpoint)
AWAIT_READY(registered);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("test");
@@ -1914,7 +1914,7 @@ TYPED_TEST(MasterAuthorizerTest, FilterTasksEndpoint)
AWAIT_READY(registered);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("test");
@@ -2141,7 +2141,7 @@ TYPED_TEST(MasterAuthorizerTest, FilterRolesEndpoint)
JSON::Object tasks = parse.get();
ASSERT_TRUE(tasks.values["roles"].is<JSON::Array>());
- EXPECT_EQ(0u, tasks.values["roles"].as<JSON::Array>().values.size());
+ EXPECT_TRUE(tasks.values["roles"].as<JSON::Array>().values.empty());
}
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/master_maintenance_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_maintenance_tests.cpp b/src/tests/master_maintenance_tests.cpp
index e7a80ff..7595e8b 100644
--- a/src/tests/master_maintenance_tests.cpp
+++ b/src/tests/master_maintenance_tests.cpp
@@ -516,7 +516,7 @@ TEST_F(MasterMaintenanceTest, PreV1SchedulerSupport)
// Wait for some normal offers.
AWAIT_READY(normalOffers);
- EXPECT_NE(0u, normalOffers->size());
+ EXPECT_FALSE(normalOffers->empty());
// Check that unavailability is not set.
foreach (const Offer& offer, normalOffers.get()) {
@@ -551,7 +551,7 @@ TEST_F(MasterMaintenanceTest, PreV1SchedulerSupport)
// Wait for some offers.
AWAIT_READY(unavailabilityOffers);
- EXPECT_NE(0u, unavailabilityOffers->size());
+ EXPECT_FALSE(unavailabilityOffers->empty());
// Check that each offer has an unavailability.
foreach (const Offer& offer, unavailabilityOffers.get()) {
@@ -982,7 +982,7 @@ TEST_F(MasterMaintenanceTest, BringUpMachines)
::protobuf::parse<mesos::maintenance::Schedule>(masterSchedule_.get());
ASSERT_SOME(masterSchedule);
- ASSERT_EQ(0, masterSchedule->windows().size());
+ ASSERT_TRUE(masterSchedule->windows().empty());
}
@@ -1032,8 +1032,8 @@ TEST_F(MasterMaintenanceTest, MachineStatus)
::protobuf::parse<maintenance::ClusterStatus>(statuses_.get());
ASSERT_SOME(statuses);
- ASSERT_EQ(0, statuses->draining_machines().size());
- ASSERT_EQ(0, statuses->down_machines().size());
+ ASSERT_TRUE(statuses->draining_machines().empty());
+ ASSERT_TRUE(statuses->down_machines().empty());
// Get the maintenance statuses.
response = process::http::get(
@@ -1052,7 +1052,7 @@ TEST_F(MasterMaintenanceTest, MachineStatus)
ASSERT_SOME(statuses);
ASSERT_EQ(2, statuses->draining_machines().size());
- ASSERT_EQ(0, statuses->down_machines().size());
+ ASSERT_TRUE(statuses->down_machines().empty());
// Deactivate machine1.
JSON::Array machines = createMachineList({machine1});
@@ -1111,7 +1111,7 @@ TEST_F(MasterMaintenanceTest, MachineStatus)
ASSERT_SOME(statuses);
ASSERT_EQ(1, statuses->draining_machines().size());
- ASSERT_EQ(0, statuses->down_machines().size());
+ ASSERT_TRUE(statuses->down_machines().empty());
ASSERT_EQ("0.0.0.2", statuses->draining_machines(0).id().ip());
}
@@ -1170,12 +1170,12 @@ TEST_F(MasterMaintenanceTest, InverseOffers)
::protobuf::parse<maintenance::ClusterStatus>(statuses_.get());
ASSERT_SOME(statuses);
- ASSERT_EQ(0, statuses->down_machines().size());
+ ASSERT_TRUE(statuses->down_machines().empty());
ASSERT_EQ(1, statuses->draining_machines().size());
ASSERT_EQ(
maintenanceHostname,
statuses->draining_machines(0).id().hostname());
- ASSERT_EQ(0, statuses->draining_machines(0).statuses().size());
+ ASSERT_TRUE(statuses->draining_machines(0).statuses().empty());
// Now start a framework.
auto scheduler = std::make_shared<v1::MockHTTPScheduler>();
@@ -1223,7 +1223,7 @@ TEST_F(MasterMaintenanceTest, InverseOffers)
// Ensure we receive some regular resource offers.
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
// All the offers should have unavailability.
foreach (const v1::Offer& offer, offers->offers()) {
@@ -1341,7 +1341,7 @@ TEST_F(MasterMaintenanceTest, InverseOffers)
statuses = ::protobuf::parse<maintenance::ClusterStatus>(statuses_.get());
ASSERT_SOME(statuses);
- ASSERT_EQ(0, statuses->down_machines().size());
+ ASSERT_TRUE(statuses->down_machines().empty());
ASSERT_EQ(1, statuses->draining_machines().size());
ASSERT_EQ(
maintenanceHostname,
@@ -1405,7 +1405,7 @@ TEST_F(MasterMaintenanceTest, InverseOffers)
statuses = ::protobuf::parse<maintenance::ClusterStatus>(statuses_.get());
ASSERT_SOME(statuses);
- ASSERT_EQ(0, statuses->down_machines().size());
+ ASSERT_TRUE(statuses->down_machines().empty());
ASSERT_EQ(1, statuses->draining_machines().size());
ASSERT_EQ(
maintenanceHostname,
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/master_quota_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_quota_tests.cpp b/src/tests/master_quota_tests.cpp
index 9d52f76..5e3f2d2 100644
--- a/src/tests/master_quota_tests.cpp
+++ b/src/tests/master_quota_tests.cpp
@@ -509,7 +509,7 @@ TEST_F(MasterQuotaTest, Status)
const Try<QuotaStatus> status = ::protobuf::parse<QuotaStatus>(parse.get());
ASSERT_FALSE(status.isError());
- EXPECT_EQ(0, status->infos().size());
+ EXPECT_TRUE(status->infos().empty());
}
// Send a quota request for the specified role.
@@ -1328,7 +1328,7 @@ TEST_F(MasterQuotaTest, AuthorizeGetUpdateQuotaRequests)
const Try<QuotaStatus> status = ::protobuf::parse<QuotaStatus>(parse.get());
ASSERT_FALSE(status.isError());
- EXPECT_EQ(0, status->infos().size());
+ EXPECT_TRUE(status->infos().empty());
}
// Get the previous requested quota using default principal, which is
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/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 9c31eea..0b26953 100644
--- a/src/tests/master_slave_reconciliation_tests.cpp
+++ b/src/tests/master_slave_reconciliation_tests.cpp
@@ -194,7 +194,7 @@ TEST_F(MasterSlaveReconciliationTest, ReconcileLostTask)
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("test task");
@@ -289,7 +289,7 @@ TEST_F(MasterSlaveReconciliationTest, ReconcileDroppedTask)
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("test task");
@@ -411,7 +411,7 @@ TEST_F(MasterSlaveReconciliationTest, ReconcileRace)
AWAIT_READY(reregisterSlaveMessage);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("test task");
@@ -511,7 +511,7 @@ TEST_F(MasterSlaveReconciliationTest, SlaveReregisterPendingTask)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// No TASK_LOST updates should occur!
EXPECT_CALL(sched, statusUpdate(&driver, _))
@@ -580,7 +580,7 @@ TEST_F(MasterSlaveReconciliationTest, SlaveReregisterTerminalTask)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("test task");
@@ -668,7 +668,7 @@ TEST_F(MasterSlaveReconciliationTest, SlaveReregisterFrameworks)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("test task");
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index e6ed02e..6647e3b 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -157,7 +157,7 @@ TEST_F(MasterTest, TaskRunning)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
// Ensure the hostname and url are set correctly.
EXPECT_EQ(
@@ -247,7 +247,7 @@ TEST_F(MasterTest, ShutdownFrameworkWhileTaskRunning)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
Offer offer = offers.get()[0];
TaskInfo task;
@@ -354,7 +354,7 @@ TEST_F(MasterTest, KillTask)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
TaskID taskId;
taskId.set_value("1");
@@ -427,7 +427,7 @@ TEST_F(MasterTest, KillUnknownTask)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
TaskID taskId;
taskId.set_value("1");
@@ -515,7 +515,7 @@ TEST_F(MasterTest, KillUnknownTaskSlaveInTransition)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
// Start a task.
TaskInfo task = createTask(offers.get()[0], "", DEFAULT_EXECUTOR_ID);
@@ -725,7 +725,7 @@ TEST_F(MasterTest, EndpointsForHalfRemovedSlave)
Try<JSON::Object> parse2 = JSON::parse<JSON::Object>(response2->body);
Result<JSON::Array> array2 = parse2->find<JSON::Array>("slaves");
ASSERT_SOME(array2);
- EXPECT_EQ(0u, array2->values.size());
+ EXPECT_TRUE(array2->values.empty());
Clock::resume();
}
@@ -757,7 +757,7 @@ TEST_F(MasterTest, StatusUpdateAck)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
@@ -967,7 +967,7 @@ TEST_F(MasterTest, RecoverResources)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
ExecutorInfo executorInfo;
executorInfo.MergeFrom(DEFAULT_EXECUTOR_INFO);
@@ -1021,7 +1021,7 @@ TEST_F(MasterTest, RecoverResources)
driver.reviveOffers(); // Don't wait till the next allocation.
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
Offer offer = offers.get()[0];
EXPECT_EQ(taskResources, offer.resources());
@@ -1053,7 +1053,7 @@ TEST_F(MasterTest, RecoverResources)
// the allocator tests for inspiration.
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
Resources slaveResources = Resources::parse(flags.resources.get()).get();
EXPECT_EQ(allocatedResources(slaveResources, DEFAULT_FRAMEWORK_INFO.role()),
@@ -1090,7 +1090,7 @@ TEST_F(MasterTest, FrameworkMessage)
schedDriver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
@@ -1177,7 +1177,7 @@ TEST_F(MasterTest, MultipleExecutors)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
TaskInfo task1;
task1.set_name("");
@@ -1520,7 +1520,7 @@ TEST_F(MasterTest, LaunchCombinedOfferTest)
driver.start();
AWAIT_READY(offers1);
- ASSERT_NE(0u, offers1->size());
+ ASSERT_FALSE(offers1->empty());
Resources resources1(offers1.get()[0].resources());
EXPECT_EQ(2, resources1.cpus().get());
EXPECT_EQ(Megabytes(1024), resources1.mem().get());
@@ -1561,7 +1561,7 @@ TEST_F(MasterTest, LaunchCombinedOfferTest)
// Await 2nd offer.
AWAIT_READY(offers2);
- ASSERT_NE(0u, offers2->size());
+ ASSERT_FALSE(offers2->empty());
Resources resources2(offers2.get()[0].resources());
EXPECT_EQ(1, resources2.cpus().get());
@@ -1593,7 +1593,7 @@ TEST_F(MasterTest, LaunchCombinedOfferTest)
// Await 3rd offer - 2nd and 3rd offer to same slave are now ready.
AWAIT_READY(offers3);
- ASSERT_NE(0u, offers3->size());
+ ASSERT_FALSE(offers3->empty());
Resources resources3(offers3.get()[0].resources());
EXPECT_EQ(1, resources3.cpus().get());
EXPECT_EQ(Megabytes(512), resources3.mem().get());
@@ -1666,7 +1666,7 @@ TEST_F(MasterTest, LaunchAcrossSlavesLost)
driver.start();
AWAIT_READY(offers1);
- ASSERT_NE(0u, offers1->size());
+ ASSERT_FALSE(offers1->empty());
Resources resources1(offers1.get()[0].resources());
EXPECT_EQ(2, resources1.cpus().get());
EXPECT_EQ(Megabytes(1024), resources1.mem().get());
@@ -1686,7 +1686,7 @@ TEST_F(MasterTest, LaunchAcrossSlavesLost)
ASSERT_SOME(slave2);
AWAIT_READY(offers2);
- ASSERT_NE(0u, offers2->size());
+ ASSERT_FALSE(offers2->empty());
Resources resources2(offers1.get()[0].resources());
EXPECT_EQ(2, resources2.cpus().get());
EXPECT_EQ(Megabytes(1024), resources2.mem().get());
@@ -1775,7 +1775,7 @@ TEST_F(MasterTest, LaunchAcrossSlavesDropped)
driver.start();
AWAIT_READY(offers1);
- ASSERT_NE(0u, offers1->size());
+ ASSERT_FALSE(offers1->empty());
Resources resources1(offers1.get()[0].resources());
EXPECT_EQ(2, resources1.cpus().get());
EXPECT_EQ(Megabytes(1024), resources1.mem().get());
@@ -1795,7 +1795,7 @@ TEST_F(MasterTest, LaunchAcrossSlavesDropped)
ASSERT_SOME(slave2);
AWAIT_READY(offers2);
- ASSERT_NE(0u, offers2->size());
+ ASSERT_FALSE(offers2->empty());
Resources resources2(offers1.get()[0].resources());
EXPECT_EQ(2, resources2.cpus().get());
EXPECT_EQ(Megabytes(1024), resources2.mem().get());
@@ -1886,7 +1886,7 @@ TEST_F(MasterTest, LaunchDuplicateOfferLost)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
Resources resources(offers.get()[0].resources());
EXPECT_EQ(2, resources.cpus().get());
EXPECT_EQ(Megabytes(1024), resources.mem().get());
@@ -1978,7 +1978,7 @@ TEST_F(MasterTest, LaunchDuplicateOfferDropped)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
Resources resources(offers.get()[0].resources());
EXPECT_EQ(2, resources.cpus().get());
EXPECT_EQ(Megabytes(1024), resources.mem().get());
@@ -2093,7 +2093,7 @@ TEST_F(MasterTest, LaunchDifferentRoleLost)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers1);
- ASSERT_NE(0u, offers1->size());
+ ASSERT_FALSE(offers1->empty());
Resources resources1(offers1.get()[0].resources());
EXPECT_EQ(2, resources1.cpus().get());
EXPECT_EQ(Megabytes(1024), resources1.mem().get());
@@ -2133,7 +2133,7 @@ TEST_F(MasterTest, LaunchDifferentRoleLost)
// Await 2nd offer.
AWAIT_READY(offers2);
- ASSERT_NE(0u, offers2->size());
+ ASSERT_FALSE(offers2->empty());
ASSERT_TRUE(offers2.get()[0].has_allocation_info());
Resources resources2(offers2.get()[0].resources());
@@ -2165,7 +2165,7 @@ TEST_F(MasterTest, LaunchDifferentRoleLost)
// Await 3rd offer - 2nd and 3rd offer to same slave are now ready.
AWAIT_READY(offers3);
- ASSERT_NE(0u, offers3->size());
+ ASSERT_FALSE(offers3->empty());
ASSERT_TRUE(offers3.get()[0].has_allocation_info());
Resources resources3(offers3.get()[0].resources());
EXPECT_EQ(1, resources3.cpus().get());
@@ -2781,7 +2781,7 @@ TEST_F(MasterTest, UnreachableTaskAfterFailover)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 100");
@@ -3588,7 +3588,7 @@ TEST_F(MasterTest, OrphanTasksMultipleAgents)
driver.start();
AWAIT_READY(offers1);
- ASSERT_NE(0u, offers1->size());
+ ASSERT_FALSE(offers1->empty());
TaskInfo task1 =
createTask(offers1.get()[0], "sleep 100", DEFAULT_EXECUTOR_ID);
@@ -3623,7 +3623,7 @@ TEST_F(MasterTest, OrphanTasksMultipleAgents)
ASSERT_SOME(slave2);
AWAIT_READY(offers2);
- ASSERT_NE(0u, offers2->size());
+ ASSERT_FALSE(offers2->empty());
TaskInfo task2 =
createTask(offers2.get()[0], "sleep 100", DEFAULT_EXECUTOR_ID);
@@ -3683,8 +3683,8 @@ TEST_F(MasterTest, OrphanTasksMultipleAgents)
parse->values["unregistered_frameworks"].as<JSON::Array>();
ASSERT_EQ(1u, frameworks.values.size());
- EXPECT_EQ(0u, orphanTasks.values.size());
- EXPECT_EQ(0u, unregisteredFrameworks.values.size());
+ EXPECT_TRUE(orphanTasks.values.empty());
+ EXPECT_TRUE(unregisteredFrameworks.values.empty());
JSON::Object framework = frameworks.values.front().as<JSON::Object>();
@@ -3711,7 +3711,7 @@ TEST_F(MasterTest, OrphanTasksMultipleAgents)
parse->values["unregistered_frameworks"].as<JSON::Array>();
ASSERT_EQ(1u, frameworks.values.size());
- EXPECT_EQ(0u, unregisteredFrameworks.values.size());
+ EXPECT_TRUE(unregisteredFrameworks.values.empty());
JSON::Object framework = frameworks.values.front().as<JSON::Object>();
@@ -4658,7 +4658,7 @@ TEST_F(MasterTest, StateSummaryEndpoint)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
TaskID taskId;
taskId.set_value("1");
@@ -4811,7 +4811,7 @@ TEST_F(MasterTest, StateEndpointAllocationRole)
AWAIT_READY(registered);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
Resources executorResources = Resources::parse("cpus:0.1;mem:32").get();
executorResources.allocate("foo");
@@ -4934,7 +4934,7 @@ TEST_F(MasterTest, RecoveredSlaves)
Result<JSON::Array> array1 = parse->find<JSON::Array>("slaves");
ASSERT_SOME(array1);
- EXPECT_EQ(0u, array1->values.size());
+ EXPECT_TRUE(array1->values.empty());
Result<JSON::Array> array2 =
parse->find<JSON::Array>("recovered_slaves");
@@ -4958,7 +4958,7 @@ TEST_F(MasterTest, RecoveredSlaves)
Result<JSON::Array> array1 = parse->find<JSON::Array>("slaves");
ASSERT_SOME(array1);
- EXPECT_EQ(0u, array1->values.size());
+ EXPECT_TRUE(array1->values.empty());
Result<JSON::Array> array2 =
parse->find<JSON::Array>("recovered_slaves");
@@ -5000,7 +5000,7 @@ TEST_F(MasterTest, RecoveredSlaves)
Result<JSON::Array> array2 =
parse->find<JSON::Array>("recovered_slaves");
ASSERT_SOME(array2);
- EXPECT_EQ(0u, array2->values.size());
+ EXPECT_TRUE(array2->values.empty());
}
{
@@ -5022,7 +5022,7 @@ TEST_F(MasterTest, RecoveredSlaves)
Result<JSON::Array> array2 =
parse->find<JSON::Array>("recovered_slaves");
ASSERT_SOME(array2);
- EXPECT_EQ(0u, array2->values.size());
+ EXPECT_TRUE(array2->values.empty());
}
}
@@ -5055,7 +5055,7 @@ TEST_F(MasterTest, ExecutorLabels)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
@@ -5147,7 +5147,7 @@ TEST_F(MasterTest, TaskLabels)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
@@ -5251,7 +5251,7 @@ TEST_F(MasterTest, TaskStatusLabels)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 100", DEFAULT_EXECUTOR_ID);
@@ -5353,7 +5353,7 @@ TEST_F(MasterTest, TaskStatusContainerStatus)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 100", DEFAULT_EXECUTOR_ID);
@@ -5555,7 +5555,7 @@ TEST_F(MasterTest, TaskDiscoveryInfo)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
TaskInfo task;
task.set_name("testtask");
@@ -5755,7 +5755,7 @@ TEST_F(MasterTest, MasterFailoverLongLivedExecutor)
driver.start();
AWAIT_READY(offers1);
- ASSERT_NE(0u, offers1->size());
+ ASSERT_FALSE(offers1->empty());
TaskInfo task1;
task1.set_name("");
@@ -5796,7 +5796,7 @@ TEST_F(MasterTest, MasterFailoverLongLivedExecutor)
detector.appoint(master.get()->pid);
AWAIT_READY(offers2);
- ASSERT_NE(0u, offers2->size());
+ ASSERT_FALSE(offers2->empty());
// The second task is a just a copy of the first task (using the
// same executor and resources). We have to set a new task id.
@@ -6643,7 +6643,7 @@ TEST_F(MasterTest, DISABLED_RecoverResourcesOrphanedTask)
v1::FrameworkID frameworkId = subscribed->framework_id();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->offers().size());
+ ASSERT_FALSE(offers->offers().empty());
v1::executor::Mesos* execMesos = nullptr;
@@ -7356,7 +7356,7 @@ TEST_F(MasterTest, MultiRoleFrameworkReceivesOffers)
Clock::settle();
AWAIT_READY(offers1);
- ASSERT_NE(0u, offers1->size());
+ ASSERT_FALSE(offers1->empty());
ASSERT_TRUE(offers1.get()[0].has_allocation_info());
// Start second agent.
@@ -7371,7 +7371,7 @@ TEST_F(MasterTest, MultiRoleFrameworkReceivesOffers)
Clock::settle();
AWAIT_READY(offers2);
- ASSERT_NE(0u, offers2->size());
+ ASSERT_FALSE(offers2->empty());
ASSERT_TRUE(offers2.get()[0].has_allocation_info());
// We cannot deterministically expect roles for each offer, however we
@@ -8134,7 +8134,7 @@ TEST_P(MasterTestPrePostReservationRefinement, LaunchTask)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
Offer offer = offers->front();
TaskInfo task;
@@ -8254,7 +8254,7 @@ TEST_P(MasterTestPrePostReservationRefinement, LaunchGroup)
evolve<v1::Resource>(outboundResources(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();
@@ -8552,7 +8552,7 @@ TEST_P(MasterTestPrePostReservationRefinement, StateEndpointPendingTasks)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
Offer offer = offers->front();
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/master_validation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_validation_tests.cpp b/src/tests/master_validation_tests.cpp
index 813fb25..710b25c 100644
--- a/src/tests/master_validation_tests.cpp
+++ b/src/tests/master_validation_tests.cpp
@@ -1352,7 +1352,7 @@ TEST_F(TaskValidationTest, TaskUsesCommandInfoAndExecutorInfo)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Future<TaskStatus> status;
EXPECT_CALL(sched, statusUpdate(&driver, _))
@@ -1481,7 +1481,7 @@ TEST_F(TaskValidationTest, TaskUsesNoResources)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
@@ -1530,7 +1530,7 @@ TEST_F(TaskValidationTest, TaskUsesMoreResourcesThanOffered)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
@@ -1591,7 +1591,7 @@ TEST_F(TaskValidationTest, DuplicatedTaskID)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
ExecutorInfo executor;
executor.mutable_executor_id()->set_value("default");
@@ -1675,7 +1675,7 @@ TEST_F(TaskValidationTest, ExecutorInfoDiffersOnSameSlave)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
ExecutorInfo executor;
executor.mutable_executor_id()->set_value("default");
@@ -1769,7 +1769,7 @@ TEST_F(TaskValidationTest, ExecutorInfoDiffersOnDifferentSlaves)
ASSERT_SOME(slave1);
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
// Launch the first task with the default executor id.
ExecutorInfo executor1;
@@ -1807,7 +1807,7 @@ TEST_F(TaskValidationTest, ExecutorInfoDiffersOnDifferentSlaves)
ASSERT_SOME(slave2);
AWAIT_READY(offers2);
- EXPECT_NE(0u, offers2->size());
+ EXPECT_FALSE(offers2->empty());
// Now launch the second task with the same executor id but
// a different executor command.
@@ -2159,7 +2159,7 @@ TEST_F(TaskValidationTest, ExecutorShutdownGracePeriodIsNonNegative)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
ExecutorInfo executorInfo(DEFAULT_EXECUTOR_INFO);
@@ -2217,7 +2217,7 @@ TEST_F(TaskValidationTest, KillPolicyGracePeriodIsNonNegative)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
TaskInfo task;
@@ -2275,7 +2275,7 @@ TEST_F(TaskValidationTest, TaskEnvironmentInvalid)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Future<TaskStatus> status;
EXPECT_CALL(sched, statusUpdate(&driver, _))
@@ -2706,7 +2706,7 @@ TEST_F(TaskGroupValidationTest, ExecutorUsesDockerContainerInfo)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -2805,7 +2805,7 @@ TEST_F(TaskGroupValidationTest, ExecutorWithoutFrameworkId)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Create an invalid executor without framework id.
ExecutorInfo executor;
@@ -2894,7 +2894,7 @@ TEST_F(TaskGroupValidationTest, TaskUsesDockerContainerInfo)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -2983,7 +2983,7 @@ TEST_F(TaskGroupValidationTest, TaskUsesNetworkInfo)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
Resources resources = Resources::parse("cpus:1;mem:512;disk:32").get();
@@ -3074,7 +3074,7 @@ TEST_F(TaskGroupValidationTest, TaskUsesDifferentExecutor)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
Resources resources = Resources::parse("cpus:1;mem:512;disk:32").get();
@@ -3169,7 +3169,7 @@ TEST_F(TaskGroupValidationTest, ExecutorEnvironmentInvalid)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task1;
task1.set_name("1");
@@ -3273,7 +3273,7 @@ TEST_F(TaskGroupValidationTest, TaskEnvironmentInvalid)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task1;
task1.set_name("1");
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/oversubscription_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/oversubscription_tests.cpp b/src/tests/oversubscription_tests.cpp
index 54535a3..a4c4a60 100644
--- a/src/tests/oversubscription_tests.cpp
+++ b/src/tests/oversubscription_tests.cpp
@@ -226,7 +226,7 @@ TEST_F(OversubscriptionTest, FetchResourceUsage)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 10", DEFAULT_EXECUTOR_ID);
task.mutable_labels()->add_labels()->CopyFrom(
@@ -391,7 +391,7 @@ TEST_F(OversubscriptionTest, RevocableOffer)
// 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;
@@ -410,7 +410,7 @@ TEST_F(OversubscriptionTest, RevocableOffer)
// Now the framework will get revocable resources.
AWAIT_READY(offers2);
- EXPECT_NE(0u, offers2->size());
+ EXPECT_FALSE(offers2->empty());
EXPECT_EQ(
taskResources + executorResources,
Resources(offers2.get()[0].resources()));
@@ -612,7 +612,7 @@ TEST_F(OversubscriptionTest, RescindRevocableOfferWithDecreasedRevocable)
Clock::advance(agentFlags.registration_backoff_factor);
Clock::advance(masterFlags.allocation_interval);
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;
@@ -625,7 +625,7 @@ TEST_F(OversubscriptionTest, RescindRevocableOfferWithDecreasedRevocable)
// Now the framework will get revocable resources.
AWAIT_READY(offers2);
- EXPECT_NE(0u, offers2->size());
+ EXPECT_FALSE(offers2->empty());
EXPECT_EQ(allocatedResources(resources1, framework.role()),
Resources(offers2.get()[0].resources()));
@@ -656,7 +656,7 @@ TEST_F(OversubscriptionTest, RescindRevocableOfferWithDecreasedRevocable)
// The new offer should include the latest oversubscribed resources.
AWAIT_READY(offers3);
- EXPECT_NE(0u, offers3->size());
+ EXPECT_FALSE(offers3->empty());
EXPECT_EQ(allocatedResources(resources2, framework.role()),
Resources(offers3.get()[0].resources()));
@@ -729,7 +729,7 @@ TEST_F(OversubscriptionTest, FixedResourceEstimator)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const Offer offer = offers.get()[0];
// The offer should contain revocable resources.
@@ -815,7 +815,7 @@ TEST_F(OversubscriptionTest, QoSFetchResourceUsage)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 10", DEFAULT_EXECUTOR_ID);
task.mutable_executor()->mutable_labels()->add_labels()->CopyFrom(
@@ -1010,7 +1010,7 @@ TEST_F(OversubscriptionTest, QoSCorrectionKill)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 10");
@@ -1119,7 +1119,7 @@ TEST_F(OversubscriptionTest, QoSCorrectionKillPartitionAware)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 10");
@@ -1229,7 +1229,7 @@ TEST_F(OversubscriptionTest, UpdateAllocatorOnSchedulerFailover)
// it doesn't have the capability set.
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
EXPECT_TRUE(Resources(offers1.get()[0].resources()).revocable().empty());
// Now launch the second (i.e., failover) scheduler using the
@@ -1277,7 +1277,7 @@ TEST_F(OversubscriptionTest, UpdateAllocatorOnSchedulerFailover)
Clock::resume();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
EXPECT_TRUE(Resources(offers1.get()[0].resources()).revocable().empty());
// Check if framework receives revocable offers.
@@ -1289,7 +1289,7 @@ TEST_F(OversubscriptionTest, UpdateAllocatorOnSchedulerFailover)
estimations.put(revocable);
AWAIT_READY(offers2);
- EXPECT_NE(0u, offers2->size());
+ EXPECT_FALSE(offers2->empty());
EXPECT_EQ(allocatedResources(revocable, framework2.role()),
Resources(offers2.get()[0].resources()));
@@ -1349,7 +1349,7 @@ TEST_F(OversubscriptionTest, RemoveCapabilitiesOnSchedulerFailover)
// 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;
@@ -1363,7 +1363,7 @@ TEST_F(OversubscriptionTest, RemoveCapabilitiesOnSchedulerFailover)
// Now the framework will get revocable resources.
AWAIT_READY(offers2);
- EXPECT_NE(0u, offers2->size());
+ EXPECT_FALSE(offers2->empty());
EXPECT_EQ(allocatedResources(revocable, framework1.role()),
Resources(offers2.get()[0].resources()));
@@ -1400,7 +1400,7 @@ TEST_F(OversubscriptionTest, RemoveCapabilitiesOnSchedulerFailover)
Clock::resume();
AWAIT_READY(offers3);
- EXPECT_NE(0u, offers3->size());
+ EXPECT_FALSE(offers3->empty());
EXPECT_TRUE(Resources(offers3.get()[0].resources()).revocable().empty());
driver1.stop();
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/partition_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/partition_tests.cpp b/src/tests/partition_tests.cpp
index 62a84f7..0886f48 100644
--- a/src/tests/partition_tests.cpp
+++ b/src/tests/partition_tests.cpp
@@ -1828,7 +1828,7 @@ TEST_F(PartitionTest, PartitionedSlaveExitedExecutor)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
// Launch a task. This allows us to have the slave send an
// ExitedExecutorMessage.
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/persistent_volume_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/persistent_volume_tests.cpp b/src/tests/persistent_volume_tests.cpp
index 7b0f436..3e1d1fe 100644
--- a/src/tests/persistent_volume_tests.cpp
+++ b/src/tests/persistent_volume_tests.cpp
@@ -402,7 +402,7 @@ TEST_P(PersistentVolumeTest, CreateAndDestroyPersistentVolumes)
Try<list<string>> files = ::fs::list(path::join(volume1Path, "*"));
ASSERT_SOME(files);
- EXPECT_EQ(0u, files->size());
+ EXPECT_TRUE(files->empty());
} else {
EXPECT_FALSE(os::exists(volume1Path));
}
@@ -901,7 +901,7 @@ TEST_P(PersistentVolumeTest, AccessPersistentVolume)
Try<list<string>> files = ::fs::list(path::join(volumePath, "*"));
CHECK_SOME(files);
- EXPECT_EQ(0u, files->size());
+ EXPECT_TRUE(files->empty());
} else {
EXPECT_FALSE(os::exists(volumePath));
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/reconciliation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/reconciliation_tests.cpp b/src/tests/reconciliation_tests.cpp
index f1635fd..7289618 100644
--- a/src/tests/reconciliation_tests.cpp
+++ b/src/tests/reconciliation_tests.cpp
@@ -882,7 +882,7 @@ TEST_F(ReconciliationTest, PendingTask)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Return a pending future from authorizer.
Future<Nothing> authorize;
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/registrar_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/registrar_tests.cpp b/src/tests/registrar_tests.cpp
index e2c38d3..b5fc458 100644
--- a/src/tests/registrar_tests.cpp
+++ b/src/tests/registrar_tests.cpp
@@ -598,8 +598,8 @@ TEST_F(RegistrarTest, UpdateMaintenanceSchedule)
AWAIT_READY(registry);
EXPECT_EQ(1, registry->schedules().size());
- EXPECT_EQ(0, registry->schedules(0).windows().size());
- EXPECT_EQ(0, registry->machines().machines().size());
+ EXPECT_TRUE(registry->schedules(0).windows().empty());
+ EXPECT_TRUE(registry->machines().machines().empty());
}
}
@@ -767,8 +767,8 @@ TEST_F(RegistrarTest, StopMaintenance)
Future<Registry> registry = registrar.recover(master);
AWAIT_READY(registry);
- EXPECT_EQ(0, registry->schedules().size());
- EXPECT_EQ(0, registry->machines().machines().size());
+ EXPECT_TRUE(registry->schedules().empty());
+ EXPECT_TRUE(registry->machines().machines().empty());
}
}
@@ -973,7 +973,7 @@ TEST_F(RegistrarTest, RemoveQuota)
AWAIT_READY(registry);
// Check that there are no more quotas at this point.
- ASSERT_EQ(0, registry->quotas().size());
+ ASSERT_TRUE(registry->quotas().empty());
}
}
@@ -994,7 +994,7 @@ TEST_F(RegistrarTest, UpdateWeights)
Future<Registry> registry = registrar.recover(master);
AWAIT_READY(registry);
- ASSERT_EQ(0, registry->weights_size());
+ ASSERT_TRUE(registry->weights().empty());
// Store the weight for 'ROLE1' previously without weight.
hashmap<string, double> weights;
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/registrar_zookeeper_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/registrar_zookeeper_tests.cpp b/src/tests/registrar_zookeeper_tests.cpp
index cc082d3..96bae29 100644
--- a/src/tests/registrar_zookeeper_tests.cpp
+++ b/src/tests/registrar_zookeeper_tests.cpp
@@ -85,7 +85,7 @@ TEST_F(RegistrarZooKeeperTest, TaskRunning)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "dummy", DEFAULT_EXECUTOR_ID);
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/resource_offers_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/resource_offers_tests.cpp b/src/tests/resource_offers_tests.cpp
index e1fcab4..dc9c230 100644
--- a/src/tests/resource_offers_tests.cpp
+++ b/src/tests/resource_offers_tests.cpp
@@ -94,7 +94,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
EXPECT_GE(10u, offers->size());
Resources resources(offers.get()[0].resources());
@@ -128,7 +128,7 @@ TEST_F(ResourceOffersTest, ResourcesGetReofferedAfterFrameworkStops)
driver1.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
driver1.stop();
driver1.join();
@@ -173,7 +173,7 @@ TEST_F(ResourceOffersTest, ResourcesGetReofferedWhenUnused)
driver1.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
vector<TaskInfo> tasks; // Use nothing!
driver1.launchTasks(offers.get()[0].id(), tasks);
@@ -223,7 +223,7 @@ TEST_F(ResourceOffersTest, ResourcesGetReofferedAfterTaskInfoError)
driver1.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
@@ -316,7 +316,7 @@ TEST_F(ResourceOffersTest, Request)
AWAIT_READY(received);
EXPECT_EQ(sent.size(), received->size());
- EXPECT_NE(0u, received->size());
+ EXPECT_FALSE(received->empty());
EXPECT_EQ(request.slave_id(), received.get()[0].slave_id());
driver.stop();
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/scheduler_driver_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/scheduler_driver_tests.cpp b/src/tests/scheduler_driver_tests.cpp
index 47ad1dc..d2aff69 100644
--- a/src/tests/scheduler_driver_tests.cpp
+++ b/src/tests/scheduler_driver_tests.cpp
@@ -296,7 +296,7 @@ TEST_F(MesosSchedulerDriverTest, ExplicitAcknowledgementsMasterGeneratedUpdate)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Launch a task using no resources.
TaskInfo task;
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/scheduler_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/scheduler_tests.cpp b/src/tests/scheduler_tests.cpp
index 5c42dc0..21f8825 100644
--- a/src/tests/scheduler_tests.cpp
+++ b/src/tests/scheduler_tests.cpp
@@ -459,7 +459,7 @@ TEST_P(SchedulerTest, TaskRunning)
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)));
@@ -589,7 +589,7 @@ TEST_P(SchedulerTest, TaskGroupRunning)
v1::FrameworkID frameworkId(subscribed->framework_id());
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
Future<RunTaskGroupMessage> runTaskGroupMessage =
FUTURE_PROTOBUF(RunTaskGroupMessage(), master.get()->pid, slave.get()->pid);
@@ -783,7 +783,7 @@ TEST_P(SchedulerTest, ReconcileTask)
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)));
@@ -911,7 +911,7 @@ TEST_P(SchedulerTest, KillTask)
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)));
@@ -1057,7 +1057,7 @@ TEST_P(SchedulerTest, ShutdownExecutor)
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)));
@@ -1274,7 +1274,7 @@ TEST_P(SchedulerTest, Revive)
v1::FrameworkID frameworkId(subscribed->framework_id());
AWAIT_READY(offers1);
- EXPECT_NE(0, offers1->offers().size());
+ EXPECT_FALSE(offers1->offers().empty());
const v1::Offer& offer = offers1->offers(0);
@@ -1317,7 +1317,7 @@ TEST_P(SchedulerTest, Revive)
}
AWAIT_READY(offers2);
- EXPECT_NE(0, offers2->offers().size());
+ EXPECT_FALSE(offers2->offers().empty());
ASSERT_EQ(offer.resources(), offers2->offers(0).resources());
}
@@ -1372,7 +1372,7 @@ TEST_P(SchedulerTest, Suppress)
v1::FrameworkID frameworkId(subscribed->framework_id());
AWAIT_READY(offers1);
- EXPECT_NE(0, offers1->offers().size());
+ EXPECT_FALSE(offers1->offers().empty());
const v1::Offer& offer = offers1->offers(0);
@@ -1432,7 +1432,7 @@ TEST_P(SchedulerTest, Suppress)
AWAIT_READY(offers2);
- EXPECT_NE(0, offers2->offers().size());
+ EXPECT_FALSE(offers2->offers().empty());
ASSERT_EQ(offer.resources(), offers2->offers(0).resources());
}
@@ -1514,7 +1514,7 @@ TEST_P(SchedulerTest, NoOffersWithAllRolesSuppressed)
}
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
}
@@ -1572,7 +1572,7 @@ TEST_P(SchedulerTest, Message)
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)));
@@ -2031,7 +2031,7 @@ TEST_P(SchedulerSSLTest, RunTaskAndTeardown)
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)));
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/slave_authorization_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_authorization_tests.cpp b/src/tests/slave_authorization_tests.cpp
index 4e55148..536a8ef 100644
--- a/src/tests/slave_authorization_tests.cpp
+++ b/src/tests/slave_authorization_tests.cpp
@@ -204,7 +204,7 @@ TYPED_TEST(SlaveAuthorizerTest, FilterStateEndpoint)
AWAIT_READY(registered);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("test");
@@ -666,7 +666,7 @@ TEST_F(ExecutorAuthorizationTest, FailedSubscribe)
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
Future<v1::executor::Mesos*> executorLib;
EXPECT_CALL(*executor, connected(_))
@@ -825,7 +825,7 @@ TEST_F(ExecutorAuthorizationTest, FailedApiCalls)
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
Future<v1::executor::Mesos*> executorLib;
EXPECT_CALL(*executor, connected(_))
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/slave_recovery_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp
index 9ba6f60..b3825d1 100644
--- a/src/tests/slave_recovery_tests.cpp
+++ b/src/tests/slave_recovery_tests.cpp
@@ -218,7 +218,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverSlaveState)
UPID frameworkPid = subscribeMessage->from;
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
SlaveID slaveId = offers.get()[0].slave_id();
@@ -389,7 +389,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverStatusUpdateManager)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -476,7 +476,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_ReconnectHTTPExecutor)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Launch a task with the HTTP based command executor.
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -609,7 +609,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_ROOT_CGROUPS_ReconnectDefaultExecutor)
executorInfo.mutable_framework_id()->CopyFrom(devolve(frameworkId));
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const SlaveID slaveId = devolve(offer.agent_id());
@@ -758,7 +758,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconnectExecutor)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -852,7 +852,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconnectExecutorRetry)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -971,7 +971,7 @@ TYPED_TEST(SlaveRecoveryTest, PingTimeoutDuringRecovery)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -1112,7 +1112,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_RecoverUnregisteredHTTPExecutor)
driver.start();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -1224,7 +1224,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverUnregisteredExecutor)
driver.start();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -1337,7 +1337,7 @@ TYPED_TEST(SlaveRecoveryTest, KillTaskUnregisteredExecutor)
driver.start();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -1447,7 +1447,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverTerminatedHTTPExecutor)
driver.start();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -1588,7 +1588,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverTerminatedExecutor)
driver.start();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -1719,7 +1719,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_RecoveryTimeout)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -1811,7 +1811,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverCompletedExecutor)
driver.start();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "exit 0");
@@ -1905,7 +1905,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_CleanupHTTPExecutor)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Launch a task with the HTTP based command executor.
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -2006,7 +2006,7 @@ TYPED_TEST(SlaveRecoveryTest, CleanupExecutor)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -2107,7 +2107,7 @@ TYPED_TEST(SlaveRecoveryTest, RemoveNonCheckpointingFramework)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Launch 2 tasks from this offer.
vector<TaskInfo> tasks;
@@ -2222,7 +2222,7 @@ TYPED_TEST(SlaveRecoveryTest, NonCheckpointingFramework)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -2320,7 +2320,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_KillTaskWithHTTPExecutor)
driver.start();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -2435,7 +2435,7 @@ TYPED_TEST(SlaveRecoveryTest, KillTask)
driver.start();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -2553,7 +2553,7 @@ TYPED_TEST(SlaveRecoveryTest, Reboot)
driver.start();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -2821,7 +2821,7 @@ TYPED_TEST(SlaveRecoveryTest, GCExecutor)
driver.start();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -2958,7 +2958,7 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlave)
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -3023,7 +3023,7 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlave)
// Ensure that the slave registered with a new id.
AWAIT_READY(offers3);
- EXPECT_NE(0u, offers3->size());
+ EXPECT_FALSE(offers3->empty());
// Make sure all slave resources are reoffered.
EXPECT_EQ(Resources(offers1.get()[0].resources()),
Resources(offers3.get()[0].resources()));
@@ -3076,7 +3076,7 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlaveSIGUSR1)
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -3301,7 +3301,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconcileKillTask)
driver.start();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -3402,7 +3402,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconcileShutdownFramework)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Capture the framework id.
FrameworkID frameworkId = offers.get()[0].framework_id();
@@ -3548,7 +3548,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconcileTasksMissingFromSlave)
driver.start();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
// Start a task on the slave so that the master has knowledge of it.
// We'll ensure the slave does not have this task when it
@@ -3713,7 +3713,7 @@ TYPED_TEST(SlaveRecoveryTest, SchedulerFailover)
AWAIT_READY(frameworkId);
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
// Create a long running task.
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -3865,7 +3865,7 @@ TYPED_TEST(SlaveRecoveryTest, MasterFailover)
AWAIT_READY(frameworkRegisteredMessage);
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -4000,7 +4000,7 @@ TYPED_TEST(SlaveRecoveryTest, MultipleFrameworks)
driver1.start();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
// Use part of the resources in the offer so that the rest can be
// offered to framework 2.
@@ -4039,7 +4039,7 @@ TYPED_TEST(SlaveRecoveryTest, MultipleFrameworks)
driver2.start();
AWAIT_READY(offers2);
- EXPECT_NE(0u, offers2->size());
+ EXPECT_FALSE(offers2->empty());
// Framework 2 launches a task.
TaskInfo task2 = createTask(offers2.get()[0], "sleep 1000");
@@ -4333,7 +4333,7 @@ TYPED_TEST(SlaveRecoveryTest, RestartBeforeContainerizerLaunch)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -4435,7 +4435,7 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, ResourceStatistics)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -4540,7 +4540,7 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceForward)
driver.start();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
SlaveID slaveId = offers1.get()[0].slave_id();
@@ -4580,7 +4580,7 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceForward)
ASSERT_SOME(slave);
AWAIT_READY(offers2);
- EXPECT_NE(0u, offers2->size());
+ EXPECT_FALSE(offers2->empty());
// Set up to wait on the container's termination.
Future<Option<ContainerTermination>> termination =
@@ -4644,7 +4644,7 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceBackward)
driver.start();
AWAIT_READY(offers1);
- EXPECT_NE(0u, offers1->size());
+ EXPECT_FALSE(offers1->empty());
SlaveID slaveId = offers1.get()[0].slave_id();
@@ -4685,7 +4685,7 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceBackward)
ASSERT_SOME(slave);
AWAIT_READY(offers2);
- EXPECT_NE(0u, offers2->size());
+ EXPECT_FALSE(offers2->empty());
// Set up to wait on the container's termination.
Future<Option<ContainerTermination>> termination =
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 8965915..b27b89c 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -244,7 +244,7 @@ TEST_F(SlaveTest, DuplicateTerminalUpdateBeforeAck)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
ExecutorDriver* execDriver;
EXPECT_CALL(exec, registered(_, _, _, _))
@@ -358,7 +358,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, ShutdownUnregisteredExecutor)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Launch a task with the command executor.
TaskInfo task;
@@ -474,7 +474,7 @@ TEST_F(SlaveTest, ExecutorTimeoutCausedBySlowFetch)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Launch a task with the command executor.
// The task uses a URI that needs to be fetched by the HDFS client
@@ -573,7 +573,7 @@ TEST_F(SlaveTest, RemoveUnregisteredTerminatedExecutor)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
@@ -659,7 +659,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, CommandTaskWithArguments)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Launch a task with the command executor.
TaskInfo task;
@@ -725,7 +725,7 @@ TEST_F(SlaveTest, CommandTaskWithKillPolicy)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
TaskInfo task;
@@ -1023,7 +1023,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Launch a task with the command executor.
TaskInfo task;
@@ -1127,7 +1127,7 @@ TEST_F(SlaveTest, DISABLED_ROOT_RunTaskWithCommandInfoWithUser)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// HACK: Launch a prepare task as root to prepare the binaries.
// This task creates the lt-mesos-executor binary in the build dir.
@@ -1179,7 +1179,7 @@ TEST_F(SlaveTest, DISABLED_ROOT_RunTaskWithCommandInfoWithUser)
.WillRepeatedly(Return()); // Ignore subsequent offers.
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Launch a task with the command executor.
TaskInfo task;
@@ -1255,7 +1255,7 @@ TEST_F(SlaveTest, IgnoreNonLeaderStatusUpdateAcknowledgement)
const UPID schedulerPid = frameworkRegisteredMessage->to;
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "", DEFAULT_EXECUTOR_ID);
@@ -1432,7 +1432,7 @@ TEST_F(SlaveTest, MetricsSlaveLaunchErrors)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const Offer offer = offers.get()[0];
// Verify that we start with no launch failures.
@@ -1612,7 +1612,7 @@ TEST_F(SlaveTest, StateEndpoint)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Resources executorResources = Resources::parse("cpus:0.1;mem:32").get();
executorResources.allocate("*");
@@ -2090,7 +2090,7 @@ TEST_F(SlaveTest, HTTPExecutorBadAuthentication)
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
Future<v1::executor::Mesos*> executorLib;
EXPECT_CALL(*executor, connected(_))
@@ -2262,7 +2262,7 @@ TEST_F(SlaveTest, StatisticsEndpointMissingStatistics)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -2544,7 +2544,7 @@ TEST_F(SlaveTest, ContainersEndpoint)
driver.start();
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
// Launch two tasks, each under a different executor.
vector<TaskInfo> tasks;
@@ -2931,7 +2931,7 @@ TEST_F(SlaveTest, TerminalTaskContainerizerUpdateFailsWithLost)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
// Start two tasks.
@@ -3044,7 +3044,7 @@ TEST_F(SlaveTest, TerminalTaskContainerizerUpdateFailsWithGone)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
// Start two tasks.
@@ -4011,7 +4011,7 @@ TEST_F(SlaveTest, KillTaskBetweenRunTaskParts)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
@@ -4122,7 +4122,7 @@ TEST_F(SlaveTest, KillTaskUnregisteredExecutor)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
@@ -4245,7 +4245,7 @@ TEST_F(SlaveTest, KillTaskUnregisteredHTTPExecutor)
executorInfo.mutable_framework_id()->CopyFrom(devolve(frameworkId));
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const SlaveID slaveId = devolve(offer.agent_id());
@@ -4473,7 +4473,7 @@ TEST_F(SlaveTest, ContainerizerUsageFailure)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -4551,7 +4551,7 @@ TEST_F(SlaveTest, DiscoveryInfoAndPorts)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(
offers.get()[0],
@@ -4660,7 +4660,7 @@ TEST_F(SlaveTest, ExecutorLabels)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
@@ -4752,7 +4752,7 @@ TEST_F(SlaveTest, TaskLabels)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
@@ -4856,7 +4856,7 @@ TEST_F(SlaveTest, TaskStatusLabels)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(
offers.get()[0],
@@ -4961,7 +4961,7 @@ TEST_F(SlaveTest, TaskStatusContainerStatus)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
TaskInfo task = createTask(
offers.get()[0],
@@ -5059,7 +5059,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, ExecutorEnvironmentVariables)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
// Launch a task with the command executor.
TaskInfo task;
@@ -5396,7 +5396,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, HTTPSchedulerSlaveRestart)
FUTURE_MESSAGE(Eq(RegisterExecutorMessage().GetTypeName()), _, _);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
SlaveID slaveId = offers.get()[0].slave_id();
@@ -5542,7 +5542,7 @@ TEST_F(SlaveTest, ExecutorShutdownGracePeriod)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
// Customize executor shutdown grace period to be larger than the
@@ -5708,7 +5708,7 @@ TEST_F(SlaveTest, RunTaskGroup)
executorInfo.mutable_framework_id()->CopyFrom(devolve(frameworkId));
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)));
@@ -5847,7 +5847,7 @@ TEST_F(SlaveTest, RunTaskGroupFailedSecretGeneration)
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
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();
@@ -6048,7 +6048,7 @@ TEST_F(SlaveTest, RunTaskGroupInvalidExecutorSecret)
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
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();
@@ -6258,7 +6258,7 @@ TEST_F(SlaveTest, RunTaskGroupReferenceTypeSecret)
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
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();
@@ -6468,7 +6468,7 @@ TEST_F(SlaveTest, RunTaskGroupGenerateSecretAfterShutdown)
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
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();
@@ -6690,7 +6690,7 @@ TEST_F(SlaveTest, RestartSlaveRequireExecutorAuthentication)
v1::FrameworkID frameworkId(subscribed->framework_id());
AWAIT_READY(offers);
- ASSERT_NE(0, offers->offers().size());
+ ASSERT_FALSE(offers->offers().empty());
Future<v1::scheduler::Event::Update> update;
@@ -6874,7 +6874,7 @@ TEST_F(SlaveTest, KillTaskGroupBetweenRunTaskParts)
executorInfo.mutable_framework_id()->CopyFrom(devolve(frameworkId));
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
EXPECT_CALL(*executor, connected(_))
.Times(0);
@@ -7072,7 +7072,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, DefaultExecutorCommandInfo)
executorInfo.mutable_framework_id()->CopyFrom(devolve(frameworkId));
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
Future<ContainerConfig> containerConfig;
EXPECT_CALL(containerizer, launch(_, _, _, _))
@@ -7187,7 +7187,7 @@ TEST_F(SlaveTest, KillQueuedTaskGroup)
executorInfo.mutable_framework_id()->CopyFrom(devolve(frameworkId));
AWAIT_READY(offers);
- EXPECT_NE(0, offers->offers().size());
+ EXPECT_FALSE(offers->offers().empty());
Future<v1::executor::Mesos*> executorLibrary;
EXPECT_CALL(*executor, connected(_))
@@ -7505,7 +7505,7 @@ TEST_F(SlaveTest, ShutdownV0ExecutorIfItReregistersWithoutReconnect)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
EXPECT_CALL(exec, registered(_, _, _, _));
@@ -7608,7 +7608,7 @@ TEST_F(SlaveTest, IgnoreV0ExecutorIfItReregistersWithoutReconnect)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
EXPECT_CALL(exec, registered(_, _, _, _));
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/state_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/state_tests.cpp b/src/tests/state_tests.cpp
index 7434473..5366b8b 100644
--- a/src/tests/state_tests.cpp
+++ b/src/tests/state_tests.cpp
@@ -95,7 +95,7 @@ void FetchAndStoreAndFetch(State* state)
Variable<Slaves> variable = future1.get();
Slaves slaves1 = variable.get();
- ASSERT_EQ(0, slaves1.slaves().size());
+ ASSERT_TRUE(slaves1.slaves().empty());
Slave* slave = slaves1.add_slaves();
slave->mutable_info()->set_hostname("localhost");
@@ -125,7 +125,7 @@ void FetchAndStoreAndStoreAndFetch(State* state)
Variable<Slaves> variable = future1.get();
Slaves slaves1 = variable.get();
- ASSERT_EQ(0, slaves1.slaves().size());
+ ASSERT_TRUE(slaves1.slaves().empty());
Slave* slave = slaves1.add_slaves();
slave->mutable_info()->set_hostname("localhost");
@@ -161,7 +161,7 @@ void FetchAndStoreAndStoreFailAndFetch(State* state)
Variable<Slaves> variable1 = future1.get();
Slaves slaves1 = variable1.get();
- ASSERT_EQ(0, slaves1.slaves().size());
+ ASSERT_TRUE(slaves1.slaves().empty());
Slave* slave1 = slaves1.add_slaves();
slave1->mutable_info()->set_hostname("localhost1");
@@ -173,7 +173,7 @@ void FetchAndStoreAndStoreFailAndFetch(State* state)
ASSERT_SOME(future2.get());
Slaves slaves2 = variable1.get();
- ASSERT_EQ(0, slaves2.slaves().size());
+ ASSERT_TRUE(slaves2.slaves().empty());
Slave* slave2 = slaves2.add_slaves();
slave2->mutable_info()->set_hostname("localhost2");
@@ -203,7 +203,7 @@ void FetchAndStoreAndExpungeAndFetch(State* state)
Variable<Slaves> variable = future1.get();
Slaves slaves1 = variable.get();
- ASSERT_EQ(0, slaves1.slaves().size());
+ ASSERT_TRUE(slaves1.slaves().empty());
Slave* slave = slaves1.add_slaves();
slave->mutable_info()->set_hostname("localhost");
@@ -226,7 +226,7 @@ void FetchAndStoreAndExpungeAndFetch(State* state)
variable = future1.get();
Slaves slaves2 = variable.get();
- ASSERT_EQ(0, slaves2.slaves().size());
+ ASSERT_TRUE(slaves2.slaves().empty());
}
@@ -238,7 +238,7 @@ void FetchAndStoreAndExpungeAndExpunge(State* state)
Variable<Slaves> variable = future1.get();
Slaves slaves1 = variable.get();
- ASSERT_EQ(0, slaves1.slaves().size());
+ ASSERT_TRUE(slaves1.slaves().empty());
Slave* slave = slaves1.add_slaves();
slave->mutable_info()->set_hostname("localhost");
@@ -269,7 +269,7 @@ void FetchAndStoreAndExpungeAndStoreAndFetch(State* state)
Variable<Slaves> variable = future1.get();
Slaves slaves1 = variable.get();
- ASSERT_EQ(0, slaves1.slaves().size());
+ ASSERT_TRUE(slaves1.slaves().empty());
Slave* slave = slaves1.add_slaves();
slave->mutable_info()->set_hostname("localhost");
@@ -309,7 +309,7 @@ void Names(State* state)
Variable<Slaves> variable = future1.get();
Slaves slaves1 = variable.get();
- ASSERT_EQ(0, slaves1.slaves().size());
+ ASSERT_TRUE(slaves1.slaves().empty());
Slave* slave = slaves1.add_slaves();
slave->mutable_info()->set_hostname("localhost");
@@ -588,7 +588,7 @@ TEST_F(LogStateTest, Timeout)
Variable<Slaves> variable = future1.get();
Slaves slaves1 = variable.get();
- ASSERT_EQ(0, slaves1.slaves().size());
+ ASSERT_TRUE(slaves1.slaves().empty());
Slave* slave = slaves1.add_slaves();
slave->mutable_info()->set_hostname("localhost");
@@ -624,7 +624,7 @@ TEST_F(LogStateTest, Diff)
Variable<Slaves> variable = future1.get();
Slaves slaves = variable.get();
- ASSERT_EQ(0, slaves.slaves().size());
+ ASSERT_TRUE(slaves.slaves().empty());
for (size_t i = 0; i < 1024; i++) {
Slave* slave = slaves.add_slaves();
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/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 710723c..6922ee3 100644
--- a/src/tests/status_update_manager_tests.cpp
+++ b/src/tests/status_update_manager_tests.cpp
@@ -126,7 +126,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(StatusUpdateManagerTest, CheckpointStatusUpdate)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
EXPECT_CALL(exec, registered(_, _, _, _));
@@ -215,7 +215,7 @@ TEST_F(StatusUpdateManagerTest, RetryStatusUpdate)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
EXPECT_CALL(exec, registered(_, _, _, _));
@@ -286,7 +286,7 @@ TEST_F(StatusUpdateManagerTest, IgnoreDuplicateStatusUpdateAck)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
ExecutorDriver* execDriver;
EXPECT_CALL(exec, registered(_, _, _, _))
@@ -402,7 +402,7 @@ TEST_F(StatusUpdateManagerTest, IgnoreUnexpectedStatusUpdateAck)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
ExecutorDriver* execDriver;
EXPECT_CALL(exec, registered(_, _, _, _))
@@ -492,7 +492,7 @@ TEST_F(StatusUpdateManagerTest, DuplicateTerminalUpdateAfterAck)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
ExecutorDriver* execDriver;
EXPECT_CALL(exec, registered(_, _, _, _))
@@ -587,7 +587,7 @@ TEST_F(StatusUpdateManagerTest, DuplicateUpdateBeforeAck)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
ExecutorDriver* execDriver;
EXPECT_CALL(exec, registered(_, _, _, _))
@@ -772,7 +772,7 @@ TEST_F(StatusUpdateManagerTest, DuplicatedTerminalStatusUpdate)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ EXPECT_FALSE(offers->empty());
ExecutorDriver* execDriver;
EXPECT_CALL(exec, registered(_, _, _, _))
http://git-wip-us.apache.org/repos/asf/mesos/blob/65278909/src/tests/upgrade_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/upgrade_tests.cpp b/src/tests/upgrade_tests.cpp
index 7c900b1..7f434db 100644
--- a/src/tests/upgrade_tests.cpp
+++ b/src/tests/upgrade_tests.cpp
@@ -427,7 +427,7 @@ TEST_F(UpgradeTest, MultiRoleSchedulerUpgrade)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
[3/4] mesos git commit: Libprocess: Improved the readability of some
assertions/expectations.
Posted by gr...@apache.org.
Libprocess: 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/61564/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2e95dcb3
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2e95dcb3
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2e95dcb3
Branch: refs/heads/master
Commit: 2e95dcb3d0791905b668b8785dc8b9c7a7e456d2
Parents: 6527890
Author: Gastón Kleiman <ga...@mesosphere.io>
Authored: Fri Aug 11 17:02:23 2017 -0700
Committer: Greg Mann <gr...@gmail.com>
Committed: Fri Aug 11 17:02:23 2017 -0700
----------------------------------------------------------------------
3rdparty/libprocess/src/tests/decoder_tests.cpp | 2 +-
3rdparty/libprocess/src/tests/subprocess_tests.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/2e95dcb3/3rdparty/libprocess/src/tests/decoder_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/decoder_tests.cpp b/3rdparty/libprocess/src/tests/decoder_tests.cpp
index 5742c83..8f19aef 100644
--- a/3rdparty/libprocess/src/tests/decoder_tests.cpp
+++ b/3rdparty/libprocess/src/tests/decoder_tests.cpp
@@ -189,7 +189,7 @@ TEST(DecoderTest, ResponseWithUnspecifiedLength)
deque<http::Response*> responses = decoder.decode(data.data(), data.length());
ASSERT_FALSE(decoder.failed());
- ASSERT_EQ(0u, responses.size());
+ ASSERT_TRUE(responses.empty());
responses = decoder.decode("", 0);
ASSERT_FALSE(decoder.failed());
http://git-wip-us.apache.org/repos/asf/mesos/blob/2e95dcb3/3rdparty/libprocess/src/tests/subprocess_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/subprocess_tests.cpp b/3rdparty/libprocess/src/tests/subprocess_tests.cpp
index d71fa4b..8211ae6 100644
--- a/3rdparty/libprocess/src/tests/subprocess_tests.cpp
+++ b/3rdparty/libprocess/src/tests/subprocess_tests.cpp
@@ -717,7 +717,7 @@ TEST_F(SubprocessTest, Flags)
Flags flags2;
Try<flags::Warnings> load = flags2.load(None(), argc, argv);
ASSERT_SOME(load);
- EXPECT_EQ(0u, load->warnings.size());
+ EXPECT_TRUE(load->warnings.empty());
EXPECT_EQ(flags.b, flags2.b);
EXPECT_EQ(flags.i, flags2.i);
[4/4] mesos git commit: Stout: Improved the readability of some
assertions/expectations.
Posted by gr...@apache.org.
Stout: 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/61565/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/628d6609
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/628d6609
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/628d6609
Branch: refs/heads/master
Commit: 628d6609b6eeb90767e5799d0177bfe4828d71aa
Parents: 2e95dcb
Author: Gastón Kleiman <ga...@mesosphere.io>
Authored: Fri Aug 11 17:02:24 2017 -0700
Committer: Greg Mann <gr...@gmail.com>
Committed: Fri Aug 11 17:02:24 2017 -0700
----------------------------------------------------------------------
3rdparty/stout/tests/flags_tests.cpp | 16 ++++++++--------
3rdparty/stout/tests/multimap_tests.cpp | 8 ++++----
3rdparty/stout/tests/os/filesystem_tests.cpp | 2 +-
3rdparty/stout/tests/os/process_tests.cpp | 4 ++--
3rdparty/stout/tests/os_tests.cpp | 2 +-
3rdparty/stout/tests/proc_tests.cpp | 2 +-
3rdparty/stout/tests/strings_tests.cpp | 10 +++++-----
7 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/628d6609/3rdparty/stout/tests/flags_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/flags_tests.cpp b/3rdparty/stout/tests/flags_tests.cpp
index d78ab55..88c8ee5 100644
--- a/3rdparty/stout/tests/flags_tests.cpp
+++ b/3rdparty/stout/tests/flags_tests.cpp
@@ -241,7 +241,7 @@ TEST_TEMP_DISABLED_ON_WINDOWS(FlagsTest, LoadFromEnvironment)
Try<Warnings> load = flags.load("FLAGSTEST_");
EXPECT_SOME(load);
- EXPECT_EQ(0u, load->warnings.size());
+ EXPECT_TRUE(load->warnings.empty());
EXPECT_EQ("billy joel", flags.name1);
EXPECT_EQ(43, flags.name2);
@@ -274,7 +274,7 @@ TEST(FlagsTest, LoadFromCommandLine)
Try<Warnings> load = flags.load("FLAGSTEST_", arraySize(argv), argv);
EXPECT_SOME(load);
- EXPECT_EQ(0u, load->warnings.size());
+ EXPECT_TRUE(load->warnings.empty());
EXPECT_EQ("billy joel", flags.name1);
EXPECT_EQ(43, flags.name2);
@@ -306,7 +306,7 @@ TEST(FlagsTest, LoadFromCommandLineWithNonFlags)
Try<Warnings> load = flags.load("FLAGSTEST_", arraySize(argv), argv);
EXPECT_SOME(load);
- EXPECT_EQ(0u, load->warnings.size());
+ EXPECT_TRUE(load->warnings.empty());
EXPECT_EQ("billy joel", flags.name1);
EXPECT_EQ(43, flags.name2);
@@ -338,7 +338,7 @@ TEST(FlagsTest, LoadFromCommandLineWithDashDash)
Try<Warnings> load = flags.load("FLAGSTEST_", arraySize(argv), argv);
EXPECT_SOME(load);
- EXPECT_EQ(0u, load->warnings.size());
+ EXPECT_TRUE(load->warnings.empty());
EXPECT_EQ("billy joel", flags.name1);
EXPECT_EQ(43, flags.name2);
@@ -373,7 +373,7 @@ TEST(FlagsTest, LoadFromCommandLineAndUpdateArgcArgv)
Try<Warnings> load = flags.load("FLAGSTEST_", &argc, &_argv);
EXPECT_SOME(load);
- EXPECT_EQ(0u, load->warnings.size());
+ EXPECT_TRUE(load->warnings.empty());
EXPECT_EQ("billy joel", flags.name1);
EXPECT_EQ(43, flags.name2);
@@ -541,7 +541,7 @@ TEST_TEMP_DISABLED_ON_WINDOWS(FlagsTest, DuplicatesFromEnvironment)
// `load(prefix, argc, argv)`.
Try<Warnings> load = flags.load("FLAGSTEST_", arraySize(argv), argv);
EXPECT_SOME(load);
- EXPECT_EQ(0u, load->warnings.size());
+ EXPECT_TRUE(load->warnings.empty());
// The environment variables are overwritten by command line flags.
EXPECT_EQ(flags.name1, "billy joel");
@@ -555,7 +555,7 @@ TEST_TEMP_DISABLED_ON_WINDOWS(FlagsTest, DuplicatesFromEnvironment)
// `load(map<string, string>, unknowns, prefix)`.
load = flags.load(values, false, "FLAGSTEST_");
EXPECT_SOME(load);
- EXPECT_EQ(0u, load->warnings.size());
+ EXPECT_TRUE(load->warnings.empty());
EXPECT_EQ(flags.name1, "billy joel");
EXPECT_EQ(flags.name2, 50);
@@ -571,7 +571,7 @@ TEST_TEMP_DISABLED_ON_WINDOWS(FlagsTest, DuplicatesFromEnvironment)
load = flags.load(values, false, "FLAGSTEST_");
EXPECT_SOME(load);
- EXPECT_EQ(0u, load->warnings.size());
+ EXPECT_TRUE(load->warnings.empty());
EXPECT_EQ(flags.name1, "billy joel");
EXPECT_EQ(flags.name2, 51);
http://git-wip-us.apache.org/repos/asf/mesos/blob/628d6609/3rdparty/stout/tests/multimap_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/multimap_tests.cpp b/3rdparty/stout/tests/multimap_tests.cpp
index 36860e4..f0c49f5 100644
--- a/3rdparty/stout/tests/multimap_tests.cpp
+++ b/3rdparty/stout/tests/multimap_tests.cpp
@@ -120,9 +120,9 @@ TYPED_TEST(MultimapTest, Remove)
map.put("foo", 1024);
map.remove("foo", 1024);
- ASSERT_EQ(0u, map.get("foo").size());
+ ASSERT_TRUE(map.get("foo").empty());
- ASSERT_EQ(0u, map.size());
+ ASSERT_TRUE(map.empty());
map.put("foo", 1024);
map.put("foo", 1025);
@@ -131,8 +131,8 @@ TYPED_TEST(MultimapTest, Remove)
ASSERT_EQ(2u, map.size());
map.remove("foo");
- ASSERT_EQ(0u, map.get("foo").size());
- ASSERT_EQ(0u, map.size());
+ ASSERT_TRUE(map.get("foo").empty());
+ ASSERT_TRUE(map.empty());
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/628d6609/3rdparty/stout/tests/os/filesystem_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/os/filesystem_tests.cpp b/3rdparty/stout/tests/os/filesystem_tests.cpp
index 841f655..0982fd5 100644
--- a/3rdparty/stout/tests/os/filesystem_tests.cpp
+++ b/3rdparty/stout/tests/os/filesystem_tests.cpp
@@ -315,7 +315,7 @@ TEST_F(FsTest, List)
// Verify that we return empty list when we provide an invalid path.
Try<list<string>> noFiles = fs::list("this_path_does_not_exist");
ASSERT_SOME(noFiles);
- EXPECT_EQ(0u, noFiles.get().size());
+ EXPECT_TRUE(noFiles->empty());
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/628d6609/3rdparty/stout/tests/os/process_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/os/process_tests.cpp b/3rdparty/stout/tests/os/process_tests.cpp
index 4b5c257..963eb4e 100644
--- a/3rdparty/stout/tests/os/process_tests.cpp
+++ b/3rdparty/stout/tests/os/process_tests.cpp
@@ -166,7 +166,7 @@ TEST_F(ProcessTest, Pids)
{
Try<set<pid_t>> pids = os::pids();
ASSERT_SOME(pids);
- EXPECT_NE(0u, pids.get().size());
+ EXPECT_FALSE(pids->empty());
EXPECT_EQ(1u, pids.get().count(getpid()));
// In a FreeBSD jail, pid 1 may not exist.
@@ -242,7 +242,7 @@ TEST_F(ProcessTest, Pstree)
Try<ProcessTree> tree = os::pstree(getpid());
ASSERT_SOME(tree);
- EXPECT_EQ(0u, tree.get().children.size()) << stringify(tree.get());
+ EXPECT_TRUE(tree->children.empty()) << stringify(tree.get());
tree =
Fork(None(), // Child.
http://git-wip-us.apache.org/repos/asf/mesos/blob/628d6609/3rdparty/stout/tests/os_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/os_tests.cpp b/3rdparty/stout/tests/os_tests.cpp
index e8ecece..959b02d 100644
--- a/3rdparty/stout/tests/os_tests.cpp
+++ b/3rdparty/stout/tests/os_tests.cpp
@@ -344,7 +344,7 @@ TEST_F(OsTest, Children)
Try<set<pid_t>> children = os::children(getpid());
ASSERT_SOME(children);
- EXPECT_EQ(0u, children.get().size());
+ EXPECT_TRUE(children->empty());
Try<ProcessTree> tree =
Fork(None(), // Child.
http://git-wip-us.apache.org/repos/asf/mesos/blob/628d6609/3rdparty/stout/tests/proc_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/proc_tests.cpp b/3rdparty/stout/tests/proc_tests.cpp
index c6d1d44..b0e3720 100644
--- a/3rdparty/stout/tests/proc_tests.cpp
+++ b/3rdparty/stout/tests/proc_tests.cpp
@@ -43,7 +43,7 @@ TEST(ProcTest, Pids)
Try<set<pid_t>> pids = proc::pids();
ASSERT_SOME(pids);
- EXPECT_NE(0u, pids.get().size());
+ EXPECT_FALSE(pids->empty());
EXPECT_EQ(1u, pids.get().count(getpid()));
EXPECT_EQ(1u, pids.get().count(1));
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/628d6609/3rdparty/stout/tests/strings_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/strings_tests.cpp b/3rdparty/stout/tests/strings_tests.cpp
index a51144d..395540a 100644
--- a/3rdparty/stout/tests/strings_tests.cpp
+++ b/3rdparty/stout/tests/strings_tests.cpp
@@ -153,14 +153,14 @@ TEST(StringsTest, TokenizeWithMultipleDelims)
TEST(StringsTest, TokenizeEmptyString)
{
vector<string> tokens = strings::tokenize("", " ");
- ASSERT_EQ(0u, tokens.size());
+ ASSERT_TRUE(tokens.empty());
}
TEST(StringsTest, TokenizeDelimOnlyString)
{
vector<string> tokens = strings::tokenize(" ", " ");
- ASSERT_EQ(0u, tokens.size());
+ ASSERT_TRUE(tokens.empty());
}
@@ -201,7 +201,7 @@ TEST(StringsTest, TokenizeNullByteDelim)
TEST(StringsTest, TokenizeNZero)
{
vector<string> tokens = strings::tokenize("foo,bar,,,", ",", 0);
- ASSERT_EQ(0u, tokens.size());
+ ASSERT_TRUE(tokens.empty());
}
@@ -216,7 +216,7 @@ TEST(StringsTest, TokenizeNOne)
TEST(StringsTest, TokenizeNDelimOnlyString)
{
vector<string> tokens = strings::tokenize(",,,", ",", 2);
- ASSERT_EQ(0u, tokens.size());
+ ASSERT_TRUE(tokens.empty());
}
@@ -354,7 +354,7 @@ TEST(StringsTest, SplitWithMultipleDelims)
TEST(StringsTest, SplitNZero)
{
vector<string> tokens = strings::split("foo,bar,,,", ",", 0);
- ASSERT_EQ(0u, tokens.size());
+ ASSERT_TRUE(tokens.empty());
}
[2/4] mesos git commit: Improved the readability of some
assertions/expectations.
Posted by gr...@apache.org.
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)));