Fix some test assertions for floats. Review: https://reviews.apache.org/r/39634/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/99c4f3ad Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/99c4f3ad Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/99c4f3ad Branch: refs/heads/master Commit: 99c4f3adc4bbdf43b8e0f882478225fead1aeff4 Parents: 6196fb4 Author: David Forsythe <[email protected]> Authored: Mon Dec 14 09:34:30 2015 -0800 Committer: Ian Downes <[email protected]> Committed: Mon Dec 14 09:47:59 2015 -0800 ---------------------------------------------------------------------- src/tests/attributes_tests.cpp | 2 +- src/tests/resources_tests.cpp | 8 +++++--- src/tests/values_tests.cpp | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/99c4f3ad/src/tests/attributes_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/attributes_tests.cpp b/src/tests/attributes_tests.cpp index d8c84d2..3f3dde1 100644 --- a/src/tests/attributes_tests.cpp +++ b/src/tests/attributes_tests.cpp @@ -35,7 +35,7 @@ TEST(AttributesTest, Parsing) "rack:rack1,rack2"); ASSERT_EQ(Value::SCALAR, a.get(0).type()); ASSERT_EQ("cpus", a.get(0).name()); - ASSERT_EQ(45.55, a.get(0).scalar().value()); + ASSERT_FLOAT_EQ(45.55, a.get(0).scalar().value()); ASSERT_EQ(Value::RANGES, a.get(1).type()); ASSERT_EQ("ports", a.get(1).name()); http://git-wip-us.apache.org/repos/asf/mesos/blob/99c4f3ad/src/tests/resources_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/resources_tests.cpp b/src/tests/resources_tests.cpp index ce47bac..e4a3435 100644 --- a/src/tests/resources_tests.cpp +++ b/src/tests/resources_tests.cpp @@ -49,7 +49,7 @@ TEST(ResourcesTest, Parsing) Resource cpus = Resources::parse("cpus", "45.55", "*").get(); ASSERT_EQ(Value::SCALAR, cpus.type()); - EXPECT_EQ(45.55, cpus.scalar().value()); + EXPECT_FLOAT_EQ(45.55, cpus.scalar().value()); Resource ports = Resources::parse( "ports", "[10000-20000, 30000-50000]", "*").get(); @@ -737,7 +737,8 @@ TEST(ResourcesTest, Resources) Resources r = Resources::parse( "cpus:45.55;mem:1024;ports:[10000-20000, 30000-50000];disk:512").get(); - EXPECT_SOME_EQ(45.55, r.cpus()); + EXPECT_SOME(r.cpus()); + EXPECT_FLOAT_EQ(45.55, r.cpus().get()); EXPECT_SOME_EQ(Megabytes(1024), r.mem()); EXPECT_SOME_EQ(Megabytes(512), r.disk()); @@ -750,7 +751,8 @@ TEST(ResourcesTest, Resources) r = Resources::parse("cpus:45.55;disk:512").get(); - EXPECT_SOME_EQ(45.55, r.cpus()); + EXPECT_SOME(r.cpus()); + EXPECT_FLOAT_EQ(45.55, r.cpus().get()); EXPECT_SOME_EQ(Megabytes(512), r.disk()); EXPECT_TRUE(r.mem().isNone()); EXPECT_TRUE(r.ports().isNone()); http://git-wip-us.apache.org/repos/asf/mesos/blob/99c4f3ad/src/tests/values_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/values_tests.cpp b/src/tests/values_tests.cpp index fb7f982..a4eb68a 100644 --- a/src/tests/values_tests.cpp +++ b/src/tests/values_tests.cpp @@ -45,7 +45,7 @@ TEST(ValuesTest, ValidInput) Try<Value> result1 = parse("45.55"); ASSERT_SOME(result1); ASSERT_EQ(Value::SCALAR, result1.get().type()); - EXPECT_EQ(45.55, result1.get().scalar().value()); + EXPECT_FLOAT_EQ(45.55, result1.get().scalar().value()); // Test parsing ranges type. Try<Value> result2 = parse("[10000-20000, 30000-50000]");
