1 files changed, 37 insertions, 73 deletions

diff --git a/storage/src/tests/storageserver/configurable_bucket_resolver_test.cpp b/storage/src/tests/storageserver/configurable_bucket_resolver_test.cpp
index c10db0a1acd..5797074f892 100644
--- a/storage/src/tests/storageserver/configurable_bucket_resolver_test.cpp
+++ b/storage/src/tests/storageserver/configurable_bucket_resolver_test.cpp
@@ -3,26 +3,14 @@
 #include <vespa/storage/storageserver/configurable_bucket_resolver.h>
 #include <vespa/document/base/documentid.h>
 #include <vespa/document/bucket/fixed_bucket_spaces.h>
-#include <cppunit/extensions/HelperMacros.h>
+#include <vespa/vespalib/gtest/gtest.h>
 
 namespace storage {
 
 using document::DocumentId;
+using namespace ::testing;
 
-struct ConfigurableBucketResolverTest : CppUnit::TestFixture {
-    CPPUNIT_TEST_SUITE(ConfigurableBucketResolverTest);
-    CPPUNIT_TEST(bucket_space_from_name_is_defined_for_default_space);
-    CPPUNIT_TEST(bucket_space_from_name_is_defined_for_global_space);
-    CPPUNIT_TEST(bucket_space_from_name_throws_exception_for_unknown_space);
-    CPPUNIT_TEST(name_from_bucket_space_is_defined_for_default_space);
-    CPPUNIT_TEST(name_from_bucket_space_is_defined_for_global_space);
-    CPPUNIT_TEST(name_from_bucket_space_throws_exception_for_unknown_space);
-    CPPUNIT_TEST(known_bucket_space_is_resolved_from_document_id);
-    CPPUNIT_TEST(unknown_bucket_space_in_id_throws_exception);
-    CPPUNIT_TEST(can_create_resolver_from_bucket_space_config);
-    CPPUNIT_TEST(legacy_document_id_without_document_type_maps_to_default_space);
-    CPPUNIT_TEST_SUITE_END();
-
+struct ConfigurableBucketResolverTest : Test {
     using BucketSpaceMapping = ConfigurableBucketResolver::BucketSpaceMapping;
 
     BucketSpaceMapping create_simple_mapping() {
@@ -38,74 +26,50 @@ struct ConfigurableBucketResolverTest : CppUnit::TestFixture {
     ConfigurableBucketResolver create_simple_resolver() {
         return ConfigurableBucketResolver(create_simple_mapping());
     }
-
-    void bucket_space_from_name_is_defined_for_default_space();
-    void bucket_space_from_name_is_defined_for_global_space();
-    void bucket_space_from_name_throws_exception_for_unknown_space();
-    void name_from_bucket_space_is_defined_for_default_space();
-    void name_from_bucket_space_is_defined_for_global_space();
-    void name_from_bucket_space_throws_exception_for_unknown_space();
-    void known_bucket_space_is_resolved_from_document_id();
-    void unknown_bucket_space_in_id_throws_exception();
-    void can_create_resolver_from_bucket_space_config();
-    void legacy_document_id_without_document_type_maps_to_default_space();
 };
 
-CPPUNIT_TEST_SUITE_REGISTRATION(ConfigurableBucketResolverTest);
-
 // TODO reduce overlap with FixedBucketSpacesTest
-void ConfigurableBucketResolverTest::bucket_space_from_name_is_defined_for_default_space() {
+TEST_F(ConfigurableBucketResolverTest, bucket_space_from_name_is_defined_for_default_space) {
     auto space = create_empty_resolver().bucketSpaceFromName("default");
-    CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::default_space(), space);
+    EXPECT_EQ(document::FixedBucketSpaces::default_space(), space);
 }
 
-void ConfigurableBucketResolverTest::bucket_space_from_name_is_defined_for_global_space() {
+TEST_F(ConfigurableBucketResolverTest, bucket_space_from_name_is_defined_for_global_space) {
     auto space = create_empty_resolver().bucketSpaceFromName("global");
-    CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::global_space(), space);
+    EXPECT_EQ(document::FixedBucketSpaces::global_space(), space);
 }
 
-void ConfigurableBucketResolverTest::bucket_space_from_name_throws_exception_for_unknown_space() {
-    try {
-        create_empty_resolver().bucketSpaceFromName("bjarne");
-        CPPUNIT_FAIL("Expected exception on unknown bucket space name");
-    } catch (document::UnknownBucketSpaceException& e) {
-    }
+TEST_F(ConfigurableBucketResolverTest, bucket_space_from_name_throws_exception_for_unknown_space) {
+    EXPECT_THROW(create_empty_resolver().bucketSpaceFromName("bjarne"),
+                 document::UnknownBucketSpaceException);
 }
 
-void ConfigurableBucketResolverTest::name_from_bucket_space_is_defined_for_default_space() {
-    CPPUNIT_ASSERT_EQUAL(vespalib::string("default"),
-                         create_empty_resolver().nameFromBucketSpace(document::FixedBucketSpaces::default_space()));
+TEST_F(ConfigurableBucketResolverTest, name_from_bucket_space_is_defined_for_default_space) {
+    EXPECT_EQ("default", create_empty_resolver().nameFromBucketSpace(document::FixedBucketSpaces::default_space()));
 }
 
-void ConfigurableBucketResolverTest::name_from_bucket_space_is_defined_for_global_space() {
-    CPPUNIT_ASSERT_EQUAL(vespalib::string("global"),
-                         create_empty_resolver().nameFromBucketSpace(document::FixedBucketSpaces::global_space()));
+TEST_F(ConfigurableBucketResolverTest, name_from_bucket_space_is_defined_for_global_space) {
+    EXPECT_EQ("global", create_empty_resolver().nameFromBucketSpace(document::FixedBucketSpaces::global_space()));
 }
 
-void ConfigurableBucketResolverTest::name_from_bucket_space_throws_exception_for_unknown_space() {
-    try {
-        create_empty_resolver().nameFromBucketSpace(document::BucketSpace(1234));
-        CPPUNIT_FAIL("Expected exception on unknown bucket space value");
-    } catch (document::UnknownBucketSpaceException& e) {
-    }
+TEST_F(ConfigurableBucketResolverTest, name_from_bucket_space_throws_exception_for_unknown_space) {
+    EXPECT_THROW(create_empty_resolver().nameFromBucketSpace(document::BucketSpace(1234)),
+                 document::UnknownBucketSpaceException);
 }
 
-void ConfigurableBucketResolverTest::known_bucket_space_is_resolved_from_document_id() {
+TEST_F(ConfigurableBucketResolverTest, known_bucket_space_is_resolved_from_document_id) {
     auto resolver = create_simple_resolver();
-    CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::default_space(),
-                         resolver.bucketFromId(DocumentId("id::foo::xyz")).getBucketSpace());
-    CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::default_space(),
-                         resolver.bucketFromId(DocumentId("id::bar::xyz")).getBucketSpace());
-    CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::global_space(),
-                         resolver.bucketFromId(DocumentId("id::baz::xyz")).getBucketSpace());
+    EXPECT_EQ(document::FixedBucketSpaces::default_space(),
+              resolver.bucketFromId(DocumentId("id::foo::xyz")).getBucketSpace());
+    EXPECT_EQ(document::FixedBucketSpaces::default_space(),
+              resolver.bucketFromId(DocumentId("id::bar::xyz")).getBucketSpace());
+    EXPECT_EQ(document::FixedBucketSpaces::global_space(),
+              resolver.bucketFromId(DocumentId("id::baz::xyz")).getBucketSpace());
 }
 
-void ConfigurableBucketResolverTest::unknown_bucket_space_in_id_throws_exception() {
-    try {
-        create_simple_resolver().bucketFromId(DocumentId("id::bjarne::xyz"));
-        CPPUNIT_FAIL("Expected exception on unknown document type -> bucket space mapping");
-    } catch (document::UnknownBucketSpaceException& e) {
-    }
+TEST_F(ConfigurableBucketResolverTest, unknown_bucket_space_in_id_throws_exception) {
+    EXPECT_THROW(create_simple_resolver().bucketFromId(DocumentId("id::bjarne::xyz")),
+                 document::UnknownBucketSpaceException);
 }
 
 using BucketSpacesConfigBuilder = vespa::config::content::core::BucketspacesConfigBuilder;
@@ -121,24 +85,24 @@ BucketSpacesConfigBuilder::Documenttype make_doc_type(vespalib::stringref name,
 
 }
 
-void ConfigurableBucketResolverTest::can_create_resolver_from_bucket_space_config() {
+TEST_F(ConfigurableBucketResolverTest, can_create_resolver_from_bucket_space_config) {
     BucketSpacesConfigBuilder builder;
     builder.documenttype.emplace_back(make_doc_type("foo", "default"));
     builder.documenttype.emplace_back(make_doc_type("bar", "global"));
     builder.documenttype.emplace_back(make_doc_type("baz", "global"));
     auto resolver = ConfigurableBucketResolver::from_config(builder);
-    CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::default_space(),
-                         resolver->bucketFromId(DocumentId("id::foo::xyz")).getBucketSpace());
-    CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::global_space(),
-                         resolver->bucketFromId(DocumentId("id::bar::xyz")).getBucketSpace());
-    CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::global_space(),
-                         resolver->bucketFromId(DocumentId("id::baz::xyz")).getBucketSpace());
+    EXPECT_EQ(document::FixedBucketSpaces::default_space(),
+              resolver->bucketFromId(DocumentId("id::foo::xyz")).getBucketSpace());
+    EXPECT_EQ(document::FixedBucketSpaces::global_space(),
+              resolver->bucketFromId(DocumentId("id::bar::xyz")).getBucketSpace());
+    EXPECT_EQ(document::FixedBucketSpaces::global_space(),
+              resolver->bucketFromId(DocumentId("id::baz::xyz")).getBucketSpace());
 }
 
-void ConfigurableBucketResolverTest::legacy_document_id_without_document_type_maps_to_default_space() {
+TEST_F(ConfigurableBucketResolverTest, legacy_document_id_without_document_type_maps_to_default_space) {
     auto resolver = create_simple_resolver();
-    CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::default_space(),
-                         resolver.bucketFromId(DocumentId("userdoc:baz:1234:baz")).getBucketSpace());
+    EXPECT_EQ(document::FixedBucketSpaces::default_space(),
+              resolver.bucketFromId(DocumentId("userdoc:baz:1234:baz")).getBucketSpace());
 }
 
 }