Unified buffer index tests to regular and eval tensor initiation

Author: ilya-kupchenko

tensorflow/lite/micro/micro_allocator.cc

@@ -1134,6 +1134,7 @@ TfLiteStatus MicroAllocator::PopulateTfLiteTensorFromFlatbuffer(
   // TODO(b/162311891): This method serves as a stub to ensure quantized
   // allocations in the tail can be recorded. Once the interpreter has APIs for
   // accessing buffers on TfLiteEvalTensor this method can be dropped.
+  
   // Validate subgraph and tensor indices before dereferencing FlatBuffer
   // vectors to avoid out-of-bounds access.
   if (subgraph_idx < 0 ||

tensorflow/lite/micro/micro_allocator_test.cc

@@ -1388,7 +1388,7 @@ TF_LITE_MICRO_TEST(TestMultiSubgraphNumScratchAllocations) {
 // New tests validating invalid buffer index guards in tensor initialization
 // and model allocation paths.
 
-TF_LITE_MICRO_TEST(InitializeTfLiteTensorFromFlatbuffer_InvalidBufferIndexReturnsError) {
+TF_LITE_MICRO_TEST(TestInitializeTensorInvalidBufferIndex) {
   // Arena and allocator for temporary/persistent allocations used by init.
   constexpr size_t arena_size = 1024;
   uint8_t arena[arena_size];
@@ -1415,44 +1415,21 @@ TF_LITE_MICRO_TEST(InitializeTfLiteTensorFromFlatbuffer_InvalidBufferIndexReturn
       tflite::testing::CreateFlatbufferBuffers();
 
   TfLiteTensor out_tensor;
+  TfLiteEvalTensor out_eval_tensor;
+
   // Expect kTfLiteError due to invalid buffer index.
   TF_LITE_MICRO_EXPECT_EQ(
       kTfLiteError,
       tflite::internal::InitializeTfLiteTensorFromFlatbuffer(
           simple_allocator, simple_allocator, /*allocate_temp=*/false,
           *bad_tensor, buffers, &out_tensor));
-
-  simple_allocator->~SingleArenaBufferAllocator();
-}
-
-TF_LITE_MICRO_TEST(InitializeTfLiteEvalTensorFromFlatbuffer_InvalidBufferIndexReturnsError) {
-  // Build a flatbuffer Tensor that references a non-existent buffer index.
-  flatbuffers::FlatBufferBuilder builder;
-  const int32_t dims_data[] = {1};
-  auto dims_vec = builder.CreateVector(dims_data, 1);
-  const uint32_t kInvalidBufferIndex = 7;
-  auto name_str = builder.CreateString("invalid_eval_buffer_tensor");
-  auto tensor_offset = tflite::CreateTensor(
-      builder, /*shape=*/dims_vec, tflite::TensorType_INT32,
-      /*buffer=*/kInvalidBufferIndex, /*name=*/name_str,
-      /*quantization=*/0, /*is_variable=*/false, /*sparsity=*/0);
-  builder.Finish(tensor_offset);
-  const tflite::Tensor* bad_tensor =
-      flatbuffers::GetRoot<tflite::Tensor>(builder.GetBufferPointer());
-
-  // Create a buffers vector with a single empty buffer.
-  const flatbuffers::Vector<flatbuffers::Offset<tflite::Buffer>>* buffers =
-      tflite::testing::CreateFlatbufferBuffers();
-
-  TfLiteEvalTensor out_eval_tensor;
-  // Expect kTfLiteError due to invalid buffer index.
   TF_LITE_MICRO_EXPECT_EQ(
       kTfLiteError,
       tflite::internal::InitializeTfLiteEvalTensorFromFlatbuffer(
           *bad_tensor, buffers, &out_eval_tensor));
 }
 
-TF_LITE_MICRO_TEST(StartModelAllocation_FailsWhenSubgraphHasTensorWithInvalidBufferIndex) {
+TF_LITE_MICRO_TEST(TestModelAllocationSubgraphInvalidBufferIndex) {
   // Build a minimal model with a single tensor that references an invalid
   // buffer index. Make it an output tensor to mimic output-table invalid case
   // but the allocator will validate all tensors equally, so this also