gtest more

2 files changed, 529 insertions, 695 deletions

diff --git a/paludis/files.m4 b/paludis/files.m4
index 1279a8d95..2789b3c0b 100644
--- a/paludis/files.m4
+++ b/paludis/files.m4
@@ -106,5 +106,5 @@ add(`unmerger',                                    `hh', `cc')
 add(`user_dep_spec',                               `hh', `cc', `se', `fwd', `test')
 add(`version_operator',                            `hh', `cc', `fwd', `se', `test')
 add(`version_requirements',                        `hh', `cc', `fwd')
-add(`version_spec',                                `hh', `cc', `se', `fwd', `test')
+add(`version_spec',                                `hh', `cc', `se', `fwd', `gtest')
 
diff --git a/paludis/version_spec_TEST.cc b/paludis/version_spec_TEST.cc
index a93c9be7e..b620b42c6 100644
--- a/paludis/version_spec_TEST.cc
+++ b/paludis/version_spec_TEST.cc
@@ -1,7 +1,7 @@
 /* vim: set sw=4 sts=4 et foldmethod=syntax : */
 
 /*
- * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
  *
  * This file is part of the Paludis package manager. Paludis is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
@@ -18,735 +18,569 @@
  */
 
 #include <paludis/version_spec.hh>
+
 #include <paludis/util/wrapped_forward_iterator.hh>
 #include <paludis/util/options.hh>
-#include <test/test_framework.hh>
-#include <test/test_runner.hh>
+#include <paludis/util/stringify.hh>
+
 #include <vector>
 #include <iterator>
 
-using namespace test;
-using namespace paludis;
+#include <gtest/gtest.h>
 
-/** \file
- * Test cases for VersionSpec.
- *
- */
+using namespace paludis;
 
-namespace test_cases
+TEST(VersionSpec, Construction)
 {
-    /**
-     * \test Basic version_spec creation.
-     *
-     */
-    struct VersionSpecCreationTest : TestCase
-    {
-        VersionSpecCreationTest() : TestCase("version spec creation") { }
-
-        void run()
-        {
-            VersionSpec v("1", { });
-            VersionSpec v1("1b", { });
-            VersionSpec v2("1_alpha", { });
-            VersionSpec v3("1_beta", { });
-            VersionSpec v4("1_pre", { });
-            VersionSpec v5("1_rc", { });
-            VersionSpec v6("1_p", { });
-            VersionSpec v7("1_alpha1", { });
-            VersionSpec v8("1_beta1", { });
-            VersionSpec v9("1_pre1", { });
-            VersionSpec v10("1_rc1", { });
-            VersionSpec v11("1_p1", { });
-            VersionSpec v12("1_alpha-r1", { });
-            VersionSpec v13("1_beta-r1", { });
-            VersionSpec v14("1_pre-r1", { });
-            VersionSpec v15("1_rc-r1", { });
-            VersionSpec v16("1_p-r1", { });
-            VersionSpec v17("1_alpha1-r1", { });
-            VersionSpec v18("1_beta1-r1", { });
-            VersionSpec v19("1_pre1-r1", { });
-            VersionSpec v20("1_pre1-r1.2", { });
-            VersionSpec v21("1_rc1-r1", { });
-            VersionSpec v22("1_p1-r1", { });
-            VersionSpec v23("1_alpha_p", { });
-            VersionSpec v24("1_p3_alpha", { });
-            VersionSpec v25("1_p4_p-r2", { });
-            VersionSpec v26("scm", { });
-
-            TEST_CHECK(true);
-        }
-    } test_version_spec_creation;
-
-    /**
-     * \test Invalid version rejection
-     *
-     */
-    struct VersionSpecRejectTest : TestCase
-    {
-        VersionSpecRejectTest() : TestCase("version spec reject") {}
-
-        void run()
-        {
-            TEST_CHECK_THROWS(VersionSpec v1("", { }), BadVersionSpecError);
-            TEST_CHECK_THROWS(VersionSpec v1("b", { }), BadVersionSpecError);
-            TEST_CHECK_THROWS(VersionSpec v1("1-r1_pre", { }), BadVersionSpecError);
-            TEST_CHECK_THROWS(VersionSpec v1("1-pre", { }), BadVersionSpecError);
-            TEST_CHECK_THROWS(VersionSpec v1("1_blah", { }), BadVersionSpecError);
-            TEST_CHECK_THROWS(VersionSpec v1("1_pre-r2b", { }), BadVersionSpecError);
-            TEST_CHECK_THROWS(VersionSpec v1("1_pre-r2-r2", { }), BadVersionSpecError);
-            TEST_CHECK_THROWS(VersionSpec v1("1-try-try", { }), BadVersionSpecError);
-            TEST_CHECK_THROWS(VersionSpec v1("1-try_alpha", { }), BadVersionSpecError);
-            TEST_CHECK_THROWS(VersionSpec v1("1-scm-scm", { }), BadVersionSpecError);
-            TEST_CHECK_THROWS(VersionSpec v1("1-scm-try", { }), BadVersionSpecError);
-            TEST_CHECK_THROWS(VersionSpec v1("1-scm_alpha", { }), BadVersionSpecError);
-            TEST_CHECK_THROWS(VersionSpec v1("1-r2_pre", { }), BadVersionSpecError);
-            TEST_CHECK_THROWS(VersionSpec v1("1.", { }), BadVersionSpecError);
-            TEST_CHECK_THROWS(VersionSpec v1("1.1.", { }), BadVersionSpecError);
-            TEST_CHECK_THROWS(VersionSpec v1("1.-r", { }), BadVersionSpecError);
-            TEST_CHECK_THROWS(VersionSpec v1("1.-r1", { }), BadVersionSpecError);
-            TEST_CHECK_THROWS(VersionSpec v1("1-r.0", { }), BadVersionSpecError);
-            TEST_CHECK_THROWS(VersionSpec v1("1-r1.", { }), BadVersionSpecError);
-            TEST_CHECK_THROWS(VersionSpec v1("1_p1.", { }), BadVersionSpecError);
-        }
-    } test_version_spec_reject;
-
-    /**
-     * \test Not so basic version_spec creation.
-     *
-     */
-    struct VersionSpecParseTest : TestCase
-    {
-        VersionSpecParseTest() : TestCase("version spec parse") { }
-
-        void run()
-        {
-            VersionSpec v("1.2.3", { });
-            TEST_CHECK(v == VersionSpec("1.2.3", { }));
-            VersionSpec v1("1.2_pre2-r1", { });
-            TEST_CHECK(v1 == VersionSpec("1.2_pre2-r1", { }));
-            VersionSpec v2("1.2_pre2_rc5_p6-r1", { });
-            TEST_CHECK(v2 == VersionSpec("1.2_pre2_rc5_p6-r1", { }));
-            VersionSpec v3("1.2_pre2_pre3_pre4", { });
-            TEST_CHECK(v3 == VersionSpec("1.2_pre2_pre3_pre4", { }));
-        }
-    } test_version_spec_parse;
-
-    /**
-     * \test VersionSpec stupid star comparisons
-     *
-     */
-    struct VersionSpecStupidStarCompareTest : TestCase
-    {
-        VersionSpecStupidStarCompareTest() : TestCase("version spec stupid star compare") {}
-
-        void run()
-        {
-            TEST_CHECK(VersionSpec("1.2", { }).stupid_equal_star_compare(VersionSpec("1", { })));
-            TEST_CHECK(VersionSpec("1.2", { }).stupid_equal_star_compare(VersionSpec("1.2", { })));
-            TEST_CHECK(VersionSpec("1.2.1", { }).stupid_equal_star_compare(VersionSpec("1", { })));
-            TEST_CHECK(VersionSpec("1.2.1", { }).stupid_equal_star_compare(VersionSpec("1.2", { })));
-            TEST_CHECK(VersionSpec("2.2", { }).stupid_equal_star_compare(VersionSpec("2", { })));
-            TEST_CHECK(VersionSpec("2", { }).stupid_equal_star_compare(VersionSpec("2", { })));
-            TEST_CHECK(VersionSpec("2.59", { }).stupid_equal_star_compare(VersionSpec("2.5", { })));
-            TEST_CHECK(VersionSpec("2.59_alpha5-r1", { }).stupid_equal_star_compare(VersionSpec("2.59_alpha", { })));
-            TEST_CHECK(! VersionSpec("2", { }).stupid_equal_star_compare(VersionSpec("2.5", { })));
-            TEST_CHECK(! VersionSpec("2.59", { }).stupid_equal_star_compare(VersionSpec("2.50", { })));
-            TEST_CHECK(! VersionSpec("1", { }).stupid_equal_star_compare(VersionSpec("2", { })));
-
-            TEST_CHECK(! VersionSpec("01", { }).stupid_equal_star_compare(VersionSpec("1", { })));
-            TEST_CHECK(! VersionSpec("1.02", { }).stupid_equal_star_compare(VersionSpec("1.020", { })));
-            TEST_CHECK(VersionSpec("1.020", { }).stupid_equal_star_compare(VersionSpec("1.02", { })));
-            TEST_CHECK(! VersionSpec("1_alpha1", { }).stupid_equal_star_compare(VersionSpec("1_alpha01", { })));
-            TEST_CHECK(! VersionSpec("1_alpha01", { }).stupid_equal_star_compare(VersionSpec("1_alpha1", { })));
-            TEST_CHECK(VersionSpec("1_alpha01", { }).stupid_equal_star_compare(VersionSpec("1_alpha0", { })));
-            TEST_CHECK(VersionSpec("1_pre1", { }).stupid_equal_star_compare(VersionSpec("1_p", { })));
-            TEST_CHECK(VersionSpec("1_pre-scm", { }).stupid_equal_star_compare(VersionSpec("1_pre", { })));
-            TEST_CHECK(! VersionSpec("1_pre1", { }).stupid_equal_star_compare(VersionSpec("1_pre0", { })));
-            TEST_CHECK(! VersionSpec("1_alpha1", { }).stupid_equal_star_compare(VersionSpec("1_alpha-r1", { })));
-            TEST_CHECK(! VersionSpec("1_alpha1", { }).stupid_equal_star_compare(VersionSpec("1_beta", { })));
-
-            TEST_CHECK(VersionSpec("010", { }).stupid_equal_star_compare(VersionSpec("010", { })));
-            TEST_CHECK(VersionSpec("010", { }).stupid_equal_star_compare(VersionSpec("01", { })));
-            TEST_CHECK(VersionSpec("2.010", { }).stupid_equal_star_compare(VersionSpec("2.01", { })));
-            TEST_CHECK(VersionSpec("2.0105", { }).stupid_equal_star_compare(VersionSpec("2.010", { })));
-            TEST_CHECK(! VersionSpec("2.0135", { }).stupid_equal_star_compare(VersionSpec("2.010", { })));
-            TEST_CHECK(VersionSpec("2.010.1", { }).stupid_equal_star_compare(VersionSpec("2.01", { })));
-            TEST_CHECK(VersionSpec("2.011.1", { }).stupid_equal_star_compare(VersionSpec("2.01", { })));
-            TEST_CHECK(! VersionSpec("2.010.1", { }).stupid_equal_star_compare(VersionSpec("2.01.1", { })));
-            TEST_CHECK(! VersionSpec("2.011.1", { }).stupid_equal_star_compare(VersionSpec("2.01.1", { })));
-            TEST_CHECK(VersionSpec("2.10", { }).stupid_equal_star_compare(VersionSpec("2.1", { })));
-        }
-    } test_version_spec_stupid_star_compare;
-
-    /**
-     * \test VersionSpec nice star comparisons
-     *
-     */
-    struct VersionSpecNiceStarCompareTest : TestCase
-    {
-        VersionSpecNiceStarCompareTest() : TestCase("version spec nice star compare") {}
-
-        void run()
-        {
-            TEST_CHECK(VersionSpec("1.2", { }).nice_equal_star_compare(VersionSpec("1", { })));
-            TEST_CHECK(VersionSpec("1.2", { }).nice_equal_star_compare(VersionSpec("1.2", { })));
-            TEST_CHECK(VersionSpec("1.2.1", { }).nice_equal_star_compare(VersionSpec("1", { })));
-            TEST_CHECK(VersionSpec("1.2.1", { }).nice_equal_star_compare(VersionSpec("1.2", { })));
-            TEST_CHECK(VersionSpec("2.2", { }).nice_equal_star_compare(VersionSpec("2", { })));
-            TEST_CHECK(VersionSpec("2", { }).nice_equal_star_compare(VersionSpec("2", { })));
-            TEST_CHECK(! VersionSpec("2.59", { }).nice_equal_star_compare(VersionSpec("2.5", { })));
-            TEST_CHECK(VersionSpec("2.59_alpha5-r1", { }).nice_equal_star_compare(VersionSpec("2.59_alpha", { })));
-            TEST_CHECK(! VersionSpec("2", { }).nice_equal_star_compare(VersionSpec("2.5", { })));
-            TEST_CHECK(! VersionSpec("2.59", { }).nice_equal_star_compare(VersionSpec("2.50", { })));
-            TEST_CHECK(! VersionSpec("1", { }).nice_equal_star_compare(VersionSpec("2", { })));
-
-            TEST_CHECK(VersionSpec("01", { }).nice_equal_star_compare(VersionSpec("1", { })));
-            TEST_CHECK(VersionSpec("1.02", { }).nice_equal_star_compare(VersionSpec("1.020", { })));
-            TEST_CHECK(VersionSpec("1.020", { }).nice_equal_star_compare(VersionSpec("1.02", { })));
-            TEST_CHECK(VersionSpec("1_alpha1", { }).nice_equal_star_compare(VersionSpec("1_alpha01", { })));
-            TEST_CHECK(VersionSpec("1_alpha01", { }).nice_equal_star_compare(VersionSpec("1_alpha1", { })));
-            TEST_CHECK(! VersionSpec("1_alpha01", { }).nice_equal_star_compare(VersionSpec("1_alpha0", { })));
-            TEST_CHECK(! VersionSpec("1_pre1", { }).nice_equal_star_compare(VersionSpec("1_p", { })));
-            TEST_CHECK(VersionSpec("1_pre-scm", { }).nice_equal_star_compare(VersionSpec("1_pre", { })));
-            TEST_CHECK(! VersionSpec("1_pre1", { }).nice_equal_star_compare(VersionSpec("1_pre0", { })));
-            TEST_CHECK(! VersionSpec("1_alpha1", { }).nice_equal_star_compare(VersionSpec("1_alpha-r1", { })));
-            TEST_CHECK(! VersionSpec("1_alpha1", { }).nice_equal_star_compare(VersionSpec("1_beta", { })));
-
-            TEST_CHECK(VersionSpec("010", { }).nice_equal_star_compare(VersionSpec("010", { })));
-            TEST_CHECK(! VersionSpec("010", { }).nice_equal_star_compare(VersionSpec("01", { })));
-            TEST_CHECK(VersionSpec("2.010", { }).nice_equal_star_compare(VersionSpec("2.01", { })));
-            TEST_CHECK(VersionSpec("2.0105", { }).nice_equal_star_compare(VersionSpec("2.010", { })));
-            TEST_CHECK(! VersionSpec("2.0135", { }).nice_equal_star_compare(VersionSpec("2.010", { })));
-            TEST_CHECK(VersionSpec("2.010.1", { }).nice_equal_star_compare(VersionSpec("2.01", { })));
-            TEST_CHECK(VersionSpec("2.011.1", { }).nice_equal_star_compare(VersionSpec("2.01", { })));
-            TEST_CHECK(VersionSpec("2.010.1", { }).nice_equal_star_compare(VersionSpec("2.01.1", { })));
-            TEST_CHECK(! VersionSpec("2.011.1", { }).stupid_equal_star_compare(VersionSpec("2.01.1", { })));
-            TEST_CHECK(! VersionSpec("2.10", { }).nice_equal_star_compare(VersionSpec("2.1", { })));
-        }
-    } test_version_spec_nice_star_compare;
-
-    /**
-     * \test VersionSpec tilde comparisons
-     *
-     */
-    struct VersionSpecTildeCompareTest : TestCase
-    {
-        VersionSpecTildeCompareTest() : TestCase("version spec tilde compare") {}
-
-        void run()
-        {
-
-            TEST_CHECK(! VersionSpec("1.4-r1", { }).tilde_compare(VersionSpec("1.3-r1", { })));
-            TEST_CHECK(! VersionSpec("1.4", { }).tilde_compare(VersionSpec("1.3-r1", { })));
-            TEST_CHECK(! VersionSpec("1.2", { }).tilde_compare(VersionSpec("1.3-r1", { })));
-            TEST_CHECK(! VersionSpec("1.3", { }).tilde_compare(VersionSpec("1.3-r1", { })));
-
-            TEST_CHECK(VersionSpec("1.2", { }).tilde_compare(VersionSpec("1.2", { })));
-            TEST_CHECK(VersionSpec("1.2-r1", { }).tilde_compare(VersionSpec("1.2", { })));
-            TEST_CHECK(VersionSpec("1.2-r1.2.3", { }).tilde_compare(VersionSpec("1.2", { })));
-            TEST_CHECK(! VersionSpec("1.3", { }).tilde_compare(VersionSpec("1.2", { })));
-            TEST_CHECK(VersionSpec("1.2-r2", { }).tilde_compare(VersionSpec("1.2-r1", { })));
-            TEST_CHECK(VersionSpec("1.2-r2.3", { }).tilde_compare(VersionSpec("1.2-r1", { })));
-            TEST_CHECK(VersionSpec("1.2-r2", { }).tilde_compare(VersionSpec("1.2-r2", { })));
-            TEST_CHECK(! VersionSpec("1.2-r1", { }).tilde_compare(VersionSpec("1.2-r2", { })));
-            TEST_CHECK(! VersionSpec("1.2-r1.3", { }).tilde_compare(VersionSpec("1.2-r2", { })));
-            TEST_CHECK(! VersionSpec("1.2-r2", { }).tilde_compare(VersionSpec("1.2-r2.3", { })));
-            TEST_CHECK(VersionSpec("1.2-r2.4", { }).tilde_compare(VersionSpec("1.2-r2.3", { })));
-
-            TEST_CHECK(VersionSpec("1.2-r0", { }).tilde_compare(VersionSpec("1.2", { })));
-            TEST_CHECK(VersionSpec("1.2", { }).tilde_compare(VersionSpec("1.2-r0", { })));
-            TEST_CHECK(VersionSpec("1.2-r1", { }).tilde_compare(VersionSpec("1.2-r0", { })));
-            TEST_CHECK(! VersionSpec("1.2-r0", { }).tilde_compare(VersionSpec("1.2-r1", { })));
-            TEST_CHECK(VersionSpec("1.2-r0.0", { }).tilde_compare(VersionSpec("1.2", { })));
-            TEST_CHECK(VersionSpec("1.2", { }).tilde_compare(VersionSpec("1.2-r0.0", { })));
-            TEST_CHECK(VersionSpec("1.2-r0.0", { }).tilde_compare(VersionSpec("1.2-r0", { })));
-            TEST_CHECK(VersionSpec("1.2-r0", { }).tilde_compare(VersionSpec("1.2-r0.0", { })));
-            TEST_CHECK(VersionSpec("1.2-r0.1", { }).tilde_compare(VersionSpec("1.2-r0", { })));
-            TEST_CHECK(! VersionSpec("1.2-r0", { }).tilde_compare(VersionSpec("1.2-r0.1", { })));
-            TEST_CHECK(VersionSpec("1.2-r1", { }).tilde_compare(VersionSpec("1.2-r0.1", { })));
-            TEST_CHECK(! VersionSpec("1.2-r0.1", { }).tilde_compare(VersionSpec("1.2-r1", { })));
-
-            TEST_CHECK(! VersionSpec("1.2.3", { }).tilde_compare(VersionSpec("1.2-r3", { })));
-            TEST_CHECK(! VersionSpec("1.2-r3", { }).tilde_compare(VersionSpec("1.2.3", { })));
-            TEST_CHECK(! VersionSpec("1.2", { }).tilde_compare(VersionSpec("1.2-r0.2", { })));
-            TEST_CHECK(! VersionSpec("1.2-r0.1", { }).tilde_compare(VersionSpec("1.2-r0.2", { })));
-        }
-    } test_version_spec_tilde_compare;
-
-    /**
-     * \test VersionSpec tilde greater comparisons
-     *
-     */
-    struct VersionSpecTildeGreaterCompareTest : TestCase
-    {
-        VersionSpecTildeGreaterCompareTest() : TestCase("version spec tilde greater compare") {}
+    VersionSpec v("1", { });
+    VersionSpec v1("1b", { });
+    VersionSpec v2("1_alpha", { });
+    VersionSpec v3("1_beta", { });
+    VersionSpec v4("1_pre", { });
+    VersionSpec v5("1_rc", { });
+    VersionSpec v6("1_p", { });
+    VersionSpec v7("1_alpha1", { });
+    VersionSpec v8("1_beta1", { });
+    VersionSpec v9("1_pre1", { });
+    VersionSpec v10("1_rc1", { });
+    VersionSpec v11("1_p1", { });
+    VersionSpec v12("1_alpha-r1", { });
+    VersionSpec v13("1_beta-r1", { });
+    VersionSpec v14("1_pre-r1", { });
+    VersionSpec v15("1_rc-r1", { });
+    VersionSpec v16("1_p-r1", { });
+    VersionSpec v17("1_alpha1-r1", { });
+    VersionSpec v18("1_beta1-r1", { });
+    VersionSpec v19("1_pre1-r1", { });
+    VersionSpec v20("1_pre1-r1.2", { });
+    VersionSpec v21("1_rc1-r1", { });
+    VersionSpec v22("1_p1-r1", { });
+    VersionSpec v23("1_alpha_p", { });
+    VersionSpec v24("1_p3_alpha", { });
+    VersionSpec v25("1_p4_p-r2", { });
+    VersionSpec v26("scm", { });
+
+    SUCCEED();
+}
 
-        void run()
-        {
-            TEST_CHECK(VersionSpec("1.2", { }).tilde_greater_compare(VersionSpec("1.2", { })));
-            TEST_CHECK(VersionSpec("1.2.1", { }).tilde_greater_compare(VersionSpec("1.2", { })));
-            TEST_CHECK(! VersionSpec("1.1", { }).tilde_greater_compare(VersionSpec("1.2", { })));
-            TEST_CHECK(! VersionSpec("2.0", { }).tilde_greater_compare(VersionSpec("1.2", { })));
-        }
-    } test_version_spec_tilde_greater_compare;
+TEST(VersionSpec, BadConstruction)
+{
+    ASSERT_THROW(VersionSpec v1("", { }), BadVersionSpecError);
+    ASSERT_THROW(VersionSpec v1("b", { }), BadVersionSpecError);
+    ASSERT_THROW(VersionSpec v1("1-r1_pre", { }), BadVersionSpecError);
+    ASSERT_THROW(VersionSpec v1("1-pre", { }), BadVersionSpecError);
+    ASSERT_THROW(VersionSpec v1("1_blah", { }), BadVersionSpecError);
+    ASSERT_THROW(VersionSpec v1("1_pre-r2b", { }), BadVersionSpecError);
+    ASSERT_THROW(VersionSpec v1("1_pre-r2-r2", { }), BadVersionSpecError);
+    ASSERT_THROW(VersionSpec v1("1-try-try", { }), BadVersionSpecError);
+    ASSERT_THROW(VersionSpec v1("1-try_alpha", { }), BadVersionSpecError);
+    ASSERT_THROW(VersionSpec v1("1-scm-scm", { }), BadVersionSpecError);
+    ASSERT_THROW(VersionSpec v1("1-scm-try", { }), BadVersionSpecError);
+    ASSERT_THROW(VersionSpec v1("1-scm_alpha", { }), BadVersionSpecError);
+    ASSERT_THROW(VersionSpec v1("1-r2_pre", { }), BadVersionSpecError);
+    ASSERT_THROW(VersionSpec v1("1.", { }), BadVersionSpecError);
+    ASSERT_THROW(VersionSpec v1("1.1.", { }), BadVersionSpecError);
+    ASSERT_THROW(VersionSpec v1("1.-r", { }), BadVersionSpecError);
+    ASSERT_THROW(VersionSpec v1("1.-r1", { }), BadVersionSpecError);
+    ASSERT_THROW(VersionSpec v1("1-r.0", { }), BadVersionSpecError);
+    ASSERT_THROW(VersionSpec v1("1-r1.", { }), BadVersionSpecError);
+    ASSERT_THROW(VersionSpec v1("1_p1.", { }), BadVersionSpecError);
+}
 
-    /**
-     * \test VersionSpec remove revision
-     *
-     */
-    struct VersionRemoveRevisionTest : TestCase
-    {
-        VersionRemoveRevisionTest() : TestCase("version spec remove revision") {}
+TEST(VersionSpec, TrickyParses)
+{
+    VersionSpec v("1.2.3", { });
+    ASSERT_TRUE(v == VersionSpec("1.2.3", { }));
+    VersionSpec v1("1.2_pre2-r1", { });
+    ASSERT_TRUE(v1 == VersionSpec("1.2_pre2-r1", { }));
+    VersionSpec v2("1.2_pre2_rc5_p6-r1", { });
+    ASSERT_TRUE(v2 == VersionSpec("1.2_pre2_rc5_p6-r1", { }));
+    VersionSpec v3("1.2_pre2_pre3_pre4", { });
+    ASSERT_TRUE(v3 == VersionSpec("1.2_pre2_pre3_pre4", { }));
+}
 
-        void run()
-        {
-            TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2", { }).remove_revision(), "1.2");
-            TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r", { }).remove_revision(), "1.2");
-            TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r99", { }).remove_revision(), "1.2");
-            TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r3.4", { }).remove_revision(), "1.2");
-
-            TEST_CHECK_EQUAL(VersionSpec("1.2", { }).remove_revision(), VersionSpec("1.2", { }));
-            TEST_CHECK_EQUAL(VersionSpec("1.2-r", { }).remove_revision(), VersionSpec("1.2", { }));
-            TEST_CHECK_EQUAL(VersionSpec("1.2-r99", { }).remove_revision(), VersionSpec("1.2", { }));
-            TEST_CHECK_EQUAL(VersionSpec("1.2-r3.4", { }).remove_revision(), VersionSpec("1.2", { }));
-        }
-    } test_version_remove_revision;
+TEST(VersionSpec, StupidStar)
+{
+    ASSERT_TRUE(VersionSpec("1.2", { }).stupid_equal_star_compare(VersionSpec("1", { })));
+    ASSERT_TRUE(VersionSpec("1.2", { }).stupid_equal_star_compare(VersionSpec("1.2", { })));
+    ASSERT_TRUE(VersionSpec("1.2.1", { }).stupid_equal_star_compare(VersionSpec("1", { })));
+    ASSERT_TRUE(VersionSpec("1.2.1", { }).stupid_equal_star_compare(VersionSpec("1.2", { })));
+    ASSERT_TRUE(VersionSpec("2.2", { }).stupid_equal_star_compare(VersionSpec("2", { })));
+    ASSERT_TRUE(VersionSpec("2", { }).stupid_equal_star_compare(VersionSpec("2", { })));
+    ASSERT_TRUE(VersionSpec("2.59", { }).stupid_equal_star_compare(VersionSpec("2.5", { })));
+    ASSERT_TRUE(VersionSpec("2.59_alpha5-r1", { }).stupid_equal_star_compare(VersionSpec("2.59_alpha", { })));
+    ASSERT_TRUE(! VersionSpec("2", { }).stupid_equal_star_compare(VersionSpec("2.5", { })));
+    ASSERT_TRUE(! VersionSpec("2.59", { }).stupid_equal_star_compare(VersionSpec("2.50", { })));
+    ASSERT_TRUE(! VersionSpec("1", { }).stupid_equal_star_compare(VersionSpec("2", { })));
+
+    ASSERT_TRUE(! VersionSpec("01", { }).stupid_equal_star_compare(VersionSpec("1", { })));
+    ASSERT_TRUE(! VersionSpec("1.02", { }).stupid_equal_star_compare(VersionSpec("1.020", { })));
+    ASSERT_TRUE(VersionSpec("1.020", { }).stupid_equal_star_compare(VersionSpec("1.02", { })));
+    ASSERT_TRUE(! VersionSpec("1_alpha1", { }).stupid_equal_star_compare(VersionSpec("1_alpha01", { })));
+    ASSERT_TRUE(! VersionSpec("1_alpha01", { }).stupid_equal_star_compare(VersionSpec("1_alpha1", { })));
+    ASSERT_TRUE(VersionSpec("1_alpha01", { }).stupid_equal_star_compare(VersionSpec("1_alpha0", { })));
+    ASSERT_TRUE(VersionSpec("1_pre1", { }).stupid_equal_star_compare(VersionSpec("1_p", { })));
+    ASSERT_TRUE(VersionSpec("1_pre-scm", { }).stupid_equal_star_compare(VersionSpec("1_pre", { })));
+    ASSERT_TRUE(! VersionSpec("1_pre1", { }).stupid_equal_star_compare(VersionSpec("1_pre0", { })));
+    ASSERT_TRUE(! VersionSpec("1_alpha1", { }).stupid_equal_star_compare(VersionSpec("1_alpha-r1", { })));
+    ASSERT_TRUE(! VersionSpec("1_alpha1", { }).stupid_equal_star_compare(VersionSpec("1_beta", { })));
+
+    ASSERT_TRUE(VersionSpec("010", { }).stupid_equal_star_compare(VersionSpec("010", { })));
+    ASSERT_TRUE(VersionSpec("010", { }).stupid_equal_star_compare(VersionSpec("01", { })));
+    ASSERT_TRUE(VersionSpec("2.010", { }).stupid_equal_star_compare(VersionSpec("2.01", { })));
+    ASSERT_TRUE(VersionSpec("2.0105", { }).stupid_equal_star_compare(VersionSpec("2.010", { })));
+    ASSERT_TRUE(! VersionSpec("2.0135", { }).stupid_equal_star_compare(VersionSpec("2.010", { })));
+    ASSERT_TRUE(VersionSpec("2.010.1", { }).stupid_equal_star_compare(VersionSpec("2.01", { })));
+    ASSERT_TRUE(VersionSpec("2.011.1", { }).stupid_equal_star_compare(VersionSpec("2.01", { })));
+    ASSERT_TRUE(! VersionSpec("2.010.1", { }).stupid_equal_star_compare(VersionSpec("2.01.1", { })));
+    ASSERT_TRUE(! VersionSpec("2.011.1", { }).stupid_equal_star_compare(VersionSpec("2.01.1", { })));
+    ASSERT_TRUE(VersionSpec("2.10", { }).stupid_equal_star_compare(VersionSpec("2.1", { })));
+}
 
-    /**
-     * \test VersionSpec bump
-     *
-     */
-    struct VersionBumpTest : TestCase
-    {
-        VersionBumpTest() : TestCase("version spec bump") {}
+TEST(VersionSpec, NiceStar)
+{
+    ASSERT_TRUE(VersionSpec("1.2", { }).nice_equal_star_compare(VersionSpec("1", { })));
+    ASSERT_TRUE(VersionSpec("1.2", { }).nice_equal_star_compare(VersionSpec("1.2", { })));
+    ASSERT_TRUE(VersionSpec("1.2.1", { }).nice_equal_star_compare(VersionSpec("1", { })));
+    ASSERT_TRUE(VersionSpec("1.2.1", { }).nice_equal_star_compare(VersionSpec("1.2", { })));
+    ASSERT_TRUE(VersionSpec("2.2", { }).nice_equal_star_compare(VersionSpec("2", { })));
+    ASSERT_TRUE(VersionSpec("2", { }).nice_equal_star_compare(VersionSpec("2", { })));
+    ASSERT_TRUE(! VersionSpec("2.59", { }).nice_equal_star_compare(VersionSpec("2.5", { })));
+    ASSERT_TRUE(VersionSpec("2.59_alpha5-r1", { }).nice_equal_star_compare(VersionSpec("2.59_alpha", { })));
+    ASSERT_TRUE(! VersionSpec("2", { }).nice_equal_star_compare(VersionSpec("2.5", { })));
+    ASSERT_TRUE(! VersionSpec("2.59", { }).nice_equal_star_compare(VersionSpec("2.50", { })));
+    ASSERT_TRUE(! VersionSpec("1", { }).nice_equal_star_compare(VersionSpec("2", { })));
+
+    ASSERT_TRUE(VersionSpec("01", { }).nice_equal_star_compare(VersionSpec("1", { })));
+    ASSERT_TRUE(VersionSpec("1.02", { }).nice_equal_star_compare(VersionSpec("1.020", { })));
+    ASSERT_TRUE(VersionSpec("1.020", { }).nice_equal_star_compare(VersionSpec("1.02", { })));
+    ASSERT_TRUE(VersionSpec("1_alpha1", { }).nice_equal_star_compare(VersionSpec("1_alpha01", { })));
+    ASSERT_TRUE(VersionSpec("1_alpha01", { }).nice_equal_star_compare(VersionSpec("1_alpha1", { })));
+    ASSERT_TRUE(! VersionSpec("1_alpha01", { }).nice_equal_star_compare(VersionSpec("1_alpha0", { })));
+    ASSERT_TRUE(! VersionSpec("1_pre1", { }).nice_equal_star_compare(VersionSpec("1_p", { })));
+    ASSERT_TRUE(VersionSpec("1_pre-scm", { }).nice_equal_star_compare(VersionSpec("1_pre", { })));
+    ASSERT_TRUE(! VersionSpec("1_pre1", { }).nice_equal_star_compare(VersionSpec("1_pre0", { })));
+    ASSERT_TRUE(! VersionSpec("1_alpha1", { }).nice_equal_star_compare(VersionSpec("1_alpha-r1", { })));
+    ASSERT_TRUE(! VersionSpec("1_alpha1", { }).nice_equal_star_compare(VersionSpec("1_beta", { })));
+
+    ASSERT_TRUE(VersionSpec("010", { }).nice_equal_star_compare(VersionSpec("010", { })));
+    ASSERT_TRUE(! VersionSpec("010", { }).nice_equal_star_compare(VersionSpec("01", { })));
+    ASSERT_TRUE(VersionSpec("2.010", { }).nice_equal_star_compare(VersionSpec("2.01", { })));
+    ASSERT_TRUE(VersionSpec("2.0105", { }).nice_equal_star_compare(VersionSpec("2.010", { })));
+    ASSERT_TRUE(! VersionSpec("2.0135", { }).nice_equal_star_compare(VersionSpec("2.010", { })));
+    ASSERT_TRUE(VersionSpec("2.010.1", { }).nice_equal_star_compare(VersionSpec("2.01", { })));
+    ASSERT_TRUE(VersionSpec("2.011.1", { }).nice_equal_star_compare(VersionSpec("2.01", { })));
+    ASSERT_TRUE(VersionSpec("2.010.1", { }).nice_equal_star_compare(VersionSpec("2.01.1", { })));
+    ASSERT_TRUE(! VersionSpec("2.011.1", { }).stupid_equal_star_compare(VersionSpec("2.01.1", { })));
+    ASSERT_TRUE(! VersionSpec("2.10", { }).nice_equal_star_compare(VersionSpec("2.1", { })));
+}
 
-        void run()
-        {
-            TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2", { }).bump(), "2");
-            TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r99", { }).bump(), "2");
-            TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2.3", { }).bump(), "1.3");
-            TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1", { }).bump(), "2");
-            TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.99.0", { }).bump(), "1.100");
-            TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.099.0", { }).bump(), "1.100");
-            TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.0099.0", { }).bump(), "1.0100");
-            TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("scm", { }).bump(), "scm");
-        }
-    } test_version_bump;
+TEST(VersionSpec, Tilde)
+{
+    ASSERT_TRUE(! VersionSpec("1.4-r1", { }).tilde_compare(VersionSpec("1.3-r1", { })));
+    ASSERT_TRUE(! VersionSpec("1.4", { }).tilde_compare(VersionSpec("1.3-r1", { })));
+    ASSERT_TRUE(! VersionSpec("1.2", { }).tilde_compare(VersionSpec("1.3-r1", { })));
+    ASSERT_TRUE(! VersionSpec("1.3", { }).tilde_compare(VersionSpec("1.3-r1", { })));
+
+    ASSERT_TRUE(VersionSpec("1.2", { }).tilde_compare(VersionSpec("1.2", { })));
+    ASSERT_TRUE(VersionSpec("1.2-r1", { }).tilde_compare(VersionSpec("1.2", { })));
+    ASSERT_TRUE(VersionSpec("1.2-r1.2.3", { }).tilde_compare(VersionSpec("1.2", { })));
+    ASSERT_TRUE(! VersionSpec("1.3", { }).tilde_compare(VersionSpec("1.2", { })));
+    ASSERT_TRUE(VersionSpec("1.2-r2", { }).tilde_compare(VersionSpec("1.2-r1", { })));
+    ASSERT_TRUE(VersionSpec("1.2-r2.3", { }).tilde_compare(VersionSpec("1.2-r1", { })));
+    ASSERT_TRUE(VersionSpec("1.2-r2", { }).tilde_compare(VersionSpec("1.2-r2", { })));
+    ASSERT_TRUE(! VersionSpec("1.2-r1", { }).tilde_compare(VersionSpec("1.2-r2", { })));
+    ASSERT_TRUE(! VersionSpec("1.2-r1.3", { }).tilde_compare(VersionSpec("1.2-r2", { })));
+    ASSERT_TRUE(! VersionSpec("1.2-r2", { }).tilde_compare(VersionSpec("1.2-r2.3", { })));
+    ASSERT_TRUE(VersionSpec("1.2-r2.4", { }).tilde_compare(VersionSpec("1.2-r2.3", { })));
+
+    ASSERT_TRUE(VersionSpec("1.2-r0", { }).tilde_compare(VersionSpec("1.2", { })));
+    ASSERT_TRUE(VersionSpec("1.2", { }).tilde_compare(VersionSpec("1.2-r0", { })));
+    ASSERT_TRUE(VersionSpec("1.2-r1", { }).tilde_compare(VersionSpec("1.2-r0", { })));
+    ASSERT_TRUE(! VersionSpec("1.2-r0", { }).tilde_compare(VersionSpec("1.2-r1", { })));
+    ASSERT_TRUE(VersionSpec("1.2-r0.0", { }).tilde_compare(VersionSpec("1.2", { })));
+    ASSERT_TRUE(VersionSpec("1.2", { }).tilde_compare(VersionSpec("1.2-r0.0", { })));
+    ASSERT_TRUE(VersionSpec("1.2-r0.0", { }).tilde_compare(VersionSpec("1.2-r0", { })));
+    ASSERT_TRUE(VersionSpec("1.2-r0", { }).tilde_compare(VersionSpec("1.2-r0.0", { })));
+    ASSERT_TRUE(VersionSpec("1.2-r0.1", { }).tilde_compare(VersionSpec("1.2-r0", { })));
+    ASSERT_TRUE(! VersionSpec("1.2-r0", { }).tilde_compare(VersionSpec("1.2-r0.1", { })));
+    ASSERT_TRUE(VersionSpec("1.2-r1", { }).tilde_compare(VersionSpec("1.2-r0.1", { })));
+    ASSERT_TRUE(! VersionSpec("1.2-r0.1", { }).tilde_compare(VersionSpec("1.2-r1", { })));
+
+    ASSERT_TRUE(! VersionSpec("1.2.3", { }).tilde_compare(VersionSpec("1.2-r3", { })));
+    ASSERT_TRUE(! VersionSpec("1.2-r3", { }).tilde_compare(VersionSpec("1.2.3", { })));
+    ASSERT_TRUE(! VersionSpec("1.2", { }).tilde_compare(VersionSpec("1.2-r0.2", { })));
+    ASSERT_TRUE(! VersionSpec("1.2-r0.1", { }).tilde_compare(VersionSpec("1.2-r0.2", { })));
+}
 
-    /**
-     * \test VersionSpec revision only
-     *
-     */
-    struct VersionRevisionOnlyTest : TestCase
-    {
-        VersionRevisionOnlyTest() : TestCase("version spec revision only") {}
+TEST(VersionSpec, TildeGreater)
+{
+    ASSERT_TRUE(VersionSpec("1.2", { }).tilde_greater_compare(VersionSpec("1.2", { })));
+    ASSERT_TRUE(VersionSpec("1.2.1", { }).tilde_greater_compare(VersionSpec("1.2", { })));
+    ASSERT_TRUE(! VersionSpec("1.1", { }).tilde_greater_compare(VersionSpec("1.2", { })));
+    ASSERT_TRUE(! VersionSpec("2.0", { }).tilde_greater_compare(VersionSpec("1.2", { })));
+}
 
-        void run()
-        {
-            TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2", { }).revision_only(), "r0");
-            TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r", { }).revision_only(), "r0");
-            TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r99", { }).revision_only(), "r99");
-            TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r3.4", { }).revision_only(), "r3.4");
-        }
-    } test_version_revision_only;
 
-    /**
-     * \test VersionSpec is_scm
-     *
-     */
-    struct VersionIsScmTest : TestCase
-    {
-        VersionIsScmTest() : TestCase("version spec is_scm") {}
+TEST(VersionSpec, RemoveRevision)
+{
+    EXPECT_EQ("1.2", stringify(VersionSpec("1.2", { }).remove_revision()));
+    EXPECT_EQ("1.2", stringify(VersionSpec("1.2-r", { }).remove_revision()));
+    EXPECT_EQ("1.2", stringify(VersionSpec("1.2-r99", { }).remove_revision()));
+    EXPECT_EQ("1.2", stringify(VersionSpec("1.2-r3.4", { }).remove_revision()));
+
+    EXPECT_EQ(VersionSpec("1.2", { }).remove_revision(), VersionSpec("1.2", { }));
+    EXPECT_EQ(VersionSpec("1.2-r", { }).remove_revision(), VersionSpec("1.2", { }));
+    EXPECT_EQ(VersionSpec("1.2-r99", { }).remove_revision(), VersionSpec("1.2", { }));
+    EXPECT_EQ(VersionSpec("1.2-r3.4", { }).remove_revision(), VersionSpec("1.2", { }));
+}
 
-        void run()
-        {
-            TEST_CHECK(! VersionSpec("1.2", { }).is_scm());
-            TEST_CHECK(VersionSpec("1.2-scm-r99", { }).is_scm());
+TEST(VersionSpec, Bump)
+{
+    EXPECT_EQ("2", stringify(VersionSpec("1.2", { }).bump()));
+    EXPECT_EQ("2", stringify(VersionSpec("1.2-r99", { }).bump()));
+    EXPECT_EQ("1.3", stringify(VersionSpec("1.2.3", { }).bump()));
+    EXPECT_EQ("2", stringify(VersionSpec("1", { }).bump()));
+    EXPECT_EQ("1.100", stringify(VersionSpec("1.99.0", { }).bump()));
+    EXPECT_EQ("1.100", stringify(VersionSpec("1.099.0", { }).bump()));
+    EXPECT_EQ("1.0100", stringify(VersionSpec("1.0099.0", { }).bump()));
+    EXPECT_EQ("scm", stringify(VersionSpec("scm", { }).bump()));
+}
 
-            TEST_CHECK(! VersionSpec("1.2-r9998", { }).is_scm());
-            TEST_CHECK(VersionSpec("1.2-r9999", { }).is_scm());
+TEST(VersionSpec, RevisionOnly)
+{
+    EXPECT_EQ("r0", stringify(VersionSpec("1.2", { }).revision_only()));
+    EXPECT_EQ("r0", stringify(VersionSpec("1.2-r", { }).revision_only()));
+    EXPECT_EQ("r99", stringify(VersionSpec("1.2-r99", { }).revision_only()));
+    EXPECT_EQ("r3.4", stringify(VersionSpec("1.2-r3.4", { }).revision_only()));
+}
 
-            TEST_CHECK(! VersionSpec("9998", { }).is_scm());
-            TEST_CHECK(! VersionSpec("9999_alpha2", { }).is_scm());
-            TEST_CHECK(VersionSpec("9999", { }).is_scm());
-            TEST_CHECK(VersionSpec("9999-r4", { }).is_scm());
+TEST(VersionSpec, IsScm)
+{
+    ASSERT_TRUE(! VersionSpec("1.2", { }).is_scm());
+    ASSERT_TRUE(VersionSpec("1.2-scm-r99", { }).is_scm());
 
-            TEST_CHECK(VersionSpec("99999999-r4", { }).is_scm());
-            TEST_CHECK(! VersionSpec("99999998-r4", { }).is_scm());
-            TEST_CHECK(! VersionSpec("999", { }).is_scm());
-            TEST_CHECK(! VersionSpec("1.9999", { }).is_scm());
-            TEST_CHECK(! VersionSpec("9999.1", { }).is_scm());
-            TEST_CHECK(! VersionSpec("9999.9999", { }).is_scm());
+    ASSERT_TRUE(! VersionSpec("1.2-r9998", { }).is_scm());
+    ASSERT_TRUE(VersionSpec("1.2-r9999", { }).is_scm());
 
-        }
-    } test_version_is_scm;
+    ASSERT_TRUE(! VersionSpec("9998", { }).is_scm());
+    ASSERT_TRUE(! VersionSpec("9999_alpha2", { }).is_scm());
+    ASSERT_TRUE(VersionSpec("9999", { }).is_scm());
+    ASSERT_TRUE(VersionSpec("9999-r4", { }).is_scm());
 
-    /**
-     * \test VersionSpec has_*
-     *
-     */
-    struct VersionHasStuffTest : TestCase
-    {
-        VersionHasStuffTest() : TestCase("version spec has_*") {}
+    ASSERT_TRUE(VersionSpec("99999999-r4", { }).is_scm());
+    ASSERT_TRUE(! VersionSpec("99999998-r4", { }).is_scm());
+    ASSERT_TRUE(! VersionSpec("999", { }).is_scm());
+    ASSERT_TRUE(! VersionSpec("1.9999", { }).is_scm());
+    ASSERT_TRUE(! VersionSpec("9999.1", { }).is_scm());
+    ASSERT_TRUE(! VersionSpec("9999.9999", { }).is_scm());
 
-        void run()
-        {
-            TEST_CHECK(! VersionSpec("1.2", { }).has_scm_part());
-            TEST_CHECK(VersionSpec("1.2-scm", { }).has_scm_part());
-            TEST_CHECK(VersionSpec("1.2-scm-r99", { }).has_scm_part());
-            TEST_CHECK(! VersionSpec("9999", { }).has_scm_part());
-            TEST_CHECK(VersionSpec("scm", { }).has_scm_part());
-
-            TEST_CHECK(! VersionSpec("1", { }).has_try_part());
-            TEST_CHECK(VersionSpec("1-try2", { }).has_try_part());
-            TEST_CHECK(VersionSpec("1.2-try3-r4", { }).has_try_part());
-
-            TEST_CHECK(! VersionSpec("1.2", { }).has_local_revision());
-            TEST_CHECK(! VersionSpec("1.2-r0", { }).has_local_revision());
-            TEST_CHECK(! VersionSpec("1.2-r3", { }).has_local_revision());
-            TEST_CHECK(VersionSpec("1.2-r3.0", { }).has_local_revision());
-            TEST_CHECK(VersionSpec("1.2-r3.4", { }).has_local_revision());
-            TEST_CHECK(VersionSpec("1.2-r3.4.5", { }).has_local_revision());
-        }
-    } test_version_has_stuff;
+}
 
-    struct VersionSpecHashTest : TestCase
-    {
-        VersionSpecHashTest() : TestCase("version spec hash()") { }
+TEST(VersionSpec, Has)
+{
+    ASSERT_TRUE(! VersionSpec("1.2", { }).has_scm_part());
+    ASSERT_TRUE(VersionSpec("1.2-scm", { }).has_scm_part());
+    ASSERT_TRUE(VersionSpec("1.2-scm-r99", { }).has_scm_part());
+    ASSERT_TRUE(! VersionSpec("9999", { }).has_scm_part());
+    ASSERT_TRUE(VersionSpec("scm", { }).has_scm_part());
+
+    ASSERT_TRUE(! VersionSpec("1", { }).has_try_part());
+    ASSERT_TRUE(VersionSpec("1-try2", { }).has_try_part());
+    ASSERT_TRUE(VersionSpec("1.2-try3-r4", { }).has_try_part());
+
+    ASSERT_TRUE(! VersionSpec("1.2", { }).has_local_revision());
+    ASSERT_TRUE(! VersionSpec("1.2-r0", { }).has_local_revision());
+    ASSERT_TRUE(! VersionSpec("1.2-r3", { }).has_local_revision());
+    ASSERT_TRUE(VersionSpec("1.2-r3.0", { }).has_local_revision());
+    ASSERT_TRUE(VersionSpec("1.2-r3.4", { }).has_local_revision());
+    ASSERT_TRUE(VersionSpec("1.2-r3.4.5", { }).has_local_revision());
+}
 
-        void run()
-        {
-            TEST_CHECK(VersionSpec("0", { }).hash() != VersionSpec("0.0", { }).hash());
-            TEST_CHECK(VersionSpec("1", { }).hash() != VersionSpec("1.0", { }).hash());
-            TEST_CHECK(VersionSpec("1.0", { }).hash() != VersionSpec("1", { }).hash());
-            TEST_CHECK(VersionSpec("1.0_alpha", { }).hash() != VersionSpec("1_alpha", { }).hash());
-            TEST_CHECK(VersionSpec("1_alpha", { }).hash() != VersionSpec("1.0_alpha", { }).hash());
-        }
-    } test_version_spec_hash;
+TEST(VersionSpec, Hash)
+{
+    ASSERT_TRUE(VersionSpec("0", { }).hash() != VersionSpec("0.0", { }).hash());
+    ASSERT_TRUE(VersionSpec("1", { }).hash() != VersionSpec("1.0", { }).hash());
+    ASSERT_TRUE(VersionSpec("1.0", { }).hash() != VersionSpec("1", { }).hash());
+    ASSERT_TRUE(VersionSpec("1.0_alpha", { }).hash() != VersionSpec("1_alpha", { }).hash());
+    ASSERT_TRUE(VersionSpec("1_alpha", { }).hash() != VersionSpec("1.0_alpha", { }).hash());
+}
 
-    /**
-     * \test VersionSpec ordering.
-     *
-     */
-    struct VersionSpecCompareSCMTest : TestCase
+TEST(VersionSpec, Ordering)
+{
+    ASSERT_TRUE(VersionSpec("1.0", { }) > VersionSpec("1", { }));
+    ASSERT_TRUE(VersionSpec("1", { }) < VersionSpec("1.0", { }));
+    ASSERT_TRUE(VersionSpec("1.0_alpha", { }) > VersionSpec("1_alpha", { }));
+    ASSERT_TRUE(VersionSpec("1.0_alpha", { }) > VersionSpec("1", { }));
+    ASSERT_TRUE(VersionSpec("1.0_alpha", { }) < VersionSpec("1.0", { }));
+    ASSERT_TRUE(VersionSpec("1.2.0.0_alpha7-r4", { }) > VersionSpec("1.2_alpha7-r4", { }));
+
+    ASSERT_TRUE(VersionSpec("0001", { }) == VersionSpec("1", { }));
+    ASSERT_TRUE(VersionSpec("01", { }) == VersionSpec("001", { }));
+    ASSERT_TRUE(VersionSpec("0001.1", { }) == VersionSpec("1.1", { }));
+    ASSERT_TRUE(VersionSpec("01.01", { }) == VersionSpec("1.01", { }));
+    ASSERT_TRUE(VersionSpec("1.010", { }) == VersionSpec("1.01", { }));
+    ASSERT_TRUE(VersionSpec("1.00", { }) == VersionSpec("1.0", { }));
+    ASSERT_TRUE(VersionSpec("1.0100", { }) == VersionSpec("1.010", { }));
+    ASSERT_TRUE(VersionSpec("1", { }) == VersionSpec("1-r0", { }));
+    ASSERT_TRUE(VersionSpec("1-r00", { }) == VersionSpec("1-r0", { }));
+    ASSERT_TRUE(VersionSpec("1.2", { }) == VersionSpec("1.2-r", { }));
+    ASSERT_TRUE(VersionSpec("1.2-r3", { }) == VersionSpec("1.2-r3.0", { }));
+    ASSERT_TRUE(VersionSpec("1.2", { }) == VersionSpec("1.2-r0.0", { }));
+    ASSERT_TRUE(VersionSpec("1.2", { }) != VersionSpec("1.2-r0.1", { }));
+    ASSERT_TRUE(VersionSpec("1.2-r0.1", { }) != VersionSpec("1.2", { }));
+
+    ASSERT_TRUE(VersionSpec("1_alpha_beta-scm", { }) == VersionSpec("1_alpha0_beta-scm", { }));
+    ASSERT_TRUE(VersionSpec("1_alpha_beta000_rc3-scm", { }) == VersionSpec("1_alpha00_beta_rc3-scm", { }));
+
+    ASSERT_TRUE(VersionSpec("0001", { }).hash() == VersionSpec("1", { }).hash());
+    ASSERT_TRUE(VersionSpec("01", { }).hash() == VersionSpec("001", { }).hash());
+    ASSERT_TRUE(VersionSpec("0001.1", { }).hash() == VersionSpec("1.1", { }).hash());
+    ASSERT_TRUE(VersionSpec("01.01", { }).hash() == VersionSpec("1.01", { }).hash());
+    ASSERT_TRUE(VersionSpec("1.010", { }).hash() == VersionSpec("1.01", { }).hash());
+    ASSERT_TRUE(VersionSpec("1.00", { }).hash() == VersionSpec("1.0", { }).hash());
+    ASSERT_TRUE(VersionSpec("1.0100", { }).hash() == VersionSpec("1.010", { }).hash());
+    ASSERT_TRUE(VersionSpec("1", { }).hash() == VersionSpec("1-r0", { }).hash());
+    ASSERT_TRUE(VersionSpec("1.2", { }).hash() == VersionSpec("1.2-r", { }).hash());
+    ASSERT_TRUE(VersionSpec("1.2-r3", { }).hash() == VersionSpec("1.2-r3.0", { }).hash());
+    ASSERT_TRUE(VersionSpec("1.2", { }).hash() == VersionSpec("1.2-r0.0", { }).hash());
+
+    std::vector<VersionSpec> v;
+    v.push_back(VersionSpec("1_alpha_alpha", { }));
+    v.push_back(VersionSpec("1_alpha", { }));
+    v.push_back(VersionSpec("1_alpha1_alpha", { }));
+    v.push_back(VersionSpec("1_alpha1_beta_pre", { }));
+    v.push_back(VersionSpec("1_alpha1_beta", { }));
+    v.push_back(VersionSpec("1_alpha1", { }));
+    v.push_back(VersionSpec("1_alpha1-r1", { }));
+    v.push_back(VersionSpec("1_alpha10", { }));
+    v.push_back(VersionSpec("1_alpha10-r1", { }));
+    v.push_back(VersionSpec("1_alpha10-r1.1", { }));
+    v.push_back(VersionSpec("1_alpha10-r1.2", { }));
+    v.push_back(VersionSpec("1_alpha10-r2", { }));
+    v.push_back(VersionSpec("1_alpha10_p1", { }));
+    v.push_back(VersionSpec("1_alpha10_p1-r1", { }));
+    v.push_back(VersionSpec("1_alpha11", { }));
+    v.push_back(VersionSpec("1_beta", { }));
+    v.push_back(VersionSpec("1_beta10", { }));
+    v.push_back(VersionSpec("1_beta10-r1", { }));
+    v.push_back(VersionSpec("1_beta10_p1", { }));
+    v.push_back(VersionSpec("1_beta10_p1-r1", { }));
+    v.push_back(VersionSpec("1_beta11", { }));
+    v.push_back(VersionSpec("1_pre", { }));
+    v.push_back(VersionSpec("1_pre10", { }));
+    v.push_back(VersionSpec("1_pre10-r1", { }));
+    v.push_back(VersionSpec("1_pre10_p1", { }));
+    v.push_back(VersionSpec("1_pre10_p1-r1", { }));
+    v.push_back(VersionSpec("1_pre11", { }));
+    v.push_back(VersionSpec("1_rc", { }));
+    v.push_back(VersionSpec("1_rc10", { }));
+    v.push_back(VersionSpec("1_rc10-r1", { }));
+    v.push_back(VersionSpec("1_rc10_p1", { }));
+    v.push_back(VersionSpec("1_rc10_p1-r1", { }));
+    v.push_back(VersionSpec("1_rc11", { }));
+    v.push_back(VersionSpec("1", { }));
+    v.push_back(VersionSpec("1-r1", { }));
+    v.push_back(VersionSpec("1_p1", { }));
+    v.push_back(VersionSpec("1-try2", { }));
+    v.push_back(VersionSpec("1p", { }));
+    v.push_back(VersionSpec("1.0", { }));
+    v.push_back(VersionSpec("1.0a", { }));
+    v.push_back(VersionSpec("1.0.0", { }));
+    v.push_back(VersionSpec("1.001", { }));
+    v.push_back(VersionSpec("1.01", { }));
+    v.push_back(VersionSpec("1.0101", { }));
+    v.push_back(VersionSpec("1.1_alpha3", { }));
+    v.push_back(VersionSpec("1.1", { }));
+    v.push_back(VersionSpec("1.1-r1", { }));
+    v.push_back(VersionSpec("1.1.1", { }));
+    v.push_back(VersionSpec("1.1.1-scm", { }));
+    v.push_back(VersionSpec("1.1.2", { }));
+    v.push_back(VersionSpec("1.1-scm", { }));
+    v.push_back(VersionSpec("1.1-scm-r1", { }));
+    v.push_back(VersionSpec("1.2_alpha", { }));
+    v.push_back(VersionSpec("1.2_alpha-scm", { }));
+    v.push_back(VersionSpec("1.2_beta", { }));
+    v.push_back(VersionSpec("1.2_beta_p0-scm", { }));
+    v.push_back(VersionSpec("1.2_beta_p1-scm", { }));
+    v.push_back(VersionSpec("1.2_beta_p-scm", { }));
+    v.push_back(VersionSpec("1.2_beta1_p-scm", { }));
+    v.push_back(VersionSpec("1.2_beta10", { }));
+    v.push_back(VersionSpec("1.2_beta10_p", { }));
+    v.push_back(VersionSpec("1.2_beta10_p1", { }));
+    v.push_back(VersionSpec("1.2_beta10_p1-scm", { }));
+    v.push_back(VersionSpec("1.2_beta10_p10", { }));
+    v.push_back(VersionSpec("1.2_beta10-scm", { }));
+    v.push_back(VersionSpec("1.2_beta11", { }));
+    v.push_back(VersionSpec("1.2_beta11-scm", { }));
+    v.push_back(VersionSpec("1.2_beta-scm", { }));
+    v.push_back(VersionSpec("1.2", { }));
+    v.push_back(VersionSpec("1.2-r1", { }));
+    v.push_back(VersionSpec("1.2_p3_pre", { }));
+    v.push_back(VersionSpec("1.2_p3", { }));
+    v.push_back(VersionSpec("1.2_p3_p", { }));
+    v.push_back(VersionSpec("1.2_p3-try4", { }));
+    v.push_back(VersionSpec("1.2-scm", { }));
+    v.push_back(VersionSpec("1.2-scm-r1", { }));
+    v.push_back(VersionSpec("1-scm", { }));
+    v.push_back(VersionSpec("2_alpha", { }));
+    v.push_back(VersionSpec("09", { }));
+    v.push_back(VersionSpec("10", { }));
+    v.push_back(VersionSpec("100", { }));
+    v.push_back(VersionSpec("scm", { }));
+    v.push_back(VersionSpec("scm-r3", { }));
+    v.push_back(VersionSpec("scm-r3.4", { }));
+
+    std::vector<VersionSpec>::iterator v1(v.begin()), v_end(v.end());
+    for ( ; v1 != v_end ; ++v1)
     {
-        VersionSpecCompareSCMTest() : TestCase("version spec compare") {}
-
-        virtual unsigned max_run_time() const
+        std::vector<VersionSpec>::iterator v2(v.begin());
+        for ( ; v2 != v_end ; ++v2)
         {
-            return 300;
-        }
-
-        void run()
-        {
-            TEST_CHECK(VersionSpec("1.0", { }) > VersionSpec("1", { }));
-            TEST_CHECK(VersionSpec("1", { }) < VersionSpec("1.0", { }));
-            TEST_CHECK(VersionSpec("1.0_alpha", { }) > VersionSpec("1_alpha", { }));
-            TEST_CHECK(VersionSpec("1.0_alpha", { }) > VersionSpec("1", { }));
-            TEST_CHECK(VersionSpec("1.0_alpha", { }) < VersionSpec("1.0", { }));
-            TEST_CHECK(VersionSpec("1.2.0.0_alpha7-r4", { }) > VersionSpec("1.2_alpha7-r4", { }));
-
-            TEST_CHECK(VersionSpec("0001", { }) == VersionSpec("1", { }));
-            TEST_CHECK(VersionSpec("01", { }) == VersionSpec("001", { }));
-            TEST_CHECK(VersionSpec("0001.1", { }) == VersionSpec("1.1", { }));
-            TEST_CHECK(VersionSpec("01.01", { }) == VersionSpec("1.01", { }));
-            TEST_CHECK(VersionSpec("1.010", { }) == VersionSpec("1.01", { }));
-            TEST_CHECK(VersionSpec("1.00", { }) == VersionSpec("1.0", { }));
-            TEST_CHECK(VersionSpec("1.0100", { }) == VersionSpec("1.010", { }));
-            TEST_CHECK(VersionSpec("1", { }) == VersionSpec("1-r0", { }));
-            TEST_CHECK(VersionSpec("1-r00", { }) == VersionSpec("1-r0", { }));
-            TEST_CHECK(VersionSpec("1.2", { }) == VersionSpec("1.2-r", { }));
-            TEST_CHECK(VersionSpec("1.2-r3", { }) == VersionSpec("1.2-r3.0", { }));
-            TEST_CHECK(VersionSpec("1.2", { }) == VersionSpec("1.2-r0.0", { }));
-            TEST_CHECK(VersionSpec("1.2", { }) != VersionSpec("1.2-r0.1", { }));
-            TEST_CHECK(VersionSpec("1.2-r0.1", { }) != VersionSpec("1.2", { }));
-
-            TEST_CHECK(VersionSpec("1_alpha_beta-scm", { }) == VersionSpec("1_alpha0_beta-scm", { }));
-            TEST_CHECK(VersionSpec("1_alpha_beta000_rc3-scm", { }) == VersionSpec("1_alpha00_beta_rc3-scm", { }));
-
-            TEST_CHECK(VersionSpec("0001", { }).hash() == VersionSpec("1", { }).hash());
-            TEST_CHECK(VersionSpec("01", { }).hash() == VersionSpec("001", { }).hash());
-            TEST_CHECK(VersionSpec("0001.1", { }).hash() == VersionSpec("1.1", { }).hash());
-            TEST_CHECK(VersionSpec("01.01", { }).hash() == VersionSpec("1.01", { }).hash());
-            TEST_CHECK(VersionSpec("1.010", { }).hash() == VersionSpec("1.01", { }).hash());
-            TEST_CHECK(VersionSpec("1.00", { }).hash() == VersionSpec("1.0", { }).hash());
-            TEST_CHECK(VersionSpec("1.0100", { }).hash() == VersionSpec("1.010", { }).hash());
-            TEST_CHECK(VersionSpec("1", { }).hash() == VersionSpec("1-r0", { }).hash());
-            TEST_CHECK(VersionSpec("1.2", { }).hash() == VersionSpec("1.2-r", { }).hash());
-            TEST_CHECK(VersionSpec("1.2-r3", { }).hash() == VersionSpec("1.2-r3.0", { }).hash());
-            TEST_CHECK(VersionSpec("1.2", { }).hash() == VersionSpec("1.2-r0.0", { }).hash());
-
-            std::vector<VersionSpec> v;
-            v.push_back(VersionSpec("1_alpha_alpha", { }));
-            v.push_back(VersionSpec("1_alpha", { }));
-            v.push_back(VersionSpec("1_alpha1_alpha", { }));
-            v.push_back(VersionSpec("1_alpha1_beta_pre", { }));
-            v.push_back(VersionSpec("1_alpha1_beta", { }));
-            v.push_back(VersionSpec("1_alpha1", { }));
-            v.push_back(VersionSpec("1_alpha1-r1", { }));
-            v.push_back(VersionSpec("1_alpha10", { }));
-            v.push_back(VersionSpec("1_alpha10-r1", { }));
-            v.push_back(VersionSpec("1_alpha10-r1.1", { }));
-            v.push_back(VersionSpec("1_alpha10-r1.2", { }));
-            v.push_back(VersionSpec("1_alpha10-r2", { }));
-            v.push_back(VersionSpec("1_alpha10_p1", { }));
-            v.push_back(VersionSpec("1_alpha10_p1-r1", { }));
-            v.push_back(VersionSpec("1_alpha11", { }));
-            v.push_back(VersionSpec("1_beta", { }));
-            v.push_back(VersionSpec("1_beta10", { }));
-            v.push_back(VersionSpec("1_beta10-r1", { }));
-            v.push_back(VersionSpec("1_beta10_p1", { }));
-            v.push_back(VersionSpec("1_beta10_p1-r1", { }));
-            v.push_back(VersionSpec("1_beta11", { }));
-            v.push_back(VersionSpec("1_pre", { }));
-            v.push_back(VersionSpec("1_pre10", { }));
-            v.push_back(VersionSpec("1_pre10-r1", { }));
-            v.push_back(VersionSpec("1_pre10_p1", { }));
-            v.push_back(VersionSpec("1_pre10_p1-r1", { }));
-            v.push_back(VersionSpec("1_pre11", { }));
-            v.push_back(VersionSpec("1_rc", { }));
-            v.push_back(VersionSpec("1_rc10", { }));
-            v.push_back(VersionSpec("1_rc10-r1", { }));
-            v.push_back(VersionSpec("1_rc10_p1", { }));
-            v.push_back(VersionSpec("1_rc10_p1-r1", { }));
-            v.push_back(VersionSpec("1_rc11", { }));
-            v.push_back(VersionSpec("1", { }));
-            v.push_back(VersionSpec("1-r1", { }));
-            v.push_back(VersionSpec("1_p1", { }));
-            v.push_back(VersionSpec("1-try2", { }));
-            v.push_back(VersionSpec("1p", { }));
-            v.push_back(VersionSpec("1.0", { }));
-            v.push_back(VersionSpec("1.0a", { }));
-            v.push_back(VersionSpec("1.0.0", { }));
-            v.push_back(VersionSpec("1.001", { }));
-            v.push_back(VersionSpec("1.01", { }));
-            v.push_back(VersionSpec("1.0101", { }));
-            v.push_back(VersionSpec("1.1_alpha3", { }));
-            v.push_back(VersionSpec("1.1", { }));
-            v.push_back(VersionSpec("1.1-r1", { }));
-            v.push_back(VersionSpec("1.1.1", { }));
-            v.push_back(VersionSpec("1.1.1-scm", { }));
-            v.push_back(VersionSpec("1.1.2", { }));
-            v.push_back(VersionSpec("1.1-scm", { }));
-            v.push_back(VersionSpec("1.1-scm-r1", { }));
-            v.push_back(VersionSpec("1.2_alpha", { }));
-            v.push_back(VersionSpec("1.2_alpha-scm", { }));
-            v.push_back(VersionSpec("1.2_beta", { }));
-            v.push_back(VersionSpec("1.2_beta_p0-scm", { }));
-            v.push_back(VersionSpec("1.2_beta_p1-scm", { }));
-            v.push_back(VersionSpec("1.2_beta_p-scm", { }));
-            v.push_back(VersionSpec("1.2_beta1_p-scm", { }));
-            v.push_back(VersionSpec("1.2_beta10", { }));
-            v.push_back(VersionSpec("1.2_beta10_p", { }));
-            v.push_back(VersionSpec("1.2_beta10_p1", { }));
-            v.push_back(VersionSpec("1.2_beta10_p1-scm", { }));
-            v.push_back(VersionSpec("1.2_beta10_p10", { }));
-            v.push_back(VersionSpec("1.2_beta10-scm", { }));
-            v.push_back(VersionSpec("1.2_beta11", { }));
-            v.push_back(VersionSpec("1.2_beta11-scm", { }));
-            v.push_back(VersionSpec("1.2_beta-scm", { }));
-            v.push_back(VersionSpec("1.2", { }));
-            v.push_back(VersionSpec("1.2-r1", { }));
-            v.push_back(VersionSpec("1.2_p3_pre", { }));
-            v.push_back(VersionSpec("1.2_p3", { }));
-            v.push_back(VersionSpec("1.2_p3_p", { }));
-            v.push_back(VersionSpec("1.2_p3-try4", { }));
-            v.push_back(VersionSpec("1.2-scm", { }));
-            v.push_back(VersionSpec("1.2-scm-r1", { }));
-            v.push_back(VersionSpec("1-scm", { }));
-            v.push_back(VersionSpec("2_alpha", { }));
-            v.push_back(VersionSpec("09", { }));
-            v.push_back(VersionSpec("10", { }));
-            v.push_back(VersionSpec("100", { }));
-            v.push_back(VersionSpec("scm", { }));
-            v.push_back(VersionSpec("scm-r3", { }));
-            v.push_back(VersionSpec("scm-r3.4", { }));
-
-            std::vector<VersionSpec>::iterator v1(v.begin()), v_end(v.end());
-            for ( ; v1 != v_end ; ++v1)
+            if (std::distance(v.begin(), v1) < std::distance(v.begin(), v2))
             {
-                TestMessageSuffix s1("v1:" + stringify(*v1));
-                std::vector<VersionSpec>::iterator v2(v.begin());
-                for ( ; v2 != v_end ; ++v2)
-                {
-                    TestMessageSuffix s2("v2:" + stringify(*v2));
-                    if (std::distance(v.begin(), v1) < std::distance(v.begin(), v2))
-                    {
-                        TEST_CHECK(*v1 < *v2);
-                        TEST_CHECK(*v2 > *v1);
-                        TEST_CHECK(*v1 != *v2);
-                        TEST_CHECK(*v2 != *v1);
-                        TestMessageSuffix sv1("hv1:" + stringify(v1->hash()));
-                        TestMessageSuffix sv2("hv2:" + stringify(v2->hash()));
-                        TEST_CHECK(v1->hash() != v2->hash());
-                        TEST_CHECK(v2->hash() != v1->hash());
-                    }
-                    else if (std::distance(v.begin(), v1) > std::distance(v.begin(), v2))
-                    {
-                        TEST_CHECK(*v2 < *v1);
-                        TEST_CHECK(*v1 > *v2);
-                        TEST_CHECK(*v2 != *v1);
-                        TEST_CHECK(*v1 != *v2);
-                        TestMessageSuffix sv1("hv1:" + stringify(v1->hash()));
-                        TestMessageSuffix sv2("hv2:" + stringify(v2->hash()));
-                        TEST_CHECK(v1->hash() != v2->hash());
-                        TEST_CHECK(v2->hash() != v1->hash());
-                    }
-                    else
-                    {
-                        TEST_CHECK(*v2 == *v1);
-                        TEST_CHECK(*v1 == *v2);
-                        TestMessageSuffix sv1("hv1:" + stringify(v1->hash()));
-                        TestMessageSuffix sv2("hv2:" + stringify(v2->hash()));
-                        TEST_CHECK(v1->hash() == v2->hash());
-                        TEST_CHECK(v2->hash() == v1->hash());
-                    }
-                }
+                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());
+            }
+            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());
+            }
+            else
+            {
+                ASSERT_TRUE(*v2 == *v1);
+                ASSERT_TRUE(*v1 == *v2);
+                ASSERT_TRUE(v1->hash() == v2->hash());
+                ASSERT_TRUE(v2->hash() == v1->hash());
             }
         }
-    } test_version_spec_compare;
-
-    struct VersionSpecComponentsTest : TestCase
-    {
-        VersionSpecComponentsTest() : TestCase("components") { }
-
-        void run()
-        {
-            VersionSpec v1("1.2x_pre3_rc-scm", { });
-            VersionSpec::ConstIterator i(v1.begin()), i_end(v1.end());
-
-            TEST_CHECK(i != i_end);
-            TEST_CHECK_EQUAL(i->type(), vsct_number);
-            TEST_CHECK_EQUAL(i->number_value(), "1");
-            TEST_CHECK_EQUAL(i->text(), "1");
-            ++i;
-
-            TEST_CHECK(i != i_end);
-            TEST_CHECK_EQUAL(i->type(), vsct_number);
-            TEST_CHECK_EQUAL(i->number_value(), "2");
-            TEST_CHECK_EQUAL(i->text(), ".2");
-            ++i;
-
-            TEST_CHECK(i != i_end);
-            TEST_CHECK_EQUAL(i->type(), vsct_letter);
-            TEST_CHECK_EQUAL(i->number_value(), "x");
-            TEST_CHECK_EQUAL(i->text(), "x");
-            ++i;
-
-            TEST_CHECK(i != i_end);
-            TEST_CHECK_EQUAL(i->type(), vsct_pre);
-            TEST_CHECK_EQUAL(i->number_value(), "3");
-            TEST_CHECK_EQUAL(i->text(), "_pre3");
-            ++i;
-
-            TEST_CHECK(i != i_end);
-            TEST_CHECK_EQUAL(i->type(), vsct_rc);
-            TEST_CHECK_EQUAL(i->number_value(), "MAX");
-            TEST_CHECK_EQUAL(i->text(), "_rc");
-            ++i;
-
-            TEST_CHECK(i != i_end);
-            TEST_CHECK_EQUAL(i->type(), vsct_scm);
-            TEST_CHECK_EQUAL(i->number_value(), "0");
-            TEST_CHECK_EQUAL(i->text(), "-scm");
-            ++i;
-        }
-    } test_version_spec_components;
-
-    struct VersionSpecIgnoreCaseTest : TestCase
-    {
-        VersionSpecIgnoreCaseTest() : TestCase("ignore case") { }
-
-        void run()
-        {
-            TEST_CHECK_THROWS(VersionSpec("1.2A", { }), BadVersionSpecError);
-            VersionSpec v1("1.2A", { vso_ignore_case });
-            VersionSpec v2("1.2a", { });
-            TEST_CHECK(v1 == v2);
-            TEST_CHECK(v1.hash() == v2.hash());
-
-            TEST_CHECK_THROWS(VersionSpec("1_ALPHA3", { }), BadVersionSpecError);
-            VersionSpec v3("1_ALPHA3", { vso_ignore_case });
-            VersionSpec v4("1_alpha3", { });
-            TEST_CHECK(v3 == v4);
-            TEST_CHECK(v3.hash() == v4.hash());
-
-            TEST_CHECK_THROWS(VersionSpec("SCM", { }), BadVersionSpecError);
-            VersionSpec v5("SCM", { vso_ignore_case });
-            VersionSpec v6("scm", { });
-            TEST_CHECK(v5 == v6);
-            TEST_CHECK(v5.hash() == v6.hash());
-        }
-    } test_version_spec_ignore_case;
-
-    struct VersionSpecFlexibleDashesTest : TestCase
-    {
-        VersionSpecFlexibleDashesTest() : TestCase("flexible dashes") { }
+    }
+}
 
-        void run()
-        {
-            TEST_CHECK_THROWS(VersionSpec("1.2-alpha1", { }), BadVersionSpecError);
-            VersionSpec v1("1.2-alpha1", { vso_flexible_dashes });
-            VersionSpec v2("1.2_alpha1", { });
-            TEST_CHECK(v1 == v2);
-            TEST_CHECK(v1.hash() == v2.hash());
-
-            TEST_CHECK_THROWS(VersionSpec("1_scm", { }), BadVersionSpecError);
-            VersionSpec v3("1_scm", { vso_flexible_dashes });
-            VersionSpec v4("1-scm", { });
-            TEST_CHECK(v3 == v4);
-            TEST_CHECK(v3.hash() == v4.hash());
-
-            TEST_CHECK_THROWS(VersionSpec("1.2_r3", { }), BadVersionSpecError);
-            VersionSpec v5("1.2_r3", { vso_flexible_dashes });
-            VersionSpec v6("1.2-r3", { });
-            TEST_CHECK(v5 == v6);
-            TEST_CHECK(v5.hash() == v6.hash());
-
-            TEST_CHECK_THROWS(VersionSpec("1.23alpha4rc5", { }), BadVersionSpecError);
-            VersionSpec v7("1.23alpha4rc5", { vso_flexible_dashes });
-            VersionSpec v8("1.23_alpha4_rc5", { });
-            TEST_CHECK(v7 == v8);
-            TEST_CHECK(v7.hash() == v8.hash());
-        }
-    } test_version_spec_flexible_dashes;
+TEST(VersionSpec, Components)
+{
+    VersionSpec v1("1.2x_pre3_rc-scm", { });
+    VersionSpec::ConstIterator i(v1.begin()), i_end(v1.end());
+
+    ASSERT_TRUE(i != i_end);
+    EXPECT_EQ(vsct_number, i->type());
+    EXPECT_EQ("1", i->number_value());
+    EXPECT_EQ("1", i->text());
+    ++i;
+
+    ASSERT_TRUE(i != i_end);
+    EXPECT_EQ(vsct_number, i->type());
+    EXPECT_EQ("2", i->number_value());
+    EXPECT_EQ(".2", i->text());
+    ++i;
+
+    ASSERT_TRUE(i != i_end);
+    EXPECT_EQ(vsct_letter, i->type());
+    EXPECT_EQ("x", i->number_value());
+    EXPECT_EQ("x", i->text());
+    ++i;
+
+    ASSERT_TRUE(i != i_end);
+    EXPECT_EQ(vsct_pre, i->type());
+    EXPECT_EQ("3", i->number_value());
+    EXPECT_EQ("_pre3", i->text());
+    ++i;
+
+    ASSERT_TRUE(i != i_end);
+    EXPECT_EQ(vsct_rc, i->type());
+    EXPECT_EQ("MAX", i->number_value());
+    EXPECT_EQ("_rc", i->text());
+    ++i;
+
+    ASSERT_TRUE(i != i_end);
+    EXPECT_EQ(vsct_scm, i->type());
+    EXPECT_EQ("0", i->number_value());
+    EXPECT_EQ("-scm", i->text());
+    ++i;
+}
 
-    struct VersionSpecFlexibleDotsTest : TestCase
-    {
-        VersionSpecFlexibleDotsTest() : TestCase("flexible dots") { }
+TEST(VersionSpec, IgnoreCase)
+{
+    ASSERT_THROW(VersionSpec("1.2A", { }), BadVersionSpecError);
+    VersionSpec v1("1.2A", { vso_ignore_case });
+    VersionSpec v2("1.2a", { });
+    ASSERT_TRUE(v1 == v2);
+    ASSERT_TRUE(v1.hash() == v2.hash());
+
+    ASSERT_THROW(VersionSpec("1_ALPHA3", { }), BadVersionSpecError);
+    VersionSpec v3("1_ALPHA3", { vso_ignore_case });
+    VersionSpec v4("1_alpha3", { });
+    ASSERT_TRUE(v3 == v4);
+    ASSERT_TRUE(v3.hash() == v4.hash());
+
+    ASSERT_THROW(VersionSpec("SCM", { }), BadVersionSpecError);
+    VersionSpec v5("SCM", { vso_ignore_case });
+    VersionSpec v6("scm", { });
+    ASSERT_TRUE(v5 == v6);
+    ASSERT_TRUE(v5.hash() == v6.hash());
+}
 
-        void run()
-        {
-            TEST_CHECK_THROWS(VersionSpec("1.2-3_alpha4", { }), BadVersionSpecError);
-            VersionSpec v1("1.2-3_alpha4", { vso_flexible_dots });
-            VersionSpec v2("1.2.3_alpha4", { });
-            TEST_CHECK(v1 == v2);
-            TEST_CHECK(v1.hash() == v2.hash());
-
-            TEST_CHECK_THROWS(VersionSpec("1_2-3-4.5", { vso_flexible_dots }), BadVersionSpecError);
-            VersionSpec v3("1_2-3-4.5", { vso_flexible_dots, vso_flexible_dashes });
-            VersionSpec v4("1.2.3.4.5", { });
-            TEST_CHECK(v3 == v4);
-            TEST_CHECK(v3.hash() == v4.hash());
+TEST(VersionSpec, FlexibleDash)
+{
+    ASSERT_THROW(VersionSpec("1.2-alpha1", { }), BadVersionSpecError);
+    VersionSpec v1("1.2-alpha1", { vso_flexible_dashes });
+    VersionSpec v2("1.2_alpha1", { });
+    ASSERT_TRUE(v1 == v2);
+    ASSERT_TRUE(v1.hash() == v2.hash());
+
+    ASSERT_THROW(VersionSpec("1_scm", { }), BadVersionSpecError);
+    VersionSpec v3("1_scm", { vso_flexible_dashes });
+    VersionSpec v4("1-scm", { });
+    ASSERT_TRUE(v3 == v4);
+    ASSERT_TRUE(v3.hash() == v4.hash());
+
+    ASSERT_THROW(VersionSpec("1.2_r3", { }), BadVersionSpecError);
+    VersionSpec v5("1.2_r3", { vso_flexible_dashes });
+    VersionSpec v6("1.2-r3", { });
+    ASSERT_TRUE(v5 == v6);
+    ASSERT_TRUE(v5.hash() == v6.hash());
+
+    ASSERT_THROW(VersionSpec("1.23alpha4rc5", { }), BadVersionSpecError);
+    VersionSpec v7("1.23alpha4rc5", { vso_flexible_dashes });
+    VersionSpec v8("1.23_alpha4_rc5", { });
+    ASSERT_TRUE(v7 == v8);
+    ASSERT_TRUE(v7.hash() == v8.hash());
+}
 
-        }
-    } test_version_spec_flexible_dots;
+TEST(VersionSpec, FlexibleDots)
+{
+    ASSERT_THROW(VersionSpec("1.2-3_alpha4", { }), BadVersionSpecError);
+    VersionSpec v1("1.2-3_alpha4", { vso_flexible_dots });
+    VersionSpec v2("1.2.3_alpha4", { });
+    ASSERT_TRUE(v1 == v2);
+    ASSERT_TRUE(v1.hash() == v2.hash());
+
+    ASSERT_THROW(VersionSpec("1_2-3-4.5", { vso_flexible_dots }), BadVersionSpecError);
+    VersionSpec v3("1_2-3-4.5", { vso_flexible_dots, vso_flexible_dashes });
+    VersionSpec v4("1.2.3.4.5", { });
+    ASSERT_TRUE(v3 == v4);
+    ASSERT_TRUE(v3.hash() == v4.hash());
 
-    struct VersionSpecLeadingVTest : TestCase
-    {
-        VersionSpecLeadingVTest() : TestCase("leading v") { }
+}
 
-        void run()
-        {
-            TEST_CHECK_THROWS(VersionSpec("v1.2.3", { }), BadVersionSpecError);
-            VersionSpec v1("v1.2.3", { vso_ignore_leading_v });
-            VersionSpec v2("1.2.3", { });
-            VersionSpec v3("v.1.2.3", { vso_ignore_leading_v, vso_allow_leading_dot });
-            TEST_CHECK(v1 == v2);
-            TEST_CHECK(v1.hash() == v2.hash());
-            TEST_CHECK(v2 == v3);
-            TEST_CHECK(v2.hash() == v3.hash());
-        }
-    } test_version_spec_leading_v;
+TEST(VersionSpec, LeadingV)
+{
+    ASSERT_THROW(VersionSpec("v1.2.3", { }), BadVersionSpecError);
+    VersionSpec v1("v1.2.3", { vso_ignore_leading_v });
+    VersionSpec v2("1.2.3", { });
+    VersionSpec v3("v.1.2.3", { vso_ignore_leading_v, vso_allow_leading_dot });
+    ASSERT_TRUE(v1 == v2);
+    ASSERT_TRUE(v1.hash() == v2.hash());
+    ASSERT_TRUE(v2 == v3);
+    ASSERT_TRUE(v2.hash() == v3.hash());
 }