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("");
