diff --git a/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimDxeLib/GoogleTest/ConfigKnobShimDxeLibGoogleTest.cpp b/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimDxeLib/GoogleTest/ConfigKnobShimDxeLibGoogleTest.cpp index d2256b71..28c35006 100644 --- a/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimDxeLib/GoogleTest/ConfigKnobShimDxeLibGoogleTest.cpp +++ b/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimDxeLib/GoogleTest/ConfigKnobShimDxeLibGoogleTest.cpp @@ -9,10 +9,10 @@ #include #include extern "C" { -#include -#include -#include -#include + #include + #include + #include + #include } #define CONFIG_KNOB_GUID {0x52d39693, 0x4f64, 0x4ee6, {0x81, 0xde, 0x45, 0x89, 0x37, 0x72, 0x78, 0x55}} @@ -23,27 +23,27 @@ using namespace testing; class GetConfigKnobOverrideFromVariableStorageTest : public Test { protected: -StrictMock RtServicesMock; -EFI_STATUS Status; -EFI_GUID ConfigKnobGuid; -CHAR16 *ConfigKnobName; -UINT64 ProfileDefaultValue; -UINTN ProfileDefaultSize; -UINT64 VariableData; -UINT64 ConfigKnobData; - -// Redefining the Test class's SetUp function for test fixtures. -void -SetUp ( - ) override -{ - ConfigKnobGuid = CONFIG_KNOB_GUID; - ConfigKnobName = (CHAR16 *)L"MyDeadBeefDelivery"; - ProfileDefaultValue = 0xDEADBEEFDEADBEEF; - ProfileDefaultSize = sizeof (ProfileDefaultValue); - VariableData = 0xBEEF7777BEEF7777; - ConfigKnobData = ProfileDefaultValue; -} + StrictMock RtServicesMock; + EFI_STATUS Status; + EFI_GUID ConfigKnobGuid; + CHAR16 *ConfigKnobName; + UINT64 ProfileDefaultValue; + UINTN ProfileDefaultSize; + UINT64 VariableData; + UINT64 ConfigKnobData; + + // Redefining the Test class's SetUp function for test fixtures. + void + SetUp ( + ) override + { + ConfigKnobGuid = CONFIG_KNOB_GUID; + ConfigKnobName = (CHAR16 *)L"MyDeadBeefDelivery"; + ProfileDefaultValue = 0xDEADBEEFDEADBEEF; + ProfileDefaultSize = sizeof (ProfileDefaultValue); + VariableData = 0xBEEF7777BEEF7777; + ConfigKnobData = ProfileDefaultValue; + } }; // diff --git a/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimPeiLib/GoogleTest/ConfigKnobShimPeiLibGoogleTest.cpp b/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimPeiLib/GoogleTest/ConfigKnobShimPeiLibGoogleTest.cpp index 68522b90..3210c914 100644 --- a/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimPeiLib/GoogleTest/ConfigKnobShimPeiLibGoogleTest.cpp +++ b/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimPeiLib/GoogleTest/ConfigKnobShimPeiLibGoogleTest.cpp @@ -12,10 +12,10 @@ #include extern "C" { -#include -#include -#include -#include + #include + #include + #include + #include } #define CONFIG_KNOB_GUID {0x52d39693, 0x4f64, 0x4ee6, {0x81, 0xde, 0x45, 0x89, 0x37, 0x72, 0x78, 0x55}} @@ -26,28 +26,28 @@ using namespace testing; class GetConfigKnobOverrideFromVariableStorageTest : public Test { protected: -StrictMock PeiServicesMock; -StrictMock PpiVariableServicesMock; // mock of EFI_PEI_READ_ONLY_VARIABLE2_PPI -EFI_STATUS Status; -EFI_GUID ConfigKnobGuid; -CHAR16 *ConfigKnobName; -UINT64 ProfileDefaultValue; -UINTN ProfileDefaultSize; -UINT64 VariableData; -UINT64 ConfigKnobData; - -// Redefining the Test class's SetUp function for test fixtures. -void -SetUp ( - ) override -{ - ConfigKnobGuid = CONFIG_KNOB_GUID; - ConfigKnobName = (CHAR16 *)L"MyDeadBeefDelivery"; - ProfileDefaultValue = 0xDEADBEEFDEADBEEF; - ProfileDefaultSize = sizeof (ProfileDefaultValue); - VariableData = 0xBEEF7777BEEF7777; - ConfigKnobData = ProfileDefaultValue; -} + StrictMock PeiServicesMock; + StrictMock PpiVariableServicesMock; // mock of EFI_PEI_READ_ONLY_VARIABLE2_PPI + EFI_STATUS Status; + EFI_GUID ConfigKnobGuid; + CHAR16 *ConfigKnobName; + UINT64 ProfileDefaultValue; + UINTN ProfileDefaultSize; + UINT64 VariableData; + UINT64 ConfigKnobData; + + // Redefining the Test class's SetUp function for test fixtures. + void + SetUp ( + ) override + { + ConfigKnobGuid = CONFIG_KNOB_GUID; + ConfigKnobName = (CHAR16 *)L"MyDeadBeefDelivery"; + ProfileDefaultValue = 0xDEADBEEFDEADBEEF; + ProfileDefaultSize = sizeof (ProfileDefaultValue); + VariableData = 0xBEEF7777BEEF7777; + ConfigKnobData = ProfileDefaultValue; + } }; //