aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2012-08-13 22:59:17 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2012-08-14 21:29:53 +0100
commit5ccca1a066d8ca62940cc964d266970177e82255 (patch)
tree978786a09f2a72dad59f6155aaff7891a13444be
parent234b37d1b92c26238f292cdf65b21fcade21f35a (diff)
downloadpaludis-5ccca1a066d8ca62940cc964d266970177e82255.tar.gz
paludis-5ccca1a066d8ca62940cc964d266970177e82255.tar.xz
Make test failures easier to diagnose
-rw-r--r--paludis/version_spec_TEST.cc32
1 files changed, 16 insertions, 16 deletions
diff --git a/paludis/version_spec_TEST.cc b/paludis/version_spec_TEST.cc
index b620b42..f27e3c5 100644
--- a/paludis/version_spec_TEST.cc
+++ b/paludis/version_spec_TEST.cc
@@ -439,28 +439,28 @@ TEST(VersionSpec, Ordering)
{
if (std::distance(v.begin(), v1) < std::distance(v.begin(), v2))
{
- ASSERT_TRUE(*v1 < *v2);
- ASSERT_TRUE(*v2 > *v1);
- ASSERT_TRUE(*v1 != *v2);
- ASSERT_TRUE(*v2 != *v1);
- ASSERT_TRUE(v1->hash() != v2->hash());
- ASSERT_TRUE(v2->hash() != v1->hash());
+ ASSERT_LT(*v1, *v2);
+ ASSERT_GT(*v2, *v1);
+ ASSERT_NE(*v1, *v2);
+ ASSERT_NE(*v2, *v1);
+ ASSERT_NE(v1->hash(), v2->hash());
+ ASSERT_NE(v2->hash(), v1->hash());
}
else if (std::distance(v.begin(), v1) > std::distance(v.begin(), v2))
{
- ASSERT_TRUE(*v2 < *v1);
- ASSERT_TRUE(*v1 > *v2);
- ASSERT_TRUE(*v2 != *v1);
- ASSERT_TRUE(*v1 != *v2);
- ASSERT_TRUE(v1->hash() != v2->hash());
- ASSERT_TRUE(v2->hash() != v1->hash());
+ ASSERT_LT(*v2, *v1);
+ ASSERT_GT(*v1, *v2);
+ ASSERT_NE(*v2, *v1);
+ ASSERT_NE(*v1, *v2);
+ ASSERT_NE(v1->hash(), v2->hash());
+ ASSERT_NE(v2->hash(), v1->hash());
}
else
{
- ASSERT_TRUE(*v2 == *v1);
- ASSERT_TRUE(*v1 == *v2);
- ASSERT_TRUE(v1->hash() == v2->hash());
- ASSERT_TRUE(v2->hash() == v1->hash());
+ ASSERT_EQ(*v2, *v1);
+ ASSERT_EQ(*v1, *v2);
+ ASSERT_EQ(v1->hash(), v2->hash());
+ ASSERT_EQ(v2->hash(), v1->hash());
}
}
}