[executorch] Migrate runtime/core tests to new namespace

Differential Revision: D60428952

Pull Request resolved: #4608

Author: dbort

runtime/core/test/array_ref_test.cpp

@@ -11,9 +11,7 @@
 #include <gtest/gtest.h>
 
 using namespace ::testing;
-
-namespace torch {
-namespace executor {
+using executorch::runtime::ArrayRef;
 
 TEST(TestArrayRef, ImplicitTypeConversion) {
   ArrayRef<int64_t> oneElement_1 = {1};
@@ -22,6 +20,3 @@ TEST(TestArrayRef, ImplicitTypeConversion) {
   ArrayRef<int64_t> oneElement_2 = 1;
   EXPECT_EQ(oneElement_2.size(), 1);
 }
-
-} // namespace executor
-} // namespace torch

runtime/core/test/error_handling_test.cpp

@@ -15,7 +15,8 @@
 #include <executorch/runtime/core/result.h>
 #include <executorch/runtime/platform/runtime.h>
 
-using namespace torch::executor;
+using executorch::runtime::Error;
+using executorch::runtime::Result;
 
 static void* test_ptr = static_cast<void*>((uintptr_t*)0xDEADBEEF);
 
@@ -189,7 +190,7 @@ TEST(ErrorHandlingTest, ResultNoCopy) {
 }
 
 TEST(ErrorHandlingTest, ResultMove) {
-  torch::executor::runtime_init();
+  executorch::runtime::runtime_init();
 
   Result<Movable> res = Movable(2);
   ASSERT_TRUE(res.ok());

runtime/core/test/evalue_test.cpp

@@ -15,9 +15,9 @@
 
 using namespace ::testing;
 using exec_aten::ScalarType;
-using torch::executor::BoxedEvalueList;
-using torch::executor::EValue;
-using torch::executor::Tag;
+using executorch::runtime::BoxedEvalueList;
+using executorch::runtime::EValue;
+using executorch::runtime::Tag;
 using torch::executor::testing::TensorFactory;
 
 TEST(TestEValue, CopyTrivialType) {

runtime/core/test/event_tracer_test.cpp

@@ -8,16 +8,26 @@
 
 #include <gtest/gtest.h>
 
+#include <executorch/runtime/core/array_ref.h>
+#include <executorch/runtime/core/evalue.h>
 #include <executorch/runtime/core/event_tracer.h>
 // Enable flag for test
 #define ET_EVENT_TRACER_ENABLED
 #include <executorch/runtime/core/event_tracer_hooks.h>
 #include <executorch/runtime/core/event_tracer_hooks_delegate.h>
 
-namespace torch {
-namespace executor {
-
-using namespace internal;
+using exec_aten::Tensor;
+using executorch::runtime::AllocatorID;
+using executorch::runtime::ArrayRef;
+using executorch::runtime::ChainID;
+using executorch::runtime::DebugHandle;
+using executorch::runtime::EValue;
+using executorch::runtime::EventTracer;
+using executorch::runtime::EventTracerDebugLogLevel;
+using executorch::runtime::EventTracerEntry;
+using executorch::runtime::kUnsetChainId;
+using executorch::runtime::kUnsetDebugHandle;
+using executorch::runtime::LoggedEValueType;
 
 class DummyEventTracer : public EventTracer {
  public:
@@ -159,6 +169,14 @@ class DummyEventTracer : public EventTracer {
  * Exercise all the event_tracer API's for a basic sanity check.
  */
 void RunSimpleTracerTest(EventTracer* event_tracer) {
+  using executorch::runtime::internal::event_tracer_begin_profiling_event;
+  using executorch::runtime::internal::event_tracer_create_event_block;
+  using executorch::runtime::internal::event_tracer_end_profiling_event;
+  using executorch::runtime::internal::event_tracer_track_allocation;
+  using executorch::runtime::internal::event_tracer_track_allocator;
+  using executorch::runtime::internal::EventTracerProfileInstructionScope;
+  using executorch::runtime::internal::EventTracerProfileScope;
+
   event_tracer_create_event_block(event_tracer, "ExampleEvent");
   event_tracer_create_event_block(event_tracer, "ExampleEvent");
   EventTracerEntry event_entry =
@@ -216,6 +234,9 @@ TEST(TestEventTracer, SimpleEventTracerTestDelegate) {
 }
 
 TEST(TestEventTracer, SimpleEventTracerTestLogging) {
+  using executorch::runtime::internal::event_tracer_log_evalue;
+  using executorch::runtime::internal::event_tracer_log_evalue_output;
+
   EValue test_eval(true);
 
   {
@@ -259,8 +280,5 @@ TEST(TestEventTracer, SimpleEventTracerTestLogging) {
   event_tracer_log_evalue_output(nullptr, test_eval);
 }
 
-} // namespace executor
-} // namespace torch
-
-// TODO : (T163645377) Add more test coverage to log and verify events passed
-// into DummyTracer.
+// TODO(T163645377): Add more test coverage to log and verify events passed into
+// DummyTracer.

runtime/core/test/freeable_buffer_test.cpp

@@ -11,7 +11,7 @@
 #include <gtest/gtest.h>
 
 using namespace ::testing;
-using torch::executor::FreeableBuffer;
+using executorch::runtime::FreeableBuffer;
 
 struct FreeCallArgs {
   size_t calls;

runtime/core/test/hierarchical_allocator_test.cpp

@@ -17,18 +17,18 @@
 #include <gtest/gtest.h>
 
 using namespace ::testing;
-using torch::executor::Error;
-using torch::executor::HierarchicalAllocator;
-using torch::executor::MemoryAllocator;
-using torch::executor::Result;
-using torch::executor::Span;
+using executorch::runtime::Error;
+using executorch::runtime::HierarchicalAllocator;
+using executorch::runtime::MemoryAllocator;
+using executorch::runtime::Result;
+using executorch::runtime::Span;
 
 class HierarchicalAllocatorTest : public ::testing::Test {
  protected:
   void SetUp() override {
     // Since these tests cause ET_LOG to be called, the PAL must be initialized
     // first.
-    torch::executor::runtime_init();
+    executorch::runtime::runtime_init();
   }
 };
 

runtime/core/test/memory_allocator_test.cpp

@@ -16,8 +16,8 @@
 #include <gtest/gtest.h>
 
 using namespace ::testing;
-using torch::executor::Error;
-using torch::executor::MemoryAllocator;
+using executorch::runtime::Error;
+using executorch::runtime::MemoryAllocator;
 
 struct TestType8 {
   char data[8];
@@ -34,7 +34,7 @@ class MemoryAllocatorTest : public ::testing::Test {
   void SetUp() override {
     // Since these tests cause ET_LOG to be called, the PAL must be initialized
     // first.
-    torch::executor::runtime_init();
+    executorch::runtime::runtime_init();
   }
 };
 
@@ -201,7 +201,7 @@ class HelperMacrosTest : public ::testing::Test {
   void SetUp() override {
     // Since these tests cause ET_LOG to be called, the PAL must be initialized
     // first.
-    torch::executor::runtime_init();
+    executorch::runtime::runtime_init();
   }
 };
 

runtime/core/test/span_test.cpp

@@ -12,9 +12,7 @@
 #include <gtest/gtest.h>
 
 using namespace ::testing;
-
-namespace torch {
-namespace executor {
+using executorch::runtime::Span;
 
 TEST(SpanTest, Ctors) {
   int64_t x[2] = {1, 2};
@@ -64,6 +62,3 @@ TEST(SpanTest, TriviallyCopyable) {
   EXPECT_EQ(span.size(), span_copy.size());
   EXPECT_TRUE(std::is_trivially_copyable<Span<int64_t>>::value);
 }
-
-} // namespace executor
-} // namespace torch

runtime/core/test/tensor_shape_dynamism_test_aten.cpp

@@ -11,8 +11,7 @@
 #include <gtest/gtest.h>
 
 using namespace ::testing;
-
-using torch::executor::TensorShapeDynamism;
+using executorch::runtime::TensorShapeDynamism;
 
 TEST(TensorShapeDynamismTest, CanBuildInATenMode) {
   // Demonstrate that aten mode can include the header and see the enum. If this