From 172ec938ccf9126c1dd332488889a957595db925 Mon Sep 17 00:00:00 2001
From: Guthrie Adams <guthadam@amazon.com>
Date: Wed, 3 Nov 2021 17:28:12 -0500
Subject: [PATCH] moved AssetSystemStub to TestUtils folder

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
---
 Gems/Atom/RPI/Code/CMakeLists.txt                             | 2 +-
 Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.h              | 2 +-
 Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt        | 2 +-
 .../AtomToolsFramework/Code/Tests/AtomToolsFrameworkTest.cpp  | 2 +-
 Gems/Atom/Utils/Code/CMakeLists.txt                           | 2 +-
 .../Code/Include/Atom/Utils/{ => TestUtils}/AssetSystemStub.h | 0
 .../Utils/Code/Source/{ => TestUtils}/AssetSystemStub.cpp     | 2 +-
 Gems/Atom/Utils/Code/atom_utils_editor_files.cmake            | 4 ++--
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename Gems/Atom/Utils/Code/Include/Atom/Utils/{ => TestUtils}/AssetSystemStub.h (100%)
 rename Gems/Atom/Utils/Code/Source/{ => TestUtils}/AssetSystemStub.cpp (98%)

diff --git a/Gems/Atom/RPI/Code/CMakeLists.txt b/Gems/Atom/RPI/Code/CMakeLists.txt
index 7bf47d675a..f0459a23c2 100644
--- a/Gems/Atom/RPI/Code/CMakeLists.txt
+++ b/Gems/Atom/RPI/Code/CMakeLists.txt
@@ -160,7 +160,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
                 Gem::Atom_RPI.Public
                 Gem::Atom_RHI.Public
                 Gem::Atom_RPI.Edit
-                Gem::Atom_Utils.Editor.Static
+                Gem::Atom_Utils.TestUtils.Static
     )
     ly_add_googletest(
         NAME Gem::Atom_RPI.Tests
diff --git a/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.h b/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.h
index b745e55ee8..0707528d7f 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.h
+++ b/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.h
@@ -21,7 +21,7 @@
 #include <Common/AssetManagerTestFixture.h>
 #include <Common/RHI/Stubs.h>
 #include <Common/RHI/Factory.h>
-#include <Atom/Utils/AssetSystemStub.h>
+#include <Atom/Utils/TestUtils/AssetSystemStub.h>
 
 namespace UnitTest
 {
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt b/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt
index bb2ac1f513..40c8d7956e 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt
@@ -81,7 +81,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                 AZ::AzTest
                 AZ::AzTestShared
                 Gem::AtomToolsFramework.Static
-                Gem::Atom_Utils.Editor.Static
+                Gem::Atom_Utils.TestUtils.Static
     )
 
     ly_add_googletest(
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/AtomToolsFrameworkTest.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/AtomToolsFrameworkTest.cpp
index 349c2b9ced..df16cfbc43 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/AtomToolsFrameworkTest.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/AtomToolsFrameworkTest.cpp
@@ -7,7 +7,7 @@
  */
 
 #include <AzTest/AzTest.h>
-#include <Atom/Utils/AssetSystemStub.h>
+#include <Atom/Utils/TestUtils/AssetSystemStub.h>
 #include <AtomToolsFramework/Util/MaterialPropertyUtil.h>
 
 namespace UnitTest
diff --git a/Gems/Atom/Utils/Code/CMakeLists.txt b/Gems/Atom/Utils/Code/CMakeLists.txt
index cbdfb016a1..90d7ce501b 100644
--- a/Gems/Atom/Utils/Code/CMakeLists.txt
+++ b/Gems/Atom/Utils/Code/CMakeLists.txt
@@ -30,7 +30,7 @@ ly_add_target(
 if(PAL_TRAIT_BUILD_HOST_TOOLS)
 
     ly_add_target(
-        NAME Atom_Utils.Editor.Static STATIC
+        NAME Atom_Utils.TestUtils.Static STATIC
         NAMESPACE Gem
         FILES_CMAKE
             atom_utils_editor_files.cmake
diff --git a/Gems/Atom/Utils/Code/Include/Atom/Utils/AssetSystemStub.h b/Gems/Atom/Utils/Code/Include/Atom/Utils/TestUtils/AssetSystemStub.h
similarity index 100%
rename from Gems/Atom/Utils/Code/Include/Atom/Utils/AssetSystemStub.h
rename to Gems/Atom/Utils/Code/Include/Atom/Utils/TestUtils/AssetSystemStub.h
diff --git a/Gems/Atom/Utils/Code/Source/AssetSystemStub.cpp b/Gems/Atom/Utils/Code/Source/TestUtils/AssetSystemStub.cpp
similarity index 98%
rename from Gems/Atom/Utils/Code/Source/AssetSystemStub.cpp
rename to Gems/Atom/Utils/Code/Source/TestUtils/AssetSystemStub.cpp
index f026e8bcd7..d57969ea9c 100644
--- a/Gems/Atom/Utils/Code/Source/AssetSystemStub.cpp
+++ b/Gems/Atom/Utils/Code/Source/TestUtils/AssetSystemStub.cpp
@@ -6,7 +6,7 @@
  *
  */
 
-#include <Atom/Utils/AssetSystemStub.h>
+#include <Atom/Utils/TestUtils/AssetSystemStub.h>
 #include <AzFramework/StringFunc/StringFunc.h>
 
 namespace UnitTest
diff --git a/Gems/Atom/Utils/Code/atom_utils_editor_files.cmake b/Gems/Atom/Utils/Code/atom_utils_editor_files.cmake
index 7d7eb10e7c..6c4202fe09 100644
--- a/Gems/Atom/Utils/Code/atom_utils_editor_files.cmake
+++ b/Gems/Atom/Utils/Code/atom_utils_editor_files.cmake
@@ -7,6 +7,6 @@
 #
 
 set(FILES
-    Include/Atom/Utils/AssetSystemStub.h
-    Source/AssetSystemStub.cpp
+    Include/Atom/Utils/TestUtils/AssetSystemStub.h
+    Source/TestUtils/AssetSystemStub.cpp
 )