hpb: update internal tests upb::arena -> hpb::arena

PiperOrigin-RevId: 759255007

Author: honglooker

hpb/internal/message_lock_test.cc

@@ -11,17 +11,15 @@
 #include <mutex>
 #include <string>
 #include <thread>
-#include <vector>
 
-#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include "absl/hash/hash.h"
 #include "absl/log/absl_check.h"
 #include "google/protobuf/compiler/hpb/tests/test_model.hpb.h"
+#include "google/protobuf/hpb/arena.h"
 #include "google/protobuf/hpb/extension.h"
 #include "google/protobuf/hpb/hpb.h"
 #include "upb/mem/arena.hpp"
-#include "upb/mini_table/extension.h"
 
 #ifndef ASSERT_OK
 #define ASSERT_OK(x) ASSERT_TRUE(x.ok())
@@ -44,7 +42,7 @@ std::string GenerateTestData() {
   extension2.set_ext_name("theme_extension");
   ABSL_CHECK_OK(
       ::hpb::SetExtension(&model, ThemeExtension::theme_extension, extension2));
-  ::upb::Arena arena;
+  hpb::Arena arena;
   auto bytes = ::hpb::Serialize(&model, arena);
   ABSL_CHECK_OK(bytes);
   return std::string(bytes->data(), bytes->size());
@@ -76,7 +74,7 @@ void TestConcurrentExtensionAccess(::hpb::ExtensionRegistry registry) {
     EXPECT_EQ((*ext)->ext_name(), "theme_extension");
   };
   const auto test_serialize = [&] {
-    ::upb::Arena arena;
+    hpb::Arena arena;
     EXPECT_OK(::hpb::Serialize(&parsed_model, arena));
   };
   const auto test_copy_constructor = [&] {

hpb_generator/tests/extension_test.cc

@@ -17,6 +17,7 @@
 #include "google/protobuf/compiler/hpb/tests/test_extension.hpb.h"
 #include "google/protobuf/compiler/hpb/tests/test_model.hpb.h"
 #include "google/protobuf/hpb/arena.h"
+#include "google/protobuf/hpb/hpb.h"
 #include "google/protobuf/hpb/requires.h"
 
 namespace {
@@ -427,8 +428,8 @@ TEST(CppGeneratedCode, Parse) {
   ThemeExtension extension1;
   extension1.set_ext_name("Hello World");
   EXPECT_EQ(true, ::hpb::SetExtension(&model, theme, extension1).ok());
-  ::upb::Arena arena;
-  auto bytes = ::hpb::Serialize(&model, arena);
+  hpb::Arena arena;
+  auto bytes = hpb::Serialize(&model, arena);
   EXPECT_EQ(true, bytes.ok());
   TestModel parsed_model = ::hpb::Parse<TestModel>(bytes.value()).value();
   EXPECT_EQ("Test123", parsed_model.str1());
@@ -441,7 +442,7 @@ TEST(CppGeneratedCode, ParseIntoPtrToModel) {
   ThemeExtension extension1;
   extension1.set_ext_name("Hello World");
   EXPECT_EQ(true, ::hpb::SetExtension(&model, theme, extension1).ok());
-  ::upb::Arena arena;
+  hpb::Arena arena;
   auto bytes = ::hpb::Serialize(&model, arena);
   EXPECT_EQ(true, bytes.ok());
   ::hpb::Ptr<TestModel> parsed_model = ::hpb::CreateMessage<TestModel>(arena);
@@ -461,7 +462,7 @@ TEST(CppGeneratedCode, ParseWithExtensionRegistry) {
   EXPECT_EQ(true, ::hpb::SetExtension(&model, ThemeExtension::theme_extension,
                                       extension1)
                       .ok());
-  ::upb::Arena arena;
+  hpb::Arena arena;
   auto bytes = ::hpb::Serialize(&model, arena);
   EXPECT_EQ(true, bytes.ok());
 

hpb_generator/tests/test_generated.cc

@@ -6,12 +6,9 @@
 // https://developers.google.com/open-source/licenses/bsd
 
 #include <cstdint>
-#include <iterator>
 #include <limits>
 #include <memory>
-#include <utility>
 
-#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
@@ -26,7 +23,6 @@
 #include "google/protobuf/hpb/hpb.h"
 #include "google/protobuf/hpb/ptr.h"
 #include "google/protobuf/hpb/requires.h"
-#include "upb/mem/arena.hpp"
 
 namespace {
 
@@ -412,18 +408,18 @@ TEST(CppGeneratedCode, MessageMapStringKeyAndInt32Value) {
 TEST(CppGeneratedCode, SerializeUsingArena) {
   TestModel model;
   model.set_str1("Hello World");
-  ::upb::Arena arena;
+  hpb::Arena arena;
   absl::StatusOr<absl::string_view> bytes = ::hpb::Serialize(&model, arena);
   EXPECT_EQ(true, bytes.ok());
   TestModel parsed_model = ::hpb::Parse<TestModel>(bytes.value()).value();
   EXPECT_EQ("Hello World", parsed_model.str1());
 }
 
 TEST(CppGeneratedCode, SerializeProxyUsingArena) {
-  ::upb::Arena message_arena;
+  hpb::Arena message_arena;
   TestModel::Proxy model_proxy = ::hpb::CreateMessage<TestModel>(message_arena);
   model_proxy.set_str1("Hello World");
-  ::upb::Arena arena;
+  hpb::Arena arena;
   absl::StatusOr<absl::string_view> bytes =
       ::hpb::Serialize(&model_proxy, arena);
   EXPECT_EQ(true, bytes.ok());
@@ -434,8 +430,8 @@ TEST(CppGeneratedCode, SerializeProxyUsingArena) {
 TEST(CppGeneratedCode, SerializeNestedMessageUsingArena) {
   TestModel model;
   model.mutable_recursive_child()->set_str1("Hello World");
-  ::upb::Arena arena;
-  ::hpb::Ptr<const TestModel> child = model.recursive_child();
+  hpb::Arena arena;
+  hpb::Ptr<const TestModel> child = model.recursive_child();
   absl::StatusOr<absl::string_view> bytes = ::hpb::Serialize(child, arena);
   EXPECT_EQ(true, bytes.ok());
   TestModel parsed_model = ::hpb::Parse<TestModel>(bytes.value()).value();
@@ -452,14 +448,14 @@ TEST(CppGeneratedCode, NameCollisions) {
 
 TEST(CppGeneratedCode, SharedPointer) {
   std::shared_ptr<TestModel> model = std::make_shared<TestModel>();
-  ::upb::Arena arena;
+  hpb::Arena arena;
   auto bytes = ::hpb::Serialize(model.get(), arena);
   EXPECT_TRUE(::hpb::Parse(model.get(), bytes.value()));
 }
 
 TEST(CppGeneratedCode, UniquePointer) {
   auto model = std::make_unique<TestModel>();
-  ::upb::Arena arena;
+  hpb::Arena arena;
   auto bytes = ::hpb::Serialize(model.get(), arena);
   EXPECT_TRUE(::hpb::Parse(model.get(), bytes.value()));
 }