You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2016/02/28 01:27:42 UTC
[2/2] mesos git commit: Cleaned up assertions in test cases.
Cleaned up assertions in test cases.
Ensure that `EXPECT_EQ` and friends use "expected, actual" as the
order of arguments.
Review: https://reviews.apache.org/r/44113/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/dd903d0d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/dd903d0d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/dd903d0d
Branch: refs/heads/master
Commit: dd903d0d9bb9e8d1a6ee81c1fedb755f112b0613
Parents: 970036a
Author: Neil Conway <ne...@gmail.com>
Authored: Sat Feb 27 16:06:41 2016 -0800
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Sat Feb 27 16:27:22 2016 -0800
----------------------------------------------------------------------
src/tests/containerizer/docker_spec_tests.cpp | 42 ++++++++++----------
src/tests/containerizer/docker_tests.cpp | 6 +--
src/tests/containerizer/fs_tests.cpp | 2 +-
.../containerizer/provisioner_backend_tests.cpp | 6 +--
src/tests/module_tests.cpp | 20 +++++-----
src/tests/resources_tests.cpp | 18 ++++-----
src/tests/sorter_tests.cpp | 4 +-
7 files changed, 50 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/dd903d0d/src/tests/containerizer/docker_spec_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_spec_tests.cpp b/src/tests/containerizer/docker_spec_tests.cpp
index 5799dc9..a0de305 100644
--- a/src/tests/containerizer/docker_spec_tests.cpp
+++ b/src/tests/containerizer/docker_spec_tests.cpp
@@ -272,41 +272,43 @@ TEST_F(DockerSpecTest, ParseV2ImageManifest)
Try<spec::v2::ImageManifest> manifest = spec::v2::parse(json.get());
ASSERT_SOME(manifest);
- EXPECT_EQ(manifest.get().name(), "dmcgowan/test-image");
- EXPECT_EQ(manifest.get().tag(), "latest");
- EXPECT_EQ(manifest.get().architecture(), "amd64");
+ EXPECT_EQ("dmcgowan/test-image", manifest.get().name());
+ EXPECT_EQ("latest", manifest.get().tag());
+ EXPECT_EQ("amd64", manifest.get().architecture());
EXPECT_EQ(
- manifest.get().fslayers(0).blobsum(),
- "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"); // NOLINT(whitespace/line_length)
+ "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", // NOLINT(whitespace/line_length)
+ manifest.get().fslayers(0).blobsum());
EXPECT_EQ(
- manifest.get().fslayers(1).blobsum(),
- "sha256:cea0d2071b01b0a79aa4a05ea56ab6fdf3fafa03369d9f4eea8d46ea33c43e5f"); // NOLINT(whitespace/line_length)
+ "sha256:cea0d2071b01b0a79aa4a05ea56ab6fdf3fafa03369d9f4eea8d46ea33c43e5f", // NOLINT(whitespace/line_length)
+ manifest.get().fslayers(1).blobsum());
EXPECT_EQ(
- manifest.get().fslayers(2).blobsum(),
- "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"); // NOLINT(whitespace/line_length)
+ "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", // NOLINT(whitespace/line_length)
+ manifest.get().fslayers(2).blobsum());
EXPECT_EQ(
- manifest.get().fslayers(3).blobsum(),
- "sha256:2a7812e636235448785062100bb9103096aa6655a8f6bb9ac9b13fe8290f66df"); // NOLINT(whitespace/line_length)
+ "sha256:2a7812e636235448785062100bb9103096aa6655a8f6bb9ac9b13fe8290f66df", // NOLINT(whitespace/line_length)
+ manifest.get().fslayers(3).blobsum());
- EXPECT_EQ(manifest.get().history(1).v1().id(),
- "2ce2e90b0bc7224de3db1f0d646fe8e2c4dd37f1793928287f6074bc451a57ea");
+ EXPECT_EQ(
+ "2ce2e90b0bc7224de3db1f0d646fe8e2c4dd37f1793928287f6074bc451a57ea",
+ manifest.get().history(1).v1().id());
- EXPECT_EQ(manifest.get().history(2).v1().parent(),
- "cf2616975b4a3cba083ca99bc3f0bf25f5f528c3c52be1596b30f60b0b1c37ff");
+ EXPECT_EQ(
+ "cf2616975b4a3cba083ca99bc3f0bf25f5f528c3c52be1596b30f60b0b1c37ff",
+ manifest.get().history(2).v1().parent());
- EXPECT_EQ(manifest.get().schemaversion(), 1u);
+ EXPECT_EQ(1u, manifest.get().schemaversion());
EXPECT_EQ(
- manifest.get().signatures(0).header().jwk().kid(),
- "LYRA:YAG2:QQKS:376F:QQXY:3UNK:SXH7:K6ES:Y5AU:XUN5:ZLVY:KBYL");
+ "LYRA:YAG2:QQKS:376F:QQXY:3UNK:SXH7:K6ES:Y5AU:XUN5:ZLVY:KBYL",
+ manifest.get().signatures(0).header().jwk().kid());
EXPECT_EQ(
- manifest.get().signatures(0).signature(),
- "m3bgdBXZYRQ4ssAbrgj8Kjl7GNgrKQvmCSY-00yzQosKi-8UBrIRrn3Iu5alj82B6u_jNrkGCjEx3TxrfT1rig"); // NOLINT(whitespace/line_length)
+ "m3bgdBXZYRQ4ssAbrgj8Kjl7GNgrKQvmCSY-00yzQosKi-8UBrIRrn3Iu5alj82B6u_jNrkGCjEx3TxrfT1rig", // NOLINT(whitespace/line_length)
+ manifest.get().signatures(0).signature());
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/dd903d0d/src/tests/containerizer/docker_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_tests.cpp b/src/tests/containerizer/docker_tests.cpp
index 6208193..7ef52ad 100644
--- a/src/tests/containerizer/docker_tests.cpp
+++ b/src/tests/containerizer/docker_tests.cpp
@@ -235,7 +235,7 @@ TEST_F(DockerTest, ROOT_DOCKER_parsing_version)
Future<Version> version1 = docker1->version();
AWAIT_READY(version1);
- EXPECT_EQ(version1.get(), Version::parse("1.7.1").get());
+ EXPECT_EQ(Version::parse("1.7.1").get(), version1.get());
Owned<Docker> docker2 = Docker::create(
"echo Docker version 1.7.1.fc22, build",
@@ -244,7 +244,7 @@ TEST_F(DockerTest, ROOT_DOCKER_parsing_version)
Future<Version> version2 = docker2->version();
AWAIT_READY(version2);
- EXPECT_EQ(version2.get(), Version::parse("1.7.1").get());
+ EXPECT_EQ(Version::parse("1.7.1").get(), version2.get());
Owned<Docker> docker3 = Docker::create(
"echo Docker version 1.7.1-fc22, build",
@@ -253,7 +253,7 @@ TEST_F(DockerTest, ROOT_DOCKER_parsing_version)
Future<Version> version3 = docker3->version();
AWAIT_READY(version3);
- EXPECT_EQ(version3.get(), Version::parse("1.7.1").get());
+ EXPECT_EQ(Version::parse("1.7.1").get(), version3.get());
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/dd903d0d/src/tests/containerizer/fs_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/fs_tests.cpp b/src/tests/containerizer/fs_tests.cpp
index 29e4387..2d9395a 100644
--- a/src/tests/containerizer/fs_tests.cpp
+++ b/src/tests/containerizer/fs_tests.cpp
@@ -60,7 +60,7 @@ TEST_F(FsTest, MountTableRead)
EXPECT_SOME(root);
ASSERT_SOME(proc);
- EXPECT_EQ(proc.get().type, "proc");
+ EXPECT_EQ("proc", proc.get().type);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/dd903d0d/src/tests/containerizer/provisioner_backend_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/provisioner_backend_tests.cpp b/src/tests/containerizer/provisioner_backend_tests.cpp
index 25b28ef..73728f2 100644
--- a/src/tests/containerizer/provisioner_backend_tests.cpp
+++ b/src/tests/containerizer/provisioner_backend_tests.cpp
@@ -128,19 +128,19 @@ TEST_F(CopyBackendTest, ROOT_CopyBackend)
EXPECT_TRUE(os::exists(path::join(rootfs, "dir1", "1")));
Try<string> read = os::read(path::join(rootfs, "dir1", "1"));
ASSERT_SOME(read);
- EXPECT_EQ(read.get(), "1");
+ EXPECT_EQ("1", read.get());
EXPECT_TRUE(os::exists(path::join(rootfs, "dir2", "2")));
read = os::read(path::join(rootfs, "dir2", "2"));
ASSERT_SOME(read);
- EXPECT_EQ(read.get(), "2");
+ EXPECT_EQ("2", read.get());
EXPECT_TRUE(os::exists(path::join(rootfs, "file")));
read = os::read(path::join(rootfs, "file"));
ASSERT_SOME(read);
// Last layer should overwrite existing file.
- EXPECT_EQ(read.get(), "test2");
+ EXPECT_EQ("test2", read.get());
AWAIT_READY(backends["copy"]->destroy(rootfs));
http://git-wip-us.apache.org/repos/asf/mesos/blob/dd903d0d/src/tests/module_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/module_tests.cpp b/src/tests/module_tests.cpp
index 121d653..497ed87 100644
--- a/src/tests/module_tests.cpp
+++ b/src/tests/module_tests.cpp
@@ -188,9 +188,9 @@ TEST_F(ModuleTest, ExampleModuleLoadTest)
// the sum of the passed arguments, whereas bar() returns the
// product. baz() returns '-1' if "sum" is not specified as the
// "operation" in the command line parameters.
- EXPECT_EQ(module.get()->foo('A', 1024), 1089);
- EXPECT_EQ(module.get()->bar(0.5, 10.8), 5);
- EXPECT_EQ(module.get()->baz(5, 10), -1);
+ EXPECT_EQ(1089, module.get()->foo('A', 1024));
+ EXPECT_EQ(5, module.get()->bar(0.5, 10.8));
+ EXPECT_EQ(-1, module.get()->baz(5, 10));
}
@@ -238,7 +238,7 @@ TEST_F(ModuleTest, ParameterWithoutKey)
EXPECT_SOME(module);
// Since there was no valid key, baz() should return -1.
- EXPECT_EQ(module.get()->baz(5, 10), -1);
+ EXPECT_EQ(-1, module.get()->baz(5, 10));
}
@@ -256,7 +256,7 @@ TEST_F(ModuleTest, ParameterWithInvalidKey)
EXPECT_SOME(module);
// Since there was no valid key, baz() should return -1.
- EXPECT_EQ(module.get()->baz(5, 10), -1);
+ EXPECT_EQ(-1, module.get()->baz(5, 10));
}
@@ -273,7 +273,7 @@ TEST_F(ModuleTest, ValidParameters)
module = ModuleManager::create<TestModule>(DEFAULT_MODULE_NAME);
EXPECT_SOME(module);
- EXPECT_EQ(module.get()->baz(5, 10), 15);
+ EXPECT_EQ(15, module.get()->baz(5, 10));
}
@@ -318,7 +318,7 @@ TEST_F(ModuleTest, JsonParseTest)
module = ModuleManager::create<TestModule>(DEFAULT_MODULE_NAME);
EXPECT_SOME(module);
- EXPECT_EQ(module.get()->baz(5, 10), 15);
+ EXPECT_EQ(15, module.get()->baz(5, 10));
}
@@ -367,9 +367,9 @@ TEST_F(ModuleTest, ModuleKindMismatch)
// Test for correct author name, author email and library description.
TEST_F(ModuleTest, AuthorInfoTest)
{
- EXPECT_STREQ(moduleBase->authorName, "Apache Mesos");
- EXPECT_STREQ(moduleBase->authorEmail, "modules@mesos.apache.org");
- EXPECT_STREQ(moduleBase->description, "This is a test module.");
+ EXPECT_STREQ("Apache Mesos", moduleBase->authorName);
+ EXPECT_STREQ("modules@mesos.apache.org", moduleBase->authorEmail);
+ EXPECT_STREQ("This is a test module.", moduleBase->description);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/dd903d0d/src/tests/resources_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/resources_tests.cpp b/src/tests/resources_tests.cpp
index 7642740..a545100 100644
--- a/src/tests/resources_tests.cpp
+++ b/src/tests/resources_tests.cpp
@@ -793,19 +793,19 @@ TEST(ResourcesTest, PrintingExtendedAttributes)
// Standard resource.
ostringstream stream;
stream << disk;
- EXPECT_EQ(stream.str(), "disk(*):1");
+ EXPECT_EQ("disk(*):1", stream.str());
// Standard resource with role (statically reserved).
stream.str("");
disk.set_role("alice");
stream << disk;
- EXPECT_EQ(stream.str(), "disk(alice):1");
+ EXPECT_EQ("disk(alice):1", stream.str());
// Standard revocable resource.
stream.str("");
disk.mutable_revocable();
stream << disk;
- EXPECT_EQ(stream.str(), "disk(alice){REV}:1");
+ EXPECT_EQ("disk(alice){REV}:1", stream.str());
disk.clear_revocable();
// Disk resource with persistent volume.
@@ -813,13 +813,13 @@ TEST(ResourcesTest, PrintingExtendedAttributes)
disk.mutable_disk()->mutable_persistence()->set_id("hadoop");
disk.mutable_disk()->mutable_volume()->set_container_path("/data");
stream << disk;
- EXPECT_EQ(stream.str(), "disk(alice)[hadoop:/data]:1");
+ EXPECT_EQ("disk(alice)[hadoop:/data]:1", stream.str());
// Ensure {REV} comes after [disk].
stream.str("");
disk.mutable_revocable();
stream << disk;
- EXPECT_EQ(stream.str(), "disk(alice)[hadoop:/data]{REV}:1");
+ EXPECT_EQ("disk(alice)[hadoop:/data]{REV}:1", stream.str());
disk.clear_revocable();
// Disk resource with host path.
@@ -827,13 +827,13 @@ TEST(ResourcesTest, PrintingExtendedAttributes)
disk.mutable_disk()->mutable_volume()->set_host_path("/hdfs");
disk.mutable_disk()->mutable_volume()->set_mode(Volume::RW);
stream << disk;
- EXPECT_EQ(stream.str(), "disk(alice)[hadoop:/hdfs:/data:rw]:1");
+ EXPECT_EQ("disk(alice)[hadoop:/hdfs:/data:rw]:1", stream.str());
// Disk resource with host path and dynamic reservation without labels.
stream.str("");
disk.mutable_reservation()->set_principal("hdfs-p");
stream << disk;
- EXPECT_EQ(stream.str(), "disk(alice, hdfs-p)[hadoop:/hdfs:/data:rw]:1");
+ EXPECT_EQ("disk(alice, hdfs-p)[hadoop:/hdfs:/data:rw]:1", stream.str());
// Disk resource with host path and dynamic reservation with labels.
stream.str("");
@@ -841,8 +841,8 @@ TEST(ResourcesTest, PrintingExtendedAttributes)
labels->add_labels()->CopyFrom(createLabel("foo", "bar"));
labels->add_labels()->CopyFrom(createLabel("foo"));
stream << disk;
- EXPECT_EQ(stream.str(),
- "disk(alice, hdfs-p, {foo: bar, foo})[hadoop:/hdfs:/data:rw]:1");
+ EXPECT_EQ("disk(alice, hdfs-p, {foo: bar, foo})[hadoop:/hdfs:/data:rw]:1",
+ stream.str());
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/dd903d0d/src/tests/sorter_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/sorter_tests.cpp b/src/tests/sorter_tests.cpp
index 22bc618..0f3266f 100644
--- a/src/tests/sorter_tests.cpp
+++ b/src/tests/sorter_tests.cpp
@@ -108,7 +108,7 @@ TEST(SorterTest, DRFSorter)
EXPECT_FALSE(sorter.contains("a"));
- EXPECT_EQ(sorter.count(), 5);
+ EXPECT_EQ(5, sorter.count());
sorter.deactivate("d");
@@ -116,7 +116,7 @@ TEST(SorterTest, DRFSorter)
EXPECT_EQ(list<string>({"e", "b", "c", "f"}), sorter.sort());
- EXPECT_EQ(sorter.count(), 5);
+ EXPECT_EQ(5, sorter.count());
sorter.activate("d");