WIP.

2 files changed, 11 insertions, 12 deletions

diff --git a/tests/pb/test_decoder.cc b/tests/pb/test_decoder.cc
index ec7a788..b2dd812 100644
--- a/tests/pb/test_decoder.cc
+++ b/tests/pb/test_decoder.cc
@@ -452,10 +452,10 @@ void callback(const void *closure, upb::Handlers* h_ptr) {
 const upb::Handlers *global_handlers;
 upb::pb::DecoderMethodPtr global_method;
 
-upb::pb::DecoderPtr CreateDecoder(upb::Environment* env,
+upb::pb::DecoderPtr CreateDecoder(upb::Arena* arena,
                                   upb::pb::DecoderMethodPtr method,
                                   upb::Sink sink) {
-  upb::pb::DecoderPtr ret = upb::pb::DecoderPtr::Create(env, method, sink);
+  upb::pb::DecoderPtr ret = upb::pb::DecoderPtr::Create(arena, method, sink);
   ret.set_max_nesting(MAX_NESTING);
   return ret;
 }
@@ -556,7 +556,7 @@ void do_run_decoder(VerboseParserEnvironment* env, upb::pb::DecoderPtr decoder,
 void run_decoder(const string& proto, const string* expected_output) {
   VerboseParserEnvironment env(filter_hash != 0);
   upb::Sink sink(global_handlers, &closures[0]);
-  upb::pb::DecoderPtr decoder = CreateDecoder(env.env(), global_method, sink);
+  upb::pb::DecoderPtr decoder = CreateDecoder(env.arena(), global_method, sink);
   env.ResetBytesSink(decoder.input());
   for (size_t i = 0; i < proto.size(); i++) {
     for (size_t j = i; j < UPB_MIN(proto.size(), i + 5); j++) {
@@ -872,10 +872,9 @@ void test_valid() {
   if (!filter_hash || filter_hash == testhash) {
     testhash = emptyhash;
     upb::Status status;
-    upb::Environment env;
-    env.ReportErrorsTo(&status);
+    upb::Arena arena;
     upb::Sink sink(global_handlers, &closures[0]);
-    upb::pb::DecoderPtr decoder = CreateDecoder(&env, global_method, sink);
+    upb::pb::DecoderPtr decoder = CreateDecoder(&arena, global_method, sink);
     output.clear();
     bool ok = upb::PutBuffer(std::string(), decoder.input());
     ASSERT(ok);
@@ -1161,7 +1160,8 @@ void test_emptyhandlers(upb::SymbolTable* symtab, bool allowjit) {
   for (int i = 0; testdata[i].data; i++) {
     VerboseParserEnvironment env(filter_hash != 0);
     upb::Sink sink(global_method.dest_handlers(), &closures[0]);
-    upb::pb::DecoderPtr decoder = CreateDecoder(env.env(), global_method, sink);
+    upb::pb::DecoderPtr decoder =
+        CreateDecoder(env.arena(), global_method, sink);
     env.ResetBytesSink(decoder.input());
     env.Reset(testdata[i].data, testdata[i].length, true, false);
     ASSERT(env.Start());
diff --git a/tests/pb/test_encoder.cc b/tests/pb/test_encoder.cc
index 35c0e1e..7145097 100644
--- a/tests/pb/test_encoder.cc
+++ b/tests/pb/test_encoder.cc
@@ -24,7 +24,7 @@ void test_pb_roundtrip() {
   upb::Arena arena;
   google_protobuf_FileDescriptorSet *set =
       google_protobuf_FileDescriptorSet_parsenew(
-          upb_stringview_make(input.c_str(), input.size()), &arena);
+          upb_stringview_make(input.c_str(), input.size()), arena.ptr());
   ASSERT(set);
   size_t n;
   const google_protobuf_FileDescriptorProto *const *files =
@@ -33,7 +33,7 @@ void test_pb_roundtrip() {
   upb::Status status;
   bool ok = symtab.AddFile(files[0], &status);
   if (!ok) {
-    fprintf(stderr, "Error building def: %s\n", upb_status_errmsg(&status));
+    fprintf(stderr, "Error building def: %s\n", status.error_message());
     ASSERT(false);
   }
   upb::MessageDefPtr md =
@@ -43,13 +43,12 @@ void test_pb_roundtrip() {
   ASSERT(encoder_handlers);
   const upb::pb::DecoderMethodPtr method = decoder_cache.Get(md);
 
-  upb::InlinedEnvironment<512> env;
   std::string output;
   upb::StringSink string_sink(&output);
   upb::pb::EncoderPtr encoder =
-      upb::pb::EncoderPtr::Create(&env, encoder_handlers, string_sink.input());
+      upb::pb::EncoderPtr::Create(&arena, encoder_handlers, string_sink.input());
   upb::pb::DecoderPtr decoder =
-      upb::pb::DecoderPtr::Create(&env, method, encoder.input());
+      upb::pb::DecoderPtr::Create(&arena, method, encoder.input());
   ok = upb::PutBuffer(input, decoder.input());
   ASSERT(ok);
   ASSERT(input == output);