Changeset 101291 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/UnitTestFrameworkPkg

Timestamp:

Sep 27, 2023 1:34:02 PM (17 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

159276

Message:

EFI/FirmwareNew: Make edk2-stable202308 build on all supported platforms (using gcc at least, msvc not tested yet), bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• UnitTestFrameworkPkg/Include/Library/FunctionMockLib.h (added)
• UnitTestFrameworkPkg/Include/Library/GoogleTestLib.h (modified) (1 diff)
• UnitTestFrameworkPkg/Include/Library/SubhookLib.h (added)
• UnitTestFrameworkPkg/Library/CmockaLib/CmockaLib.inf (modified) (1 diff)
• UnitTestFrameworkPkg/Library/FunctionMockLib (added)
• UnitTestFrameworkPkg/Library/FunctionMockLib/FunctionMockLib.c (added)
• UnitTestFrameworkPkg/Library/FunctionMockLib/FunctionMockLib.inf (added)
• UnitTestFrameworkPkg/Library/FunctionMockLib/FunctionMockLib.uni (added)
• UnitTestFrameworkPkg/Library/GoogleTestLib/GoogleTestLib.inf (modified) (1 diff)
• UnitTestFrameworkPkg/Library/GoogleTestLib/GoogleTestLib.uni (modified) (1 diff)
• UnitTestFrameworkPkg/Library/SubhookLib (added)
• UnitTestFrameworkPkg/Library/SubhookLib/SubhookLib.inf (added)
• UnitTestFrameworkPkg/Library/SubhookLib/SubhookLib.uni (added)
• UnitTestFrameworkPkg/Library/SubhookLib/subhook (added)
• UnitTestFrameworkPkg/Library/UnitTestBootLibUsbClass/UnitTestBootLibUsbClass.c (modified) (4 diffs)
• UnitTestFrameworkPkg/Library/UnitTestLib/Log.c (modified) (1 diff)
• UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLib.c (modified) (2 diffs)
• UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib (added)
• UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLib.c (added)
• UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLib.h (added)
• UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLib.inf (added)
• UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLib.uni (added)
• UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLibHob.c (added)
• UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLibMisc.c (added)
• UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLibPpi.c (added)
• UnitTestFrameworkPkg/Library/UnitTestPersistenceLibSimpleFileSystem/UnitTestPersistenceLibSimpleFileSystem.c (modified) (27 diffs)
• UnitTestFrameworkPkg/Library/UnitTestResultReportLib/UnitTestResultReportLib.c (modified) (1 diff)
• UnitTestFrameworkPkg/Library/UnitTestResultReportLib/UnitTestResultReportLibConOut.c (modified) (1 diff)
• UnitTestFrameworkPkg/Library/UnitTestResultReportLib/UnitTestResultReportLibDebugLib.c (modified) (1 diff)
• UnitTestFrameworkPkg/ReadMe.md (modified) (24 diffs)
• UnitTestFrameworkPkg/Test/UnitTestFrameworkPkgHostTest.dsc (modified) (1 diff)
• UnitTestFrameworkPkg/UnitTestFrameworkPkg.ci.yaml (modified) (1 diff)
• UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec (modified) (3 diffs)
• UnitTestFrameworkPkg/UnitTestFrameworkPkg.dsc (modified) (1 diff)
• UnitTestFrameworkPkg/UnitTestFrameworkPkgHost.dsc.inc (modified) (1 diff)

trunk/src/VBox/Devices/EFI/FirmwareNew/UnitTestFrameworkPkg/Include/Library/GoogleTestLib.h

@@ -11 +11 @@
 
 #include <gtest/gtest.h>
+#include <gmock/gmock.h>
+#include <cstring>
+
+extern "C" {
+#include <Uefi.h>
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// Below are the action extensions to GoogleTest and gmock for EDK2 types.
+// These actions are intended to be used in EXPECT_CALL (and related gmock
+// macros) to support assignments to output arguments in the expected call.
+//
+
+// Action to support pointer types to a buffer (such as UINT8* or VOID*)
+ACTION_TEMPLATE (
+  SetArgBuffer,
+  HAS_1_TEMPLATE_PARAMS (size_t, ArgNum),
+  AND_2_VALUE_PARAMS (Buffer, ByteSize)
+  ) {
+  auto  ArgBuffer = std::get<ArgNum>(args);
+
+  std::memcpy (ArgBuffer, Buffer, ByteSize);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// Below are the matcher extensions to GoogleTest and gmock for EDK2 types.
+// These matchers are intended to be used in EXPECT_CALL (and related gmock
+// macros) to support comparisons to input arguments in the expected call.
+//
+// Note that these matchers can also be used in the EXPECT_THAT or ASSERT_THAT
+// macros to compare whether two values are equal.
+//
+
+// Matcher to support pointer types to a buffer (such as UINT8* or VOID* or
+// any structure pointer)
+MATCHER_P2 (
+  BufferEq,
+  Buffer,
+  ByteSize,
+  std::string ("buffer data to ") + (negation ? "not " : "") + "be the same"
+  ) {
+  UINT8  *Actual   = (UINT8 *)arg;
+  UINT8  *Expected = (UINT8 *)Buffer;
+
+  for (size_t i = 0; i < ByteSize; i++) {
+    if (Actual[i] != Expected[i]) {
+      *result_listener << "byte at offset " << i
+      << " does not match expected. [" << std::hex
+      << "Actual: 0x" << std::setw (2) << std::setfill ('0')
+      << (unsigned int)Actual[i] << ", "
+      << "Expected: 0x" << std::setw (2) << std::setfill ('0')
+      << (unsigned int)Expected[i] << "]";
+      return false;
+    }
+  }
+
+  *result_listener << "all bytes match";
+  return true;
+}
+
+// Matcher to support CHAR16* type
+MATCHER_P (
+  Char16StrEq,
+  String,
+  std::string ("strings to ") + (negation ? "not " : "") + "be the same"
+  ) {
+  CHAR16  *Actual   = (CHAR16 *)arg;
+  CHAR16  *Expected = (CHAR16 *)String;
+
+  for (size_t i = 0; Actual[i] != 0; i++) {
+    if (Actual[i] != Expected[i]) {
+      *result_listener << "character at offset " << i
+      << " does not match expected. [" << std::hex
+      << "Actual: 0x" << std::setw (4) << std::setfill ('0')
+      << Actual[i];
+
+      if (std::isprint (Actual[i])) {
+        *result_listener << " ('" << (char)Actual[i] << "')";
+      }
+
+      *result_listener << ", Expected: 0x" << std::setw (4) << std::setfill ('0')
+      << Expected[i];
+
+      if (std::isprint (Expected[i])) {
+        *result_listener << " ('" << (char)Expected[i] << "')";
+      }
+
+      *result_listener << "]";
+
+      return false;
+    }
+  }
+
+  *result_listener << "strings match";
+  return true;
+}
 
 #endif

trunk/src/VBox/Devices/EFI/FirmwareNew/UnitTestFrameworkPkg/Library/CmockaLib/CmockaLib.inf

@@ -17 +17 @@
 
 #
-#  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64
+#  VALID_ARCHITECTURES           = IA32 X64
 #
 

trunk/src/VBox/Devices/EFI/FirmwareNew/UnitTestFrameworkPkg/Library/GoogleTestLib/GoogleTestLib.inf

@@ -8 +8 @@
 
 [Defines]
-  INF_VERSION     = 0x00010005
+  INF_VERSION     = 0x00010018
   BASE_NAME       = GoogleTestLib
   MODULE_UNI_FILE = GoogleTestLib.uni
   FILE_GUID       = A90E4751-AD30-43CC-980B-01E356B49ADF
-  MODULE_TYPE     = BASE
+  MODULE_TYPE     = HOST_APPLICATION
   VERSION_STRING  = 0.1
-  LIBRARY_CLASS   = GoogleTestLib|HOST_APPLICATION
+  LIBRARY_CLASS   = GoogleTestLib
 
 #
-#  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64
+#  VALID_ARCHITECTURES           = IA32 X64
 #
 
 [Sources]
   googletest/googletest/src/gtest-all.cc
+  googletest/googlemock/src/gmock-all.cc
 
 [Packages]
+  MdePkg/MdePkg.dec
   UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec
 
 [BuildOptions]
-  MSFT:*_*_*_CC_FLAGS     == /c /EHsc /Zi
-  MSFT:NOOPT_*_*_CC_FLAGS =  /Od
-
-  GCC:*_*_*_CC_FLAGS     == -g -c
-
-  GCC:NOOPT_*_*_CC_FLAGS =  -O0
-  GCC:*_*_IA32_CC_FLAGS  =  -m32
-  GCC:*_*_X64_CC_FLAGS   =  -m64
+  MSFT:*_*_*_CC_FLAGS   == /c /EHsc /Zi /Od
+  GCC:*_*_IA32_CC_FLAGS == -g -c -fshort-wchar -O0 -m32
+  GCC:*_*_X64_CC_FLAGS  == -g -c -fshort-wchar -O0 -m64

trunk/src/VBox/Devices/EFI/FirmwareNew/UnitTestFrameworkPkg/Library/GoogleTestLib/GoogleTestLib.uni

@@ -2 +2 @@
 // This module provides GoogleTest Library implementation.
 //
-// This module provides GoogleTest Library implementation.
-//
 // Copyright (c) 2022, Intel Corporation. All rights reserved.<BR>
-//
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 //

trunk/src/VBox/Devices/EFI/FirmwareNew/UnitTestFrameworkPkg/Library/UnitTestBootLibUsbClass/UnitTestBootLibUsbClass.c

@@ -62 +62 @@
   DpEnd = AppendDevicePathNode (NULL, NULL);
   if (DpEnd == NULL) {
-    DEBUG ((DEBUG_ERROR, "%a: Unable to create device path.  DpEnd is NULL.\n", __FUNCTION__));
+    DEBUG ((DEBUG_ERROR, "%a: Unable to create device path.  DpEnd is NULL.\n", __func__));
     Status = EFI_OUT_OF_RESOURCES;
     goto CLEANUP;
@@ -73 +73 @@
          );
   if (Dp == NULL) {
-    DEBUG ((DEBUG_ERROR, "%a: Unable to create device path.  Dp is NULL.\n", __FUNCTION__));
+    DEBUG ((DEBUG_ERROR, "%a: Unable to create device path.  Dp is NULL.\n", __func__));
     Status = EFI_OUT_OF_RESOURCES;
     goto CLEANUP;
@@ -89 +89 @@
              );
   if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_ERROR, "%a: Error creating load option.  Status = %r\n", __FUNCTION__, Status));
+    DEBUG ((DEBUG_ERROR, "%a: Error creating load option.  Status = %r\n", __func__, Status));
     goto CLEANUP;
   }
 
   NewOptionValid = TRUE;
-  DEBUG ((DEBUG_VERBOSE, "%a: Generic USB Class Device boot option created.\n", __FUNCTION__));
+  DEBUG ((DEBUG_VERBOSE, "%a: Generic USB Class Device boot option created.\n", __func__));
   Status = EfiBootManagerLoadOptionToVariable (&NewOption);
   if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_ERROR, "%a: Error Saving boot option NV variable. Status = %r\n", __FUNCTION__, Status));
+    DEBUG ((DEBUG_ERROR, "%a: Error Saving boot option NV variable. Status = %r\n", __func__, Status));
     goto CLEANUP;
   }
@@ -112 +112 @@
                   );
 
-  DEBUG ((DEBUG_VERBOSE, "%a - Set BootNext Status (%r)\n", __FUNCTION__, Status));
+  DEBUG ((DEBUG_VERBOSE, "%a - Set BootNext Status (%r)\n", __func__, Status));
 
 CLEANUP:

trunk/src/VBox/Devices/EFI/FirmwareNew/UnitTestFrameworkPkg/Library/UnitTestLib/Log.c

@@ -119 +119 @@
   //
   if (Test == NULL) {
-    DEBUG ((DEBUG_ERROR, "%a called with invalid Test parameter\n", __FUNCTION__));
+    DEBUG ((DEBUG_ERROR, "%a called with invalid Test parameter\n", __func__));
     return;
   }

trunk/src/VBox/Devices/EFI/FirmwareNew/UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLib.c

@@ -275 +275 @@
       // Don't actually report it as an error, but emit a warning.
       //
-      DEBUG ((DEBUG_ERROR, "%a - Cache was detected, but failed to load.\n", __FUNCTION__));
+      DEBUG ((DEBUG_ERROR, "%a - Cache was detected, but failed to load.\n", __func__));
       Status = EFI_SUCCESS;
     }
@@ -857 +857 @@
   Status = SaveUnitTestCache (FrameworkHandle, Header, Header->SaveStateSize);
   if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_ERROR, "%a - Could not save state! %r\n", __FUNCTION__, Status));
+    DEBUG ((DEBUG_ERROR, "%a - Could not save state! %r\n", __func__, Status));
     Status = EFI_DEVICE_ERROR;
   }

trunk/src/VBox/Devices/EFI/FirmwareNew/UnitTestFrameworkPkg/Library/UnitTestPersistenceLibSimpleFileSystem/UnitTestPersistenceLibSimpleFileSystem.c

@@ -17 +17 @@
 #include <Library/DevicePathLib.h>
 #include <Library/ShellLib.h>
+#include <Library/UefiLib.h>
 #include <Protocol/LoadedImage.h>
 #include <UnitTestFrameworkTypes.h>
@@ -22 +23 @@
 #define CACHE_FILE_SUFFIX  L"_Cache.dat"
 
+CHAR16  *mCachePath = NULL;
+
 /**
-  Generate the device path to the cache file.
+  Generate the file name and path to the cache file.
 
   @param[in]  FrameworkHandle  A pointer to the framework that is being persisted.
@@ -32 +35 @@
 **/
 STATIC
-EFI_DEVICE_PATH_PROTOCOL *
-GetCacheFileDevicePath (
+CHAR16 *
+GetCacheFileName (
   IN UNIT_TEST_FRAMEWORK_HANDLE  FrameworkHandle
   )
@@ -45 +48 @@
   UINTN                      DirectorySlashOffset;
   UINTN                      CacheFilePathLength;
-  EFI_DEVICE_PATH_PROTOCOL   *CacheFileDevicePath;
-
-  Framework           = (UNIT_TEST_FRAMEWORK *)FrameworkHandle;
-  AppPath             = NULL;
-  CacheFilePath       = NULL;
-  TestName            = NULL;
-  CacheFileDevicePath = NULL;
+
+  Framework     = (UNIT_TEST_FRAMEWORK *)FrameworkHandle;
+  AppPath       = NULL;
+  CacheFilePath = NULL;
+  TestName      = NULL;
 
   //
@@ -62 +63 @@
                   );
   if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_WARN, "%a - Failed to locate DevicePath for loaded image. %r\n", __FUNCTION__, Status));
+    DEBUG ((DEBUG_WARN, "%a - Failed to locate DevicePath for loaded image. %r\n", __func__, Status));
     return NULL;
   }
@@ -86 +87 @@
   //     if (PathRemoveLastItem (FileNameCopy)) {
   //
-  AppPath              = ConvertDevicePathToText (LoadedImage->FilePath, TRUE, TRUE); // NOTE: This must be freed.
-  DirectorySlashOffset = StrLen (AppPath);
-  //
-  // Make sure we didn't get any weird data.
-  //
-  if (DirectorySlashOffset == 0) {
-    DEBUG ((DEBUG_ERROR, "%a - Weird 0-length string when processing app path.\n", __FUNCTION__));
-    goto Exit;
-  }
-
-  //
-  // Now that we know we have a decent string, let's take a deeper look.
-  //
-  do {
-    if (AppPath[DirectorySlashOffset] == L'\\') {
-      break;
-    }
-
-    DirectorySlashOffset--;
-  } while (DirectorySlashOffset > 0);
-
-  //
-  // After that little maneuver, DirectorySlashOffset should be pointing at the last '\' in AppString.
-  // That would be the path to the parent directory that the test app is executing from.
-  // Let's check and make sure that's right.
-  //
-  if (AppPath[DirectorySlashOffset] != L'\\') {
-    DEBUG ((DEBUG_ERROR, "%a - Could not find a single directory separator in app path.\n", __FUNCTION__));
-    goto Exit;
+  if (mCachePath == NULL) {
+    AppPath = ConvertDevicePathToText (LoadedImage->FilePath, TRUE, TRUE); // NOTE: This must be freed.
+    if (AppPath == NULL) {
+      goto Exit;
+    }
+
+    DirectorySlashOffset = StrLen (AppPath);
+    //
+    // Make sure we didn't get any weird data.
+    //
+    if (DirectorySlashOffset == 0) {
+      DEBUG ((DEBUG_ERROR, "%a - Weird 0-length string when processing app path.\n", __func__));
+      goto Exit;
+    }
+
+    //
+    // Now that we know we have a decent string, let's take a deeper look.
+    //
+    do {
+      if (AppPath[DirectorySlashOffset] == L'\\') {
+        break;
+      }
+
+      DirectorySlashOffset--;
+    } while (DirectorySlashOffset > 0);
+
+    //
+    // After that little maneuver, DirectorySlashOffset should be pointing at the last '\' in AppString.
+    // That would be the path to the parent directory that the test app is executing from.
+    // Let's check and make sure that's right.
+    //
+    if (AppPath[DirectorySlashOffset] != L'\\') {
+      DEBUG ((DEBUG_ERROR, "%a - Could not find a single directory separator in app path.\n", __func__));
+      goto Exit;
+    }
+  } else {
+    AppPath = FullyQualifyPath (mCachePath); // NOTE: This must be freed.
+    if (AppPath == NULL) {
+      goto Exit;
+    }
+
+    DirectorySlashOffset = StrLen (AppPath);
+
+    if (AppPath[DirectorySlashOffset - 1] != L'\\') {
+      // Set the slash if user did not specify it on the newly allocated pool
+      AppPath = ReallocatePool (
+                  (DirectorySlashOffset + 1) * sizeof (CHAR16),
+                  (DirectorySlashOffset + 2) * sizeof (CHAR16),
+                  AppPath
+                  );
+      AppPath[DirectorySlashOffset]     = L'\\';
+      AppPath[DirectorySlashOffset + 1] = L'\0';
+    } else {
+      // Otherwise the user input is good enough to go, mostly
+      DirectorySlashOffset--;
+    }
   }
 
@@ -136 +164 @@
   StrCatS (CacheFilePath, CacheFilePathLength, CACHE_FILE_SUFFIX);                   // Copy the file suffix.
 
-  //
-  // Finally, try to create the device path for the thing thing.
-  //
-  CacheFileDevicePath = FileDevicePath (LoadedImage->DeviceHandle, CacheFilePath);
-
 Exit:
   //
@@ -149 +172 @@
   }
 
-  if (CacheFilePath != NULL) {
-    FreePool (CacheFilePath);
-  }
-
   if (TestName != NULL) {
     FreePool (TestName);
   }
 
-  return CacheFileDevicePath;
+  return CacheFilePath;
 }
 
@@ -176 +195 @@
   )
 {
-  EFI_DEVICE_PATH_PROTOCOL  *FileDevicePath;
-  EFI_STATUS                Status;
-  SHELL_FILE_HANDLE         FileHandle;
+  CHAR16             *FileName;
+  EFI_STATUS         Status;
+  SHELL_FILE_HANDLE  FileHandle;
 
   //
   // NOTE: This devpath is allocated and must be freed.
   //
-  FileDevicePath = GetCacheFileDevicePath (FrameworkHandle);
+  FileName = GetCacheFileName (FrameworkHandle);
+  if (FileName == NULL) {
+    return FALSE;
+  }
 
   //
@@ -189 +211 @@
   // reading, it exists.  Otherwise, probably not.
   //
-  Status = ShellOpenFileByDevicePath (
-             &FileDevicePath,
+  Status = ShellOpenFileByName (
+             FileName,
              &FileHandle,
              EFI_FILE_MODE_READ,
@@ -199 +221 @@
   }
 
-  if (FileDevicePath != NULL) {
-    FreePool (FileDevicePath);
-  }
-
-  DEBUG ((DEBUG_VERBOSE, "%a - Returning %d\n", __FUNCTION__, !EFI_ERROR (Status)));
+  if (FileName != NULL) {
+    FreePool (FileName);
+  }
+
+  DEBUG ((DEBUG_VERBOSE, "%a - Returning %d\n", __func__, !EFI_ERROR (Status)));
 
   return (!EFI_ERROR (Status));
@@ -230 +252 @@
   )
 {
-  EFI_DEVICE_PATH_PROTOCOL  *FileDevicePath;
-  EFI_STATUS                Status;
-  SHELL_FILE_HANDLE         FileHandle;
-  UINTN                     WriteCount;
+  CHAR16             *FileName;
+  EFI_STATUS         Status;
+  SHELL_FILE_HANDLE  FileHandle;
+  UINTN              WriteCount;
 
   //
@@ -246 +268 @@
   // NOTE: This devpath is allocated and must be freed.
   //
-  FileDevicePath = GetCacheFileDevicePath (FrameworkHandle);
+  FileName = GetCacheFileName (FrameworkHandle);
+  if (FileName == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
 
   //
   // First lets open the file if it exists so we can delete it...This is the work around for truncation
   //
-  Status = ShellOpenFileByDevicePath (
-             &FileDevicePath,
+  Status = ShellOpenFileByName (
+             FileName,
              &FileHandle,
              (EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE),
@@ -264 +289 @@
     Status = ShellDeleteFile (&FileHandle);
     if (EFI_ERROR (Status)) {
-      DEBUG ((DEBUG_ERROR, "%a failed to delete file %r\n", __FUNCTION__, Status));
+      DEBUG ((DEBUG_ERROR, "%a failed to delete file %r\n", __func__, Status));
     }
   }
@@ -271 +296 @@
   // Now that we know the path to the file... let's open it for writing.
   //
-  Status = ShellOpenFileByDevicePath (
-             &FileDevicePath,
+  Status = ShellOpenFileByName (
+             FileName,
              &FileHandle,
              (EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE | EFI_FILE_MODE_CREATE),
@@ -278 +303 @@
              );
   if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_ERROR, "%a - Opening file for writing failed! %r\n", __FUNCTION__, Status));
+    DEBUG ((DEBUG_ERROR, "%a - Opening file for writing failed! %r\n", __func__, Status));
     goto Exit;
   }
@@ -286 +311 @@
   //
   WriteCount = SaveStateSize;
-  DEBUG ((DEBUG_INFO, "%a - Writing %d bytes to file...\n", __FUNCTION__, WriteCount));
+  DEBUG ((DEBUG_INFO, "%a - Writing %d bytes to file...\n", __func__, WriteCount));
   Status = ShellWriteFile (
              FileHandle,
@@ -294 +319 @@
 
   if (EFI_ERROR (Status) || (WriteCount != SaveStateSize)) {
-    DEBUG ((DEBUG_ERROR, "%a - Writing to file failed! %r\n", __FUNCTION__, Status));
+    DEBUG ((DEBUG_ERROR, "%a - Writing to file failed! %r\n", __func__, Status));
   } else {
-    DEBUG ((DEBUG_INFO, "%a - SUCCESS!\n", __FUNCTION__));
+    DEBUG ((DEBUG_INFO, "%a - SUCCESS!\n", __func__));
   }
 
@@ -305 +330 @@
 
 Exit:
-  if (FileDevicePath != NULL) {
-    FreePool (FileDevicePath);
+  if (FileName != NULL) {
+    FreePool (FileName);
   }
 
@@ -335 +360 @@
   )
 {
-  EFI_STATUS                Status;
-  EFI_DEVICE_PATH_PROTOCOL  *FileDevicePath;
-  SHELL_FILE_HANDLE         FileHandle;
-  BOOLEAN                   IsFileOpened;
-  UINT64                    LargeFileSize;
-  UINTN                     FileSize;
-  VOID                      *Buffer;
+  EFI_STATUS         Status;
+  CHAR16             *FileName;
+  SHELL_FILE_HANDLE  FileHandle;
+  BOOLEAN            IsFileOpened;
+  UINT64             LargeFileSize;
+  UINTN              FileSize;
+  VOID               *Buffer;
 
   IsFileOpened = FALSE;
@@ -357 +382 @@
   // NOTE: This devpath is allocated and must be freed.
   //
-  FileDevicePath = GetCacheFileDevicePath (FrameworkHandle);
+  FileName = GetCacheFileName (FrameworkHandle);
+  if (FileName == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
 
   //
   // Now that we know the path to the file... let's open it for writing.
   //
-  Status = ShellOpenFileByDevicePath (
-             &FileDevicePath,
+  Status = ShellOpenFileByName (
+             FileName,
              &FileHandle,
              EFI_FILE_MODE_READ,
@@ -369 +397 @@
              );
   if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_ERROR, "%a - Opening file for writing failed! %r\n", __FUNCTION__, Status));
+    DEBUG ((DEBUG_ERROR, "%a - Opening file for writing failed! %r\n", __func__, Status));
     goto Exit;
   } else {
@@ -380 +408 @@
   Status = ShellGetFileSize (FileHandle, &LargeFileSize);
   if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_ERROR, "%a - Failed to determine file size! %r\n", __FUNCTION__, Status));
+    DEBUG ((DEBUG_ERROR, "%a - Failed to determine file size! %r\n", __func__, Status));
     goto Exit;
   }
@@ -391 +419 @@
   Buffer         = AllocatePool (FileSize);
   if (Buffer == NULL) {
-    DEBUG ((DEBUG_ERROR, "%a - Failed to allocate a pool to hold the file contents! %r\n", __FUNCTION__, Status));
+    DEBUG ((DEBUG_ERROR, "%a - Failed to allocate a pool to hold the file contents! %r\n", __func__, Status));
     Status = EFI_OUT_OF_RESOURCES;
     goto Exit;
@@ -401 +429 @@
   Status = ShellReadFile (FileHandle, &FileSize, Buffer);
   if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_ERROR, "%a - Failed to read the file contents! %r\n", __FUNCTION__, Status));
+    DEBUG ((DEBUG_ERROR, "%a - Failed to read the file contents! %r\n", __func__, Status));
   }
 
@@ -408 +436 @@
   // Free allocated buffers
   //
-  if (FileDevicePath != NULL) {
-    FreePool (FileDevicePath);
+  if (FileName != NULL) {
+    FreePool (FileName);
   }
 
@@ -427 +455 @@
   return Status;
 }
+
+/**
+  Shell based UnitTestPersistenceLib library constructor.
+
+  @param[in]  ImageHandle  The firmware allocated handle for the EFI image.
+  @param[in]  SystemTable  A pointer to the EFI System Table.
+
+  @retval EFI_SUCCESS      The constructor finished successfully.
+  @retval Others           Error codes returned from gBS->HandleProtocol.
+ **/
+EFI_STATUS
+EFIAPI
+UnitTestPersistenceLibConstructor (
+  IN EFI_HANDLE        ImageHandle,
+  IN EFI_SYSTEM_TABLE  *SystemTable
+  )
+{
+  UINTN                          Index;
+  UINTN                          Argc;
+  CHAR16                         **Argv;
+  EFI_STATUS                     Status;
+  EFI_SHELL_PARAMETERS_PROTOCOL  *ShellParameters;
+
+  Status = gBS->HandleProtocol (
+                  gImageHandle,
+                  &gEfiShellParametersProtocolGuid,
+                  (VOID **)&ShellParameters
+                  );
+  if (EFI_ERROR (Status)) {
+    ASSERT_EFI_ERROR (Status);
+    goto Done;
+  }
+
+  Argc = ShellParameters->Argc;
+  Argv = ShellParameters->Argv;
+
+  Status = EFI_SUCCESS;
+  if ((Argc > 1) && (Argv != NULL)) {
+    // This might be our cue, check for whether we need to do anything
+    for (Index = 1; Index < Argc; Index++) {
+      if (StrCmp (Argv[Index], L"--CachePath") == 0) {
+        // Need to update the potential cache path to designated path
+        if (Index < Argc - 1) {
+          mCachePath = Argv[Index + 1];
+        } else {
+          Print (L"  --CachePath <Path of where to save unit test cache files, i.e. FS0:TestFolder>\n");
+        }
+      }
+    }
+  }
+
+Done:
+  return Status;
+}

trunk/src/VBox/Devices/EFI/FirmwareNew/UnitTestFrameworkPkg/Library/UnitTestResultReportLib/UnitTestResultReportLib.c

@@ -103 +103 @@
   // Return last entry if no match found.
   //
-  DEBUG ((DEBUG_INFO, "%a Failure Type does not have string defined 0x%X\n", __FUNCTION__, (UINT32)Failure));
+  DEBUG ((DEBUG_INFO, "%a Failure Type does not have string defined 0x%X\n", __func__, (UINT32)Failure));
   return mFailureTypeStrings[Index].String;
 }

trunk/src/VBox/Devices/EFI/FirmwareNew/UnitTestFrameworkPkg/Library/UnitTestResultReportLib/UnitTestResultReportLibConOut.c

@@ -26 +26 @@
   Length = UnicodeVSPrintAsciiFormat (String, sizeof (String), Format, Marker);
   if (Length == 0) {
-    DEBUG ((DEBUG_ERROR, "%a formatted string is too long\n", __FUNCTION__));
+    DEBUG ((DEBUG_ERROR, "%a formatted string is too long\n", __func__));
   } else {
     gST->ConOut->OutputString (gST->ConOut, String);

trunk/src/VBox/Devices/EFI/FirmwareNew/UnitTestFrameworkPkg/Library/UnitTestResultReportLib/UnitTestResultReportLibDebugLib.c

@@ -25 +25 @@
   Length = AsciiVSPrint (String, sizeof (String), Format, Marker);
   if (Length == 0) {
-    DEBUG ((DEBUG_ERROR, "%a formatted string is too long\n", __FUNCTION__));
+    DEBUG ((DEBUG_ERROR, "%a formatted string is too long\n", __func__));
   } else {
     DEBUG ((DEBUG_INFO, String));

trunk/src/VBox/Devices/EFI/FirmwareNew/UnitTestFrameworkPkg/ReadMe.md

@@ -21 +21 @@
 
 The second unit test framework supported by the UnitTestFrameworkPkg is
-[GoogleTest](http://google.github.io/googletest/) that can be used to implement host-based unit tests.
-Use of GoogleTest for target-based unit tests of EDK II components is not supported. If a
-host-based unit test requires mocked interfaces, then the Framework with cmocka support should be
-used instead. Enabling support for mocked interfaces with GoogleTest is being actively investigated.
+[GoogleTest](http://google.github.io/googletest/) and can be used to implement host-based unit tests.
 [GoogleTest on GitHub](https://github.com/google/googletest) is included in the UnitTestFrameworkPkg
-as a submodule.
+as a submodule. Use of GoogleTest for target-based unit tests of EDK II components is not supported.
+Host-based unit tests that require mocked interfaces can use the mocking infrastructure included with
+GoogleTest called [gMock](https://github.com/google/googletest/tree/main/googlemock). Note that the
+gMock framework does not directly support mocking of free (C style) functions, so the FunctionMockLib
+(containing a set of macros that wrap gMock's MOCK_METHOD macro) was created within the
+UnitTestFrameworkPkg to enable this support. The details and usage of these macros in the
+FunctionMockLib are described later.
 
 GoogleTest requires less overhead to register test suites and test cases compared to the Framework.
@@ -34 +37 @@
 that may be used to implement, run, and debug unit tests implemented using GoogleTest.
 
-If a component can be tested with host-based unit tests without support for mocked interfaces,
-then GoogleTest is recommended. The MdePkg contains a port of the BaseSafeIntLib unit tests in
-the GoogleTest style so the differences between GoogleTest and Framework unit tests can be reviewed.
-The paths to the BaseSafeIntLib unit tests are:
-
-* MdePkg\Test\UnitTest\Library\BaseSafeIntLib
-* MdePkg\Test\GoogleTest\Library\BaseSafeIntLib
+If a component can be tested with host-based unit tests, then GoogleTest is recommended. The MdePkg
+contains a port of the BaseSafeIntLib unit tests in the GoogleTest style so the differences between
+GoogleTest and Framework unit tests can be reviewed. The paths to the BaseSafeIntLib unit tests are:
+
+* `MdePkg/Test/UnitTest/Library/BaseSafeIntLib`
+* `MdePkg/Test/GoogleTest/Library/BaseSafeIntLib`
+
+Furthermore, the SecurityPkg contains unit tests for the SecureBootVariableLib using mocks in both
+the Framework/cmocka and GoogleTest/gMock style so the differences between cmocka and gMock can be
+reviewed. The paths to the SecureBootVariableLib unit tests are:
+
+* `SecurityPkg/Library/SecureBootVariableLib/UnitTest`
+* `SecurityPkg/Library/SecureBootVariableLib/GoogleTest`
 
 ## Framework and GoogleTest Feature Comparison
@@ -57 +66 @@
 | Type-Parameterized Tests    |    NO     |    YES     |
 | Timeout Support             |    NO     |    YES     |
-| Mocking Support             |   Cmocka  |     NO     |
+| Mocking Support             |   Cmocka  |   gMock    |
 | JUNIT XML Reports           |    YES    |    YES     |
 | Execute subset of tests     |    NO     |    YES     |
@@ -105 +114 @@
 how to check for expected conditions in test cases and a bit of the logging characteristics.
 
-Most of these examples will refer to the SampleUnitTestUefiShell app found in this package.
+Most of these examples will refer to the `SampleUnitTestUefiShell` app found in this package.
 
 ### Framework Requirements - INF
@@ -114 +123 @@
 you should be good to go.
 
-See this example in 'SampleUnitTestUefiShell.inf'...
+See this example in `SampleUnitTestUefiShell.inf`...
 
 ```
@@ -128 +137 @@
 ```
 
-Also, if you want you test to automatically be picked up by the Test Runner plugin, you will need
+Also, if you want your test to automatically be picked up by the Test Runner plugin, you will need
 to make sure that the module `BASE_NAME` contains the word `Test`...
 
@@ -136 +145 @@
 ```
 
+### Framework Requirements - DSC
+
+In our DSC file, we'll need to bring in the INF file that was just created into the `[Components]`
+section so that the unit tests will be built.
+
+See this example in `UnitTestFrameworkPkg.dsc`...
+
+```
+[Components]
+  UnitTestFrameworkPkg/Test/UnitTest/Sample/SampleUnitTest/SampleUnitTestUefiShell.inf
+```
+
+Also, based on the type of tests that are being created, the associated DSC include file from the
+UnitTestFrameworkPkg for Host or Target based tests should also be included at the top of the DSC
+file.
+
+```
+!include UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc
+```
+
+Lastly, in the case that the test build has specific dependent libraries associated with it,
+they should be added in the \<LibraryClasses\> sub-section for the INF file in the
+`[Components]` section of the DSC file.
+
+See this example in `SecurityPkgHostTest.dsc`...
+
+```
+[Components]
+  SecurityPkg/Library/SecureBootVariableLib/UnitTest/SecureBootVariableLibUnitTest.inf {
+    <LibraryClasses>
+      SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf
+      UefiRuntimeServicesTableLib|SecurityPkg/Library/SecureBootVariableLib/UnitTest/MockUefiRuntimeServicesTableLib.inf
+      PlatformPKProtectionLib|SecurityPkg/Library/SecureBootVariableLib/UnitTest/MockPlatformPKProtectionLib.inf
+      UefiLib|SecurityPkg/Library/SecureBootVariableLib/UnitTest/MockUefiLib.inf
+  }
+```
+
 ### Framework Requirements - Code
 
@@ -144 +190 @@
 ```
 
-Now that we've got that squared away, let's look at our 'Main()'' routine (or DriverEntryPoint() or whatever).
+Now that we've got that squared away, let's look at our 'Main()' routine (or DriverEntryPoint() or whatever).
 
 ### Framework Configuration
@@ -158 +204 @@
 These strings are copied internally to the Framework, so using stack-allocated or literal strings is fine.
 
-In the 'SampleUnitTestUefiShell' app, the module name is used as the short name, so the initialization looks like this.
+In the `SampleUnitTestUefiShell` app, the module name is used as the short name, so the initialization looks like this.
 
 ```c
@@ -185 +231 @@
 `UNIT_TEST_SUITE_SETUP` and `UNIT_TEST_SUITE_TEARDOWN`.
 
-Looking at 'SampleUnitTestUefiShell' app, you can see that the first test suite is created as below...
+Looking at `SampleUnitTestUefiShell` app, you can see that the first test suite is created as below...
 
 ```c
@@ -219 +265 @@
 pointer, so it could be a simple value, or it could be a complex structure. If unneeded, pass `NULL`.
 
-In 'SampleUnitTestUefiShell' app, the first test case is added using the code below...
+In `SampleUnitTestUefiShell` app, the first test case is added using the code below...
 
 ```c
@@ -283 +329 @@
 https://api.cmocka.org/
 
+## GoogleTest Libraries
+
+### GoogleTestLib
+
+GoogleTestLib is the core library used for GoogleTest in EDK II. This library is mainly a wrapper
+around the GoogleTest and gMock header and source files. So all the standard
+[GoogleTest](http://google.github.io/googletest/) and
+[gMock](https://github.com/google/googletest/tree/main/googlemock) documentation for writing tests
+and using mocks applies.
+
+Additionally, to support the use of some primitive types that are not directly supported by
+GoogleTest and gMock (but are needed to allow gMock to be used in EDK II), some custom gMock
+actions and matchers were added to GoogleTestLib. These customizations are briefly described in
+the following tables.
+
+#### Custom Actions
+
+| Action Name | Similar gMock Generic Action | Usage |
+|:--- |:--- |:--- |
+| `SetArgBuffer()` | `SetArgPointee()` | Used to set a buffer output argument (such as UINT8*, VOID*, a structure pointer, etc.) with data in an expect call. Can be used in an `EXPECT_CALL()` |
+
+#### Custom Matchers
+
+| Matcher Name | Similar gMock Generic Matcher | Usage |
+|:--- |:--- |:--- |
+| `BufferEq()` | `Pointee(Eq())` | Used to compare two buffer pointer types (such as UINT8*, VOID*, a structure pointer, etc.). Can be used in an `EXPECT_CALL()`, `EXPECT_THAT()`, or anywhere else a matcher to compare two buffers is needed. |
+| `Char16StrEq()` | `Pointee(Eq())` | Used to compare two CHAR16* strings. Can be used in an `EXPECT_CALL()`, `EXPECT_THAT()`, or anywhere else a matcher to compare two CHAR16* strings is needed. |
+
+### FunctionMockLib
+
+FunctionMockLib is the library that allows gMock to be used with free (C style) functions. This
+library contains a set of macros that wrap gMock's MOCK_METHOD macro to enable the standard gMock
+capabilities to be used with free functions. The details of how this is implemented is outside the
+scope of this document, but a brief description of each of the public macros in FunctionMockLib is
+described below. A full example of how to use these macros to create a mock is described in a
+later section.
+
+In total there are six public macros in FunctionMockLib. Four of the macros are related to creating
+the mock functions, and the other two macros are related to creating an interface that is necessary
+to contain the mock functions and connect them into the gMock framework.
+
+The macros used to create the interface are...
+1. `MOCK_INTERFACE_DECLARATION(MOCK)`
+2. `MOCK_INTERFACE_DEFINITION(MOCK)`
+
+These macros both take one argument which is the name of the interface for the mock. The
+`MOCK_INTERFACE_DECLARATION` macro is used to declare the interface in the `.h` file and the
+`MOCK_INTERFACE_DEFINITION` macro is used to define the interface in the `.cpp` file. For
+example, to create a mock for the `UefiLib`, a `MockUefiLib.h` file would be created and the
+below code would be added to it.
+
+```cpp
+struct MockUefiLib {
+  MOCK_INTERFACE_DECLARATION(MockUefiLib);
+};
+```
+
+Additionally, the below code would be written into a `MockUefiLib.cpp` file.
+
+```cpp
+MOCK_INTERFACE_DEFINITION(MockUefiLib);
+```
+
+The macros used to create the mock functions are...
+1. `MOCK_FUNCTION_DECLARATION(RET_TYPE, FUNC, ARGS)`
+2. `MOCK_FUNCTION_DEFINITION(MOCK, FUNC, NUM_ARGS, CALL_TYPE)`
+3. `MOCK_FUNCTION_INTERNAL_DECLARATION(RET_TYPE, FUNC, ARGS)`
+4. `MOCK_FUNCTION_INTERNAL_DEFINITION(MOCK, FUNC, NUM_ARGS, CALL_TYPE)`
+
+You will notice that there are two sets of macros: one to mock external functions and
+another to mock internal functions. Each set of macros has the exact same arguments, but
+they are used for slightly different use cases. The details of these different use cases
+is described in detail in a later section. For now, we will focus on the usage of the macro
+arguments since that is common between them.
+
+The `MOCK_FUNCTION_DECLARATION` macro is used to declare the mock function in the `.h` file,
+and it takes three arguments: return type, function name, and argument list. The
+`MOCK_FUNCTION_DEFINITION` macro is used to define the mock function in the `.cpp` file,
+and it takes four arguments: name of the interface for the mock, function name, number of
+arguments the function takes, and calling convention type of the function. For example, to
+continue with the `UefiLib` mock example above, the `GetVariable2` and `GetEfiGlobalVariable2`
+functions are declared in `UefiLib.h` as shown below.
+
+```cpp
+EFI_STATUS
+EFIAPI
+GetVariable2 (
+  IN CONST CHAR16    *Name,
+  IN CONST EFI_GUID  *Guid,
+  OUT VOID           **Value,
+  OUT UINTN          *Size OPTIONAL
+  );
+
+EFI_STATUS
+EFIAPI
+GetEfiGlobalVariable2 (
+  IN CONST CHAR16  *Name,
+  OUT VOID         **Value,
+  OUT UINTN        *Size OPTIONAL
+  );
+```
+
+To declare mocks for these functions within the previously created `MockUefiLib` interface,
+the below code would be added to the `MockUefiLib.h` file. Note that the previously added
+interface declaration is also included in the code below for context.
+
+```cpp
+struct MockUefiLib {
+  MOCK_INTERFACE_DECLARATION (MockUefiLib);
+
+  MOCK_FUNCTION_DECLARATION (
+    EFI_STATUS,
+    GetVariable2,
+    (IN CONST CHAR16    *Name,
+     IN CONST EFI_GUID  *Guid,
+     OUT VOID           **Value,
+     OUT UINTN          *Size OPTIONAL)
+    );
+
+  MOCK_FUNCTION_DECLARATION (
+    EFI_STATUS,
+    GetEfiGlobalVariable2,
+    (IN CONST CHAR16  *Name,
+     OUT VOID         **Value,
+     OUT UINTN        *Size OPTIONAL)
+    );
+};
+```
+
+Additionally, the below code would be added into the `MockUefiLib.cpp` file to provide
+the definitions for these mock functions. Again, the previously added interface
+definition is also included in the code below for context.
+
+```cpp
+MOCK_INTERFACE_DEFINITION(MockUefiLib);
+
+MOCK_FUNCTION_DEFINITION(MockUefiLib, GetVariable2, 4, EFIAPI);
+MOCK_FUNCTION_DEFINITION(MockUefiLib, GetEfiGlobalVariable2, 3, EFIAPI);
+```
+
+That concludes the basic overview on how to use the macros, but a more detailed
+description on how to name the mocks, where to put the files, how to build the
+mocks, and how to use the mocks is described in detail later.
+
+### SubhookLib
+
+SubhookLib is the library used by FunctionMockLib to implement the macros to
+mock internal functions: `MOCK_FUNCTION_INTERNAL_DECLARATION` and
+`MOCK_FUNCTION_INTERNAL_DEFINITION`. These macros require the additional
+functionality provided by SubhookLib because they create mock functions
+for functions that are already defined and compiled within the module being
+tested. More detail on this is provided in a later section, but for now it is
+sufficient to know that the SubhookLib allows a second definition of the
+function to be compiled into the test application and then hooked to during a
+test.
+
+This library is mainly a wrapper around the
+[subhook](https://github.com/Zeex/subhook) header and source files. It is
+important to note that the use of the mock function macros and the creation
+of mock functions requires no knowledge about the SubhookLib. The SubhookLib
+library is entirely hidden and encapsulated within FunctionMockLib, and it
+is only mentioned here to provide a complete explanation on all the libraries
+used in the implementation.
+
+## FunctionMockLib Mocks
+
+This section describes the details on how to use the mock function macros in
+FunctionMockLib to create mock functions, name them, organize their files,
+and build them so that they can be used within GoogleTest tests. The usage
+of the mock functions is detailed in a later section while this section
+simply details how to create them, build them, and where to put them.
+
+### FunctionMockLib Mocks - External vs. Internal
+
+The first question to ask when creating a mock function is if the function being
+mocked is external or internal to the module being tested. This is very important
+because the macros in FunctionMockLib used to create the mock function are named
+differently for these two use cases. Fortunately, the arguments to these macros
+and the usage of the mock functions within the tests are exactly the same.
+However, because of the different underlying implementations, two different sets
+of macros are used.
+
+A more detailed description of when to use the external vs. internal mock function
+macros is in the following sections, but the quick summary is as follows.
+
+* External mock function macros are used to mock functions that are outside the
+module being tested and use link-time replacement.
+* Internal mock function macros are used to mock functions that are inside the
+module being tested and use run-time replacement.
+
+The below table shows which macros to use in these two use cases. However, note that
+for the creation of the interface, the same macros are used in both cases.
+
+| Mock Function Use Case | Mock Interface Macros | Mock Function Macros |
+|:--- |:--- |:--- |
+| External mock functions | `MOCK_INTERFACE_DECLARATION`</br>`MOCK_INTERFACE_DEFINITION` | `MOCK_FUNCTION_DECLARATION`</br>`MOCK_FUNCTION_DEFINITION` |
+| Internal mock functions | `MOCK_INTERFACE_DECLARATION`</br>`MOCK_INTERFACE_DEFINITION` | `MOCK_FUNCTION_INTERNAL_DECLARATION`</br>`MOCK_FUNCTION_INTERNAL_DEFINITION` |
+
+#### FunctionMockLib Mocks - External mock function
+
+The external mock function macros are used to create mock function definitions
+for a library, global service, or protocol that is defined outside of the module
+being tested. These mock function definitions are linked into the test application
+instead of linking in the design function definitions. In other words, the
+external mock function macros use link-time replacement of the design functions.
+
+The `.h/.cpp` files for these mock functions are created within the package
+directory where the library, global table, or protocol that is being mocked is
+declared. These files are compiled into their own separate library (using
+an INF file) that can be shared and linked into many test applications, but more
+on that later.
+
+#### FunctionMockLib Mocks - Internal mock function
+
+The internal mock function macros are used to create mock function definitions
+for functions that are defined within the module being tested. These mock
+function definitions are compiled into the test application along with the design
+function definitions. This is possible because the mock functions are given a
+slightly different name during compilation. Then during test execution, the
+design function is hooked and replaced with the mock function. In other words,
+the internal mock function macros use run-time replacement of the design
+functions.
+
+The `.h/.cpp` files for these mock functions are created within the GoogleTest
+directory containing the specific tests that are using them. These files are
+compiled directly in the GoogleTest INF file that builds the test application,
+and they are not shared outside of that GoogleTest directory, but more on that
+later.
+
+### FunctionMockLib Mocks - Declaration
+
+The declaration of mock functions using the FunctionMockLib macros are done
+in header files. The name of the header file is determined by the interface
+(such as a library or a protocol) that is being created for the mock functions.
+The rules for naming the file are shown in the table below.
+
+| Interface Type | Header File Name |
+| :--- | :--- |
+| Library | Mock\<LibraryName\>Lib.h |
+| Global Table (e.g. gRT, gBS, etc.) | Mock\<GlobalTableLibraryName\>Lib.h |
+| Protocol | Mock\<ProtocolName\>Protocol.h |
+
+The below table shows examples for file names with each of the above cases.
+
+| Interface Type | Interface Name | Header File Name |
+| :--- | :--- | :--- |
+| Library | UefiLib | MockUefiLib.h |
+| Global Table (e.g. gRT, gBS, etc.) | UefiRuntimeServicesTableLib | MockUefiRuntimeServicesTableLib.h |
+| Protocol | EFI_USB_IO_PROTOCOL | MockEfiUsbIoProtocol.h |
+
+Once the header file name is known, the file needs to be created in the proper
+location. For internal mock functions, the location is simply the same
+GoogleTest directory that contains the INF file that builds the test application.
+For external mock functions, the location is within the `Test` directory under the
+package where the library, global table, or protocol that is being mocked is
+declared. The exact location depends on the interface type and is shown in the
+below table.
+
+| Interface Type | Header File Location |
+| :--- | :--- |
+| Library | \<PackageName\>/Test/Mock/Include/GoogleTest/Library |
+| Global Table (e.g. gRT, gBS, etc.) | \<PackageName\>/Test/Mock/Include/GoogleTest/Library |
+| Protocol | \<PackageName\>/Test/Mock/Include/GoogleTest/Protocol |
+
+The below table shows examples for file locations with each of the above cases.
+
+| Interface Type | Interface Name | Header File Location |
+| :--- | :--- | :--- |
+| Library | UefiLib | MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiLib.h |
+| Global Table (e.g. gRT, gBS, etc.) | UefiRuntimeServicesTableLib | MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiRuntimeServicesTableLib.h |
+| Protocol | EFI_USB_IO_PROTOCOL | MdePkg/Test/Mock/Include/GoogleTest/Protocol/MockEfiUsbIoProtocol.h |
+
+Now that the file location is known, the contents can be added to it. After the
+standard `#ifndef` for a header file is added at the top of the file, the
+`GoogleTestLib.h` and `FunctionMockLib.h` files are always added. Following these
+includes other EDK II related include files are added and must be wrapped in
+`extern "C" {}` because they are C include files. Failure to do this will cause
+link errors to occur. Note that a `#include` of the interface being mocked must
+also be added. This causes the declarations of the functions being mocked to be
+included in the compilation and allows the compilation to verify that the function
+signatures of the mock and design functions are identical.
+
+After all the needed includes have been added in the file , a `struct` is declared
+using the same name as the header file (which was determined using the rules
+above). Within this structure declaration a `MOCK_INTERFACE_DECLARATION` is
+added along with a `MOCK_FUNCTION_DECLARATION` (or a
+`MOCK_FUNCTION_INTERNAL_DECLARATION` if this interface is for internal mock
+functions) for each function in the interface. To build on the examples above,
+the complete `MockUefiLib.h` file would be as shown below. Note that for brevity
+only the `GetVariable2` and `GetEfiGlobalVariable2` declarations are included in
+the example.
+
+```cpp
+#ifndef MOCK_UEFI_LIB_H_
+#define MOCK_UEFI_LIB_H_
+
+#include <Library/GoogleTestLib.h>
+#include <Library/FunctionMockLib.h>
+extern "C" {
+  #include <Uefi.h>
+  #include <Library/UefiLib.h>
+}
+
+struct MockUefiLib {
+  MOCK_INTERFACE_DECLARATION (MockUefiLib);
+
+  MOCK_FUNCTION_DECLARATION (
+    EFI_STATUS,
+    GetVariable2,
+    (IN CONST CHAR16    *Name,
+     IN CONST EFI_GUID  *Guid,
+     OUT VOID           **Value,
+     OUT UINTN          *Size OPTIONAL)
+    );
+
+  MOCK_FUNCTION_DECLARATION (
+    EFI_STATUS,
+    GetEfiGlobalVariable2,
+    (IN CONST CHAR16  *Name,
+     OUT VOID         **Value,
+     OUT UINTN        *Size OPTIONAL)
+    );
+};
+
+#endif
+```
+
+In the case of libraries, the function names in the mock declarations
+align exactly with the function names in the design. However, in the
+case of global tables and protocols, to eliminate possible function
+name collisions, the names are adjusted slightly in the mock
+declarations as shown in the below table.
+
+| Mock Function Use Case | Design Function Name | Mock Function Name |
+| :--- | :--- | :--- |
+| Library | GetVariable2 | GetVariable2  |
+| Global Table (e.g. gRT, gBS, etc.) | gRT->GetVariable | gRT_GetVariable |
+| Protocol | UsbIoProtocol->UsbPortReset | UsbIoProtocol_UsbPortReset |
+
+Lastly, when creating mock functions, there are two limitations to be
+aware of in gMock that extend into FunctionMockLib.
+
+1. gMock does not support mocking functions that have more than 15 arguments.
+2. gMock does not support mocking variadic functions.
+
+With those limitations in mind, that completes the mock function
+declarations, and now the mock function definitions for those declarations
+can be created.
+
+### FunctionMockLib Mocks - Definition
+
+The definition of mock functions using the FunctionMockLib macros are done
+in source files. The name of the source file is determined by the interface
+(such as a library or a protocol) that is being created for the mock functions.
+The rules for naming the file align with the naming of the file for declarations
+and are shown in the table below.
+
+| Interface Type | Source File Name |
+| :--- | :--- |
+| Library | Mock\<LibraryName\>Lib.cpp |
+| Global Table (e.g. gRT, gBS, etc.) | Mock\<GlobalTableLibraryName\>Lib.cpp |
+| Protocol | Mock\<ProtocolName\>Protocol.cpp |
+
+The below table shows examples for file names with each of the above cases.
+
+| Interface Type | Interface Name | Source File Name |
+| :--- | :--- | :--- |
+| Library | UefiLib | MockUefiLib.cpp |
+| Global Table (e.g. gRT, gBS, etc.) | UefiRuntimeServicesTableLib | MockUefiRuntimeServicesTableLib.cpp |
+| Protocol | EFI_USB_IO_PROTOCOL | MockEfiUsbIoProtocol.cpp |
+
+Once the source file name is known, the file needs to be created in the proper
+location. The location of the source file is aligned with the location for the
+header file. For internal mock functions, the location is simply the same
+GoogleTest directory that contains the INF file that builds the test application.
+For external mock functions, the location is within the `Test` directory under the
+package where the library, global table, or protocol that is being mocked is
+declared. The exact location depends on the interface type and is shown in the
+below table.
+
+| Interface Type | Source File Location |
+| :--- | :--- |
+| Library | \<PackageName\>/Test/Mock/Library/GoogleTest/Mock\<LibraryName\>Lib |
+| Global Table (e.g. gRT, gBS, etc.) | \<PackageName\>/Test/Mock/Library/GoogleTest/Mock\<GlobalTableLibraryName\>Lib |
+| Protocol | \<PackageName\>/Test/Mock/Library/GoogleTest/Mock\<ProtocolName\>Protocol |
+
+The below table shows examples for file locations with each of the above cases.
+
+| Interface Type | Interface Name | Source File Location |
+| :--- | :--- | :--- |
+| Library | UefiLib | MdePkg/Test/Mock/Library/GoogleTest/MockUefiLib/MockUefiLib.cpp |
+| Global Table (e.g. gRT, gBS, etc.) | UefiRuntimeServicesTableLib | MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.cpp |
+| Protocol | EFI_USB_IO_PROTOCOL | MdePkg/Test/Mock/Library/GoogleTest/MockEfiUsbIoProtocol/MockEfiUsbIoProtocol.cpp |
+
+Now that the file location is known, the contents can be added to it. At the top
+of the file, the header file containing the mock function declarations is always
+added. After this `#include`, the interface definition is created using
+`MOCK_INTERFACE_DEFINITION` with the interface name that was used in the mock
+function declaration header file. A `MOCK_FUNCTION_DEFINITION` is then added (or
+a `MOCK_FUNCTION_INTERNAL_DEFINITION` if this interface is for internal mock
+functions) for each function that was declared in the interface. To build on the
+prior declaration examples, the complete `MockUefiLib.cpp` file would be as shown
+below. Note that for brevity only the `GetVariable2` and `GetEfiGlobalVariable2`
+definitions are included in the example.
+
+```cpp
+#include <GoogleTest/Library/MockUefiLib.h>
+
+MOCK_INTERFACE_DEFINITION(MockUefiLib);
+
+MOCK_FUNCTION_DEFINITION(MockUefiLib, GetVariable2, 4, EFIAPI);
+MOCK_FUNCTION_DEFINITION(MockUefiLib, GetEfiGlobalVariable2, 3, EFIAPI);
+```
+
+When creating the defintions, there are a few things to keep in mind.
+
+First, when using `MOCK_FUNCTION_DEFINITION`, some functions being mocked do
+not specify a calling convention. In this case, it is fine to leave the last
+argument of `MOCK_FUNCTION_DEFINITION` empty. For example, if `GetVariable2`
+did not specify the `EFIAPI` calling convention in its declaration, then the
+below code would be used for the mock function definition.
+
+```cpp
+MOCK_FUNCTION_DEFINITION(MockUefiLib, GetVariable2, 4, );
+```
+
+Second, the function name used in `MOCK_FUNCTION_DEFINITION` must align with
+the function name used in the associated `MOCK_FUNCTION_DECLARATION` in the
+header file.
+
+Last, if the interface is mocking a global table or protocol, then the structure
+of function pointers for that interface must also be defined within the source
+file as a `static` structure with the mock function definitions being assigned
+to the associated entries in the structure. The address of this `static`
+structure is then assigned to the global table or protocol pointer. Note that
+this pointer must be wrapped in `extern "C" {}` because it needs C style
+linkage. Failure to do this will cause link errors to occur. For example, when
+creating the definition of the mock for the global runtime services table, the
+complete `MockUefiRuntimeServicesTableLib.cpp` file would be as shown below.
+Note that for brevity only the `GetVariable` and `SetVariable` definitions are
+included in the example.
+
+```cpp
+#include <GoogleTest/Library/MockUefiRuntimeServicesTableLib.h>
+
+MOCK_INTERFACE_DEFINITION(MockUefiRuntimeServicesTableLib);
+
+MOCK_FUNCTION_DEFINITION(MockUefiRuntimeServicesTableLib, gRT_GetVariable, 5, EFIAPI);
+MOCK_FUNCTION_DEFINITION(MockUefiRuntimeServicesTableLib, gRT_SetVariable, 5, EFIAPI);
+
+static EFI_RUNTIME_SERVICES localRt = {
+  {0},              // EFI_TABLE_HEADER
+
+  NULL,             // EFI_GET_TIME
+  NULL,             // EFI_SET_TIME
+  NULL,             // EFI_GET_WAKEUP_TIME
+  NULL,             // EFI_SET_WAKEUP_TIME
+
+  NULL,             // EFI_SET_VIRTUAL_ADDRESS_MAP
+  NULL,             // EFI_CONVERT_POINTER
+
+  gRT_GetVariable,  // EFI_GET_VARIABLE
+  NULL,             // EFI_GET_NEXT_VARIABLE_NAME
+  gRT_SetVariable,  // EFI_SET_VARIABLE
+
+  NULL,             // EFI_GET_NEXT_HIGH_MONO_COUNT
+  NULL,             // EFI_RESET_SYSTEM
+
+  NULL,             // EFI_UPDATE_CAPSULE
+  NULL,             // EFI_QUERY_CAPSULE_CAPABILITIES
+
+  NULL,             // EFI_QUERY_VARIABLE_INFO
+};
+
+extern "C" {
+  EFI_RUNTIME_SERVICES* gRT = &localRt;
+}
+```
+
+That completes the mock function definitions. So now these mock function
+definitions can be compiled.
+
+### FunctionMockLib Mocks - Build
+
+The building of mock functions using FunctionMockLib is done slightly
+differently for external and internal function mocks. External mock
+functions are built using their own separate INF file and internal mock
+functions are built as source files directly referenced in the GoogleTest
+INF file that builds the test application.
+
+#### FunctionMockLib Mocks - Build External Mock Functions
+
+The building of external mock functions is done using their own separate INF
+file which is placed in the same location as the associated source file
+containing the mock function definitions. The name of the INF file is exactly
+the same as the mock function definitions file, but uses the `.inf` extension
+rather than `.cpp`.
+
+Within the `.inf` file the `BASE_NAME` should be set to the same name as the
+file (minus the extension), the `MODULE_TYPE` should be set to
+`HOST_APPLICATION`, and the `LIBRARY_CLASS` should be the same as the
+`BASE_NAME` but without the `Mock` prefix.
+
+The `[Sources]` section will contain the single mock function definition
+source file, the `[Packages]` section will contain all the necessary DEC
+files to compile the mock functions (which at a minimum will include the
+`UnitTestFrameworkPkg.dec` file), the `[LibraryClasses]` section will contain
+the `GoogleTestLib`, and the `[BuildOptions]` will need to append the `/EHsc`
+compilation flag to all MSFT builds to enable proper use of the C++ exception
+handler. Below is the complete `MockUefiLib.inf` as an example.
+
+```
+[Defines]
+  INF_VERSION                    = 0x00010005
+  BASE_NAME                      = MockUefiLib
+  FILE_GUID                      = 47211F7A-6D90-4DFB-BDF9-610B69197C2E
+  MODULE_TYPE                    = HOST_APPLICATION
+  VERSION_STRING                 = 1.0
+  LIBRARY_CLASS                  = UefiLib
+
+#
+# The following information is for reference only and not required by the build tools.
+#
+#  VALID_ARCHITECTURES           = IA32 X64
+#
+
+[Sources]
+  MockUefiLib.cpp
+
+[Packages]
+  MdePkg/MdePkg.dec
+  UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec
+
+[LibraryClasses]
+  GoogleTestLib
+
+[BuildOptions]
+  MSFT:*_*_*_CC_FLAGS = /EHsc
+```
+
+To ensure that this specific set of mock functions are always buildable even
+if no test uses it yet, this created INF file needs to be added into the
+`[Components]` section of the associated `Test` DSC file for the package in
+which this INF file resides. For example, the above `MockUefiLib.inf` would
+need to be added to the `MdePkg/Test/MdePkgHostTest.dsc` file as shown below.
+
+```
+[Components]
+  MdePkg/Test/Mock/Library/GoogleTest/MockUefiLib/MockUefiLib.inf
+```
+
+This created INF file will also be referenced within the necessary `Test` DSC
+files in order to include the mock function definitions in the test
+applications which use this set of mock functions, but more on that later.
+
+One small additional requirement is that if this INF file is added into a
+package that does not yet have any other external mock functions in it, then
+that package's DEC file will need to have the mock include directory (more
+specifically the `Test/Mock/Include` directory) added to its `[Includes]`
+section so that test files who want to use the mock functions will be able to
+locate the mock function header file. For example, if `MockUefiLib.inf` were
+the first mock added to the `MdePkg`, then the below snippet would need to be
+added to the `MdePkg.dec` file.
+
+```
+[Includes]
+  Test/Mock/Include
+```
+
+#### FunctionMockLib Mocks - Build Internal Mock Functions
+
+The building of internal mock functions is done using the GoogleTest INF file
+that already needs to exist to build the test application. This is easy to
+manage since the source and header files for the internal mock functions are
+also located in the same GoogleTest directory as the GoogleTest INF file that
+will reference them.
+
+The only additions that are required to the GoogleTest INF file are that the
+mock function definitions file be added to the `[Sources]` section, the
+`UnitTestFrameworkPkg.dec` file be added to the `[Packages]` section, and the
+`GoogleTestLib` and `SubhookLib` be added to the `[LibraryClasses]` section.
+Below is a minimal contrived example for a `MyModuleGoogleTest.inf` that uses a
+`MockMyModuleInternalFunctions.cpp` source file for its internal mock functions.
+
+```
+[Defines]
+  INF_VERSION         = 0x00010017
+  BASE_NAME           = MyModuleGoogleTest
+  FILE_GUID           = 814B09B9-2D51-4786-8A77-2E10CD1C55F3
+  VERSION_STRING      = 1.0
+  MODULE_TYPE         = HOST_APPLICATION
+
+#
+# The following information is for reference only and not required by the build tools.
+#
+#  VALID_ARCHITECTURES           = IA32 X64
+#
+
+[Sources]
+  MyModuleGoogleTest.cpp
+  MockMyModuleInternalFunctions.cpp
+
+[Packages]
+  MdePkg/MdePkg.dec
+  UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec
+
+[LibraryClasses]
+  GoogleTestLib
+  SubhookLib
+```
+
 ## GoogleTest Samples
 
@@ -292 +949 @@
 needing a target.
 
+There is also a sample unit test provided as both an example of how to write a unit test with
+mock functions and leverage some of the gMock features. This sample can be found in the
+`SecurityPkg/Library/SecureBootVariableLib/GoogleTest` directory.
+
+It too is provided for the HOST_APPLICATION build type, which can be run on a host system without
+needing a target.
+
 ## GoogleTest Usage
 
@@ -298 +962 @@
 how to check for expected conditions in test cases and a bit of the logging characteristics.
 
-Most of these examples will refer to the SampleGoogleTestHost app found in this package.
+Most of these examples will refer to the `SampleGoogleTestHost` app found in this package, but
+the examples related to mock functions will refer to the `SecureBootVariableLibGoogleTest` app
+found in the `SecurityPkg`.
 
 ### GoogleTest Requirements - INF
 
-In our INF file, we'll need to bring in the `GoogleTest` library. Conveniently, the interface
-header for the `GoogleTest` is in `UnitTestFrameworkPkg`, so you shouldn't need to depend on any other
+In our INF file, we'll need to bring in the `GoogleTestLib` library. Conveniently, the interface
+header for the `GoogleTestLib` is in `UnitTestFrameworkPkg`, so you shouldn't need to depend on any other
 packages. As long as your DSC file knows where to find the lib implementation that you want to use,
 you should be good to go.
 
-See this example in 'SampleGoogleTestHost.inf'...
+See this example in `SampleGoogleTestHost.inf`...
 
 ```
@@ -320 +986 @@
 ```
 
-Also, if you want you test to automatically be picked up by the Test Runner plugin, you will need
+Also, if you want your test to automatically be picked up by the Test Runner plugin, you will need
 to make sure that the module `BASE_NAME` contains the word `Test`...
 
@@ -328 +994 @@
 ```
 
+### GoogleTest Requirements - DSC
+
+In our DSC file, we'll need to bring in the INF file that was just created into the `[Components]`
+section so that the unit tests will be built.
+
+See this example in `UnitTestFrameworkPkgHostTest.dsc`...
+
+```
+[Components]
+  UnitTestFrameworkPkg/Test/GoogleTest/Sample/SampleGoogleTest/SampleGoogleTestHost.inf
+```
+
+Also, based on the type of tests that are being created, the associated DSC include file from the
+UnitTestFrameworkPkg for Host or Target based tests should also be included at the top of the DSC
+file.
+
+```
+!include UnitTestFrameworkPkg/UnitTestFrameworkPkgHost.dsc.inc
+```
+
+Lastly, in the case that the test build has specific dependent libraries associated with it,
+they should be added in the \<LibraryClasses\> sub-section for the INF file in the
+`[Components]` section of the DSC file. Note that it is within this sub-section where you can
+control whether the design or mock version of a component is linked into the test exectuable.
+
+See this example in `SecurityPkgHostTest.dsc` where the `SecureBootVariableLib` design is
+being tested using mock versions of `UefiRuntimeServicesTableLib`, `PlatformPKProtectionLib`,
+and `UefiLib`...
+
+```
+[Components]
+  SecurityPkg/Library/SecureBootVariableLib/GoogleTest/SecureBootVariableLibGoogleTest.inf {
+    <LibraryClasses>
+      SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf
+      UefiRuntimeServicesTableLib|MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf
+      PlatformPKProtectionLib|SecurityPkg/Test/Mock/Library/GoogleTest/MockPlatformPKProtectionLib/MockPlatformPKProtectionLib.inf
+      UefiLib|MdePkg/Test/Mock/Library/GoogleTest/MockUefiLib/MockUefiLib.inf
+  }
+```
+
 ### GoogleTest Requirements - Code
 
-Not to state the obvious, but let's make sure we have the following include before getting too far along...
-
-```
-#include <gtest/gtest.h>
+GoogleTest applications are implemented in C++, so make sure that your test file has
+a `.cpp` extension. With that behind us, not to state the obvious, but let's make sure
+we have the following includes before getting too far along in the file...
+
+```cpp
+#include <Library/GoogleTestLib.h>
 extern "C" {
   #include <Uefi.h>
@@ -341 +1049 @@
 ```
 
-GoogleTest applications are implemented in C++. The first include brings in the
-GoogleTest definitions. Other EDK II related include files must be wrapped in
-`extern "C" {}` because they are C include files. Link failures will occur if
-this is not done.
-
-Now that we've got that squared away, let's look at our 'Main()'' routine (or DriverEntryPoint() or whatever).
+The first include brings in the GoogleTest definitions. Other EDK II related include
+files must be wrapped in `extern "C" {}` because they are C include files. Link
+failures will occur if this is not done.
+
+Also, when using GoogleTest it is helpful to add a `using` declaration for its
+`testing` namespace. This `using` statement greatly reduces the amount of code you
+need to write in the tests when referencing the utilities within the `testing`
+namespace. For example, instead of writing `::testing::Return` or `::testing::Test`,
+you can just write `Return` or `Test` respectively, and these types of references
+occur numerous times within the tests.
+
+Lastly, in the case that tests within a GoogleTest application require the usage of
+mock functions, it is also necessary to include the header files for those interfaces
+as well. As an example, the `SecureBootVariableLibGoogleTest` uses the mock versions
+of `UefiLib` and `UefiRuntimeServicesTableLib`. So its test file contains the below
+includes. Note that the `using` declaration mentioned above is also shown in the code
+below for completeness of the example.
+
+```cpp
+#include <Library/GoogleTestLib.h>
+#include <GoogleTest/Library/MockUefiLib.h>
+#include <GoogleTest/Library/MockUefiRuntimeServicesTableLib.h>
+
+extern "C" {
+  #include <Uefi.h>
+  ...
+}
+
+using namespace testing;
+```
+
+Now that we've got that squared away, let's look at our 'Main()' routine (or DriverEntryPoint() or whatever).
 
 ### GoogleTest Configuration
@@ -353 +1087 @@
 be registered. Instead, the test cases declare the test suite name and test
 case name as part of their implementation. The only requirement for GoogleTest
-is to have a `main()` function that initialize the GoogleTest infrastructure and
-call the service `RUN_ALL_TESTS()` to run all the unit tests.
-
-```c
+is to have a `main()` function that initializes the GoogleTest infrastructure
+and calls the service `RUN_ALL_TESTS()` to run all the unit tests.
+
+```cpp
 int main(int argc, char* argv[]) {
   testing::InitGoogleTest(&argc, argv);
@@ -363 +1097 @@
 ```
 
+However, while GoogleTest does not require test suites or test cases to be
+registered, there is still one rule within EDK II that currently needs to be
+followed. This rule is that all tests for a given GoogleTest application must
+be contained within the same source file that contains the `main()` function
+shown above. These tests can be written directly in the file or a `#include`
+can be used to add them into the file indirectly.
+
+The reason for this is due to EDK II taking the host application INF file and
+first compiling all of its source files into a static library. This static
+library is then linked into the final host application. The problem with this
+method is that only the tests in the object file containing the `main()`
+function are linked into the final host application. This is because the other
+tests are contained in their own object files within the static library and
+they have no symbols in them that the final host application depends on, so
+those object files are not linked into the final host application.
+
 ### GoogleTest - A Simple Test Case
 
-We'll look at the below test case from 'SampleGoogleTestHost'...
-
-```c
+Below is a sample test case from `SampleGoogleTestHost`.
+
+```cpp
 TEST(SimpleMathTests, OnePlusOneShouldEqualTwo) {
   UINTN  A;
@@ -394 +1144 @@
 _Note_ that this early return can have implications for memory leakage.
 
-There is no return status from a GooglTest unit test. If no assertions are
+For most `ASSERT` macros in GoogleTest there is also an equivalent `EXPECT` macro. Both macro versions
+will ultimately cause the `TEST` to fail if the check fails. However, the difference between the two
+macro versions is that when the check fails, the `ASSERT` version immediately returns from the `TEST`
+while the `EXPECT` version continues running the `TEST`.
+
+There is no return status from a GooglTest unit test. If no assertions (or expectations) are
 triggered then the unit test has a passing status.
+
+### GoogleTest - A gMock Test Case
+
+Below is a sample test case from `SecureBootVariableLibGoogleTest`. Although
+actually, the test case is not written exactly like this in the test file, but
+more on that in a bit.
+
+```cpp
+TEST(SetSecureBootModeTest, SetVarError) {
+  MockUefiRuntimeServicesTableLib RtServicesMock;
+  UINT8                           SecureBootMode;
+  EFI_STATUS                      Status;
+
+  // Any random magic number can be used for these tests
+  SecureBootMode = 0xAB;
+
+  EXPECT_CALL(RtServicesMock, gRT_SetVariable)
+    .WillOnce(Return(EFI_INVALID_PARAMETER));
+
+  Status = SetSecureBootMode(SecureBootMode);
+  EXPECT_EQ(Status, EFI_INVALID_PARAMETER);
+}
+```
+
+Keep in mind that this test is written to verify that `SetSecureBootMode()` will
+return `EFI_INVALID_PARAMETER` when the call to `gRT->SetVariable()` within the
+implementation of `SetSecureBootMode()` returns `EFI_INVALID_PARAMETER`. With that
+in mind, let's discuss how a mock function is used to accomplish this in the test.
+
+In this test case, the `MockUefiRuntimeServicesTableLib` interface is instantiated as
+`RtServicesMock` which enables its associated mock functions. These interface
+instantiations that contain the mock functions are very important for mock function
+based unit tests because without these instantiations, the mock functions within that
+interface will not exist and can not be used.
+
+The next line of interest is the `EXPECT_CALL`, which is a standard part of the gMock
+framework. This macro is telling the test that a call is expected to occur to a
+specific function on a specific interface. The first argument is the name of the
+interface object that was instantiated in this test, and the second argument is the
+name of the mock function within that interface that is expected to be called. The
+`WillOnce(Return(EFI_INVALID_PARAMETER))` associated with this `EXPECT_CALL` states
+that the `gRT_SetVariable()` function (remember from earlier in this documentation
+that this refers to the `gRT->SetVariable()` function) will be called once during
+this test, and when it does get called, we want it to return `EFI_INVALID_PARAMETER`.
+
+Once this `EXPECT_CALL` has been setup, the call to `SetSecureBootMode()` occurs in
+the test, and its return value is saved in `Status` so that it can be tested. Based
+on the `EXPECT_CALL` that was setup earlier, when `SetSecureBootMode()` internally
+calls `gRT->SetVariable()`, it returns `EFI_INVALID_PARAMETER`. This value should
+then be returned by `SetSecureBootMode()`, and the
+`EXPECT_EQ(Status, EFI_INVALID_PARAMETER)` verifies this is the case.
+
+There is much more that can be done with `EXPECT_CALL` and mock functions, but we
+will leave those details to be explained in the gMock documentation.
+
+Now it was mentioned earlier that this test case is not written exactly like this
+in the test file, and the next section describes how this test is slightly
+refactored to reduce the total amount of code in the entire test suite.
+
+### GoogleTest - A gMock Test Case (refactored)
+
+The sample test case from `SecureBootVariableLibGoogleTest` in the prior section is
+actually written as shown below.
+
+```cpp
+class SetSecureBootModeTest : public Test {
+  protected:
+    MockUefiRuntimeServicesTableLib RtServicesMock;
+    UINT8       SecureBootMode;
+    EFI_STATUS  Status;
+
+    void SetUp() override {
+      // Any random magic number can be used for these tests
+      SecureBootMode = 0xAB;
+    }
+};
+
+TEST_F(SetSecureBootModeTest, SetVarError) {
+  EXPECT_CALL(RtServicesMock, gRT_SetVariable)
+    .WillOnce(Return(EFI_INVALID_PARAMETER));
+
+  Status = SetSecureBootMode(SecureBootMode);
+  EXPECT_EQ(Status, EFI_INVALID_PARAMETER);
+}
+```
+
+This code may at first seem more complicated, but you will notice that the code
+with in it is still the same. There is still a `MockUefiRuntimeServicesTableLib`
+instantiation, there is still a `SecureBootMode` and `Status` variable defined,
+there is still an `EXPECT_CALL`, and etc. However, the benefit of constructing
+the test this way is that the new `TEST_F()` requires less code than the prior
+`TEST()`.
+
+This is made possible by the usage of what GoogleTest calls a _test fixture_.
+This concept of a test fixture allows multiple tests to use (or more specifically
+inherit from a base class) a common set of variables and initial conditions.
+Notice that using `TEST_F()` requires the first argument to be a name that aligns
+with a test fixture (in this case `SetSecureBootModeTest`), and the second
+argument is the name of the test (just like in the `TEST()` macro).
+
+All `TEST_F()` tests that use a specific test fixture can be thought of as having
+all of that test fixture's variables automatically defined in the test as well as
+having that text fixture's `SetUp()` function called before entering the test.
+
+This means that another `TEST_F()` can be written without needing to worry about
+defining a bunch of variables or instantiating a bunch of interfaces for mock
+functions. For example, the below test (also in `SecureBootVariableLibGoogleTest`)
+uses the same test fixture and makes use of its `RtServicesMock`, `Status`, and
+`SecureBootMode` variables.
+
+```cpp
+TEST_F(SetSecureBootModeTest, PropogateModeToSetVar) {
+  EXPECT_CALL(RtServicesMock,
+    gRT_SetVariable(
+      Char16StrEq(EFI_CUSTOM_MODE_NAME),
+      BufferEq(&gEfiCustomModeEnableGuid, sizeof(EFI_GUID)),
+      EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,
+      sizeof(SecureBootMode),
+      BufferEq(&SecureBootMode, sizeof(SecureBootMode))))
+    .WillOnce(Return(EFI_SUCCESS));
+
+  Status = SetSecureBootMode(SecureBootMode);
+  EXPECT_EQ(Status, EFI_SUCCESS);
+}
+```
+
+The biggest benefit is that the `TEST_F()` code can now focus on what is being
+tested and not worry about any repetitive setup. There is more that can be done
+with test fixtures, but we will leave those details to be explained in the
+gMock documentation.
+
+Now, as for what is in the above test, it is slightly more complicated than the
+first test. So let's explain this added complexity and what it is actually
+testing. In this test, there is still an `EXPECT_CALL` for the
+`gRT_SetVariable()` function. However, in this test we are stating that we
+expect the input arguments passed to `gRT_SetVariable()` be specific values.
+The order they are provided in the `EXPECT_CALL` align with the order of the
+arguments in the `gRT_SetVariable()` function. In this case the order of the
+`gRT_SetVariable()` arguments is as shown below.
+
+```cpp
+IN  CHAR16                       *VariableName,
+IN  EFI_GUID                     *VendorGuid,
+IN  UINT32                       Attributes,
+IN  UINTN                        DataSize,
+IN  VOID                         *Data
+```
+
+So in the `EXPECT_CALL` we are stating that the call to `gRT_SetVariable()`
+will be made with the below input argument values.
+
+1. `VariableName` is equal to the `EFI_CUSTOM_MODE_NAME` string
+2. `VendorGuid` is equal to the `gEfiCustomModeEnableGuid` GUID (which has a byte length of `sizeof(EFI_GUID)`)
+3. `Attributes` is equal to `EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS`
+4. `DataSize` is equal to `sizeof(SecureBootMode)`
+5. `Data` is equal to `SecureBootMode` (which has a byte length of `sizeof(SecureBootMode)`)
+
+If any one of these input arguments does not match in the actual call to
+`gRT_SetVariable()` in the design, then the test will fail. There is much more
+that can be done with `EXPECT_CALL` and mock functions, but again we will
+leave those details to be explained in the gMock documentation.
 
 ### GoogleTest - More Complex Cases
@@ -588 +1504 @@
 Host based Unit Tests will automatically enable coverage data.
 
-For Windows, This is primarily leverage for pipeline builds, but this can be leveraged locally using the
+For Windows, this is primarily leveraged for pipeline builds, but this can be leveraged locally using the
 OpenCppCoverage windows tool to parse coverage data to cobertura xml format.
 
@@ -608 +1524 @@
 
 
-For Linux, This is primarily leveraged for pipeline builds, but this can be leveraged locally using the
+For Linux, this is primarily leveraged for pipeline builds, but this can be leveraged locally using the
 lcov linux tool, and parsed using the lcov_cobertura python tool to parse it to cobertura xml format.
 
@@ -655 +1571 @@
 Code/Test                                   | Location
 ---------                                   | --------
-Host-Based Unit Tests for a Library/Protocol/PPI/GUID Interface   | If what's being tested is an interface (e.g. a library with a public header file, like DebugLib), the test should be scoped to the parent package.<br/>Example: `MdePkg/Test/UnitTest/[Library/Protocol/Ppi/Guid]/`<br/><br/>A real-world example of this is the BaseSafeIntLib test in MdePkg.<br/>`MdePkg/Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLibHost.inf`
-Host-Based Unit Tests for a Library/Driver (PEI/DXE/SMM) implementation   | If what's being tested is a specific implementation (e.g. BaseDebugLibSerialPort for DebugLib), the test should be scoped to the implementation directory itself, in a UnitTest subdirectory.<br/><br/>Module Example: `MdeModulePkg/Universal/EsrtFmpDxe/UnitTest/`<br/>Library Example: `MdePkg/Library/BaseMemoryLib/UnitTest/`
+Host-Based Unit Tests for a Library/Protocol/PPI/GUID Interface   | If what's being tested is an interface (e.g. a library with a public header file, like DebugLib) and the test is agnostic to a specific implementation, then the test should be scoped to the parent package.<br/>Example: `MdePkg/Test/UnitTest/[Library/Protocol/Ppi/Guid]/`<br/><br/>A real-world example of this is the BaseSafeIntLib test in MdePkg.<br/>`MdePkg/Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLibHost.inf`
+Host-Based Unit Tests for a Library/Driver (PEI/DXE/SMM) implementation   | If what's being tested is a specific implementation (e.g. BaseDebugLibSerialPort for DebugLib), then the test should be scoped to the implementation directory itself, in a UnitTest (or GoogleTest) subdirectory.<br/><br/>Module Example: `MdeModulePkg/Universal/EsrtFmpDxe/UnitTest/`<br/>Library Example: `MdePkg/Library/BaseMemoryLib/UnitTest/`<br/>Library Example (GoogleTest): `SecurityPkg/Library/SecureBootVariableLib/GoogleTest/`
 Host-Based Tests for a Functionality or Feature   | If you're writing a functional test that operates at the module level (i.e. if it's more than a single file or library), the test should be located in the package-level Tests directory under the HostFuncTest subdirectory.<br/>For example, if you were writing a test for the entire FMP Device Framework, you might put your test in:<br/>`FmpDevicePkg/Test/HostFuncTest/FmpDeviceFramework`<br/><br/>If the feature spans multiple packages, it's location should be determined by the package owners related to the feature.
 Non-Host-Based (PEI/DXE/SMM/Shell) Tests for a Functionality or Feature   | Similar to Host-Based, if the feature is in one package, should be located in the `*Pkg/Test/[Shell/Dxe/Smm/Pei]Test` directory.<br/><br/>If the feature spans multiple packages, it's location should be determined by the package owners related to the feature.<br/><br/>USAGE EXAMPLES<br/>PEI Example: MP_SERVICE_PPI. Or check MTRR configuration in a notification function.<br/> SMM Example: a test in a protocol callback function. (It is different with the solution that SmmAgent+ShellApp)<br/>DXE Example: a test in a UEFI event call back to check SPI/SMRAM status. <br/> Shell Example: the SMM handler audit test has a shell-based app that interacts with an SMM handler to get information. The SMM paging audit test gathers information about both DXE and SMM. And the SMM paging functional test actually forces errors into SMM via a DXE driver.
@@ -714 +1630 @@
         GeneralPurposeLibHostUnitTest.inf
 
+    Mock/
+      Include/
+        GoogleTest/
+          Library/
+            MockGeneralPurposeLib.h
+
+      Library/
+        GoogleTest/
+          MockGeneralPurposeLib/
+            MockGeneralPurposeLib.cpp
+            MockGeneralPurposeLib.inf
+
   <Package>Pkg.dsc          # Standard Modules and any Target-Based Test Apps (including in Test/)
-
 ```
 

trunk/src/VBox/Devices/EFI/FirmwareNew/UnitTestFrameworkPkg/Test/UnitTestFrameworkPkgHostTest.dsc

@@ -33 +33 @@
   #
   UnitTestFrameworkPkg/Library/CmockaLib/CmockaLib.inf
+  UnitTestFrameworkPkg/Library/FunctionMockLib/FunctionMockLib.inf
   UnitTestFrameworkPkg/Library/GoogleTestLib/GoogleTestLib.inf
   UnitTestFrameworkPkg/Library/Posix/DebugLibPosix/DebugLibPosix.inf
   UnitTestFrameworkPkg/Library/Posix/MemoryAllocationLibPosix/MemoryAllocationLibPosix.inf
+  UnitTestFrameworkPkg/Library/SubhookLib/SubhookLib.inf
   UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLibCmocka.inf

trunk/src/VBox/Devices/EFI/FirmwareNew/UnitTestFrameworkPkg/UnitTestFrameworkPkg.ci.yaml

@@ -80 +80 @@
         "IgnoreFiles": [             # use gitignore syntax to ignore errors in matching files
             "Library/CmockaLib/cmocka/**/*.*",  # not going to spell check a submodule
-            "Library/GoogleTestLib/googletest/**/*.*"  # not going to spell check a submodule
+            "Library/GoogleTestLib/googletest/**/*.*",  # not going to spell check a submodule
+            "Library/SubhookLib/subhook/**/*.*"  # not going to spell check a submodule
         ],
         "ExtendWords": [             # words to extend to the dictionary for this package
+            "Pointee",
+            "gmock",
+            "GMOCK",
+            "DSUBHOOK",
             "testcase",
             "testsuites",

trunk/src/VBox/Devices/EFI/FirmwareNew/UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec

@@ -21 +21 @@
   Library/GoogleTestLib/googletest/googletest/include
   Library/GoogleTestLib/googletest/googlemock/include
+  Library/SubhookLib/subhook
 
 [Includes.Common.Private]
@@ -26 +27 @@
   Library/CmockaLib/cmocka/include/cmockery
   Library/GoogleTestLib/googletest/googletest
+  Library/GoogleTestLib/googletest/googlemock
 
 [LibraryClasses]
@@ -35 +37 @@
   #
   GoogleTestLib|Include/Library/GoogleTestLib.h
+  SubhookLib|Include/Library/SubhookLib.h
+  FunctionMockLib|Include/Library/FunctionMockLib.h
 
 [LibraryClasses.Common.Private]

trunk/src/VBox/Devices/EFI/FirmwareNew/UnitTestFrameworkPkg/UnitTestFrameworkPkg.dsc

@@ -36 +36 @@
   UnitTestFrameworkPkg/Library/UnitTestDebugAssertLib/UnitTestDebugAssertLib.inf
   UnitTestFrameworkPkg/Library/UnitTestUefiBootServicesTableLib/UnitTestUefiBootServicesTableLib.inf
+  UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLib.inf
 
   UnitTestFrameworkPkg/Test/UnitTest/Sample/SampleUnitTest/SampleUnitTestDxe.inf

trunk/src/VBox/Devices/EFI/FirmwareNew/UnitTestFrameworkPkg/UnitTestFrameworkPkgHost.dsc.inc

@@ -16 +16 @@
   CmockaLib|UnitTestFrameworkPkg/Library/CmockaLib/CmockaLib.inf
   GoogleTestLib|UnitTestFrameworkPkg/Library/GoogleTestLib/GoogleTestLib.inf
+  SubhookLib|UnitTestFrameworkPkg/Library/SubhookLib/SubhookLib.inf
+  FunctionMockLib|UnitTestFrameworkPkg/Library/FunctionMockLib/FunctionMockLib.inf
   UnitTestLib|UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLibCmocka.inf
   DebugLib|UnitTestFrameworkPkg/Library/Posix/DebugLibPosix/DebugLibPosix.inf
   MemoryAllocationLib|UnitTestFrameworkPkg/Library/Posix/MemoryAllocationLibPosix/MemoryAllocationLibPosix.inf
   UefiBootServicesTableLib|UnitTestFrameworkPkg/Library/UnitTestUefiBootServicesTableLib/UnitTestUefiBootServicesTableLib.inf
+  PeiServicesTablePointerLib|UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLib.inf
 
 [BuildOptions]