From 64993873c4de4525ff29983c513337bdb46d2001 Mon Sep 17 00:00:00 2001
From: Joey Parrish <joeyparrish@users.noreply.github.com>
Date: Mon, 24 Oct 2022 19:09:10 -0700
Subject: [PATCH] fix: Fix status library headers and move test (#1118)

For some reason, the status util unittest was in media/base/ instead of
status/

The broken headers in the status library were not obviously broken until
media/base/ porting started, and they were used for the first time.

Issue #1047 (CMake porting)
---
 packager/status/CMakeLists.txt                               | 1 +
 packager/status/status_macros.h                              | 2 +-
 packager/status/status_test_util.h                           | 2 +-
 packager/{media/base => status}/status_test_util_unittest.cc | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename packager/{media/base => status}/status_test_util_unittest.cc (94%)

diff --git a/packager/status/CMakeLists.txt b/packager/status/CMakeLists.txt
index 79db0dbbbf..dbb989a47a 100644
--- a/packager/status/CMakeLists.txt
+++ b/packager/status/CMakeLists.txt
@@ -15,6 +15,7 @@ if(LIBPACKAGER_SHARED)
 endif()
 
 add_executable(status_unittest
+    status_test_util_unittest.cc
     status_unittest.cc)
 target_link_libraries(status_unittest
     status
diff --git a/packager/status/status_macros.h b/packager/status/status_macros.h
index 3b15c997d0..177e039496 100644
--- a/packager/status/status_macros.h
+++ b/packager/status/status_macros.h
@@ -7,7 +7,7 @@
 #ifndef PACKAGER_STATUS_MACROS_H_
 #define PACKAGER_STATUS_MACROS_H_
 
-#include "packager/status.h"
+#include "packager/status/status.h"
 
 // Evaluates an expression that produces a `Status`. If the status is not
 // ok, returns it from the current function.
diff --git a/packager/status/status_test_util.h b/packager/status/status_test_util.h
index daf6e652d1..8fe5e69def 100644
--- a/packager/status/status_test_util.h
+++ b/packager/status/status_test_util.h
@@ -9,7 +9,7 @@
 
 #include <gtest/gtest.h>
 
-#include "packager/status.h"
+#include "packager/status/status.h"
 
 #define EXPECT_OK(val) EXPECT_EQ(shaka::Status::OK, (val))
 #define ASSERT_OK(val) ASSERT_EQ(shaka::Status::OK, (val))
diff --git a/packager/media/base/status_test_util_unittest.cc b/packager/status/status_test_util_unittest.cc
similarity index 94%
rename from packager/media/base/status_test_util_unittest.cc
rename to packager/status/status_test_util_unittest.cc
index eb0d469d20..ebab623843 100644
--- a/packager/media/base/status_test_util_unittest.cc
+++ b/packager/status/status_test_util_unittest.cc
@@ -6,7 +6,7 @@
 
 #include <gtest/gtest-spi.h>
 
-#include "packager/status_test_util.h"
+#include "packager/status/status_test_util.h"
 
 namespace shaka {
 namespace media {