* [edk2-devel] [PATCH v1 0/7] Uncrustify GoogleTest update
@ 2023-08-09 21:32 VivianNK
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 1/7] .pytool: Set uncrustify check to audit only VivianNK
` (7 more replies)
0 siblings, 8 replies; 15+ messages in thread
From: VivianNK @ 2023-08-09 21:32 UTC (permalink / raw)
To: devel
Introduce cpp-specific formatting rules to Uncrustify for readability:
* indent_class: indent lines inside of a class
* indent_extern: indent lines inside of an extern
Apply all Uncrustify formatting rules defined in the config to existing
cpp and header files (GoogleTest files).
Moving forward all GoogleTest files will be included in uncrustify
formatting checks, leading to more consistency and greater readability.
VivianNK (7):
.pytool: Set uncrustify check to audit only
.pytool: Add cpp support to uncrustify plugin
MdeModulePkg: Applyy uncrustify formatting to relevant files.
MdePkg: Apply uncrustify formatting to relevant files
SecurityPkg: Apply uncrustify formatting to relevant files
UnitTestFrameworkPkg: Apply uncrustify formatting to relevant files
.pytool: Undo uncrustify check change
.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py | 2 +-
.pytool/Plugin/UncrustifyCheck/uncrustify.cfg | 4 +-
MdeModulePkg/Library/UefiSortLib/GoogleTest/UefiSortLibGoogleTest.cpp | 37 +-
MdeModulePkg/Test/Mock/Include/GoogleTest/Library/MockPciHostBridgeLib.h | 4 +-
MdeModulePkg/Test/Mock/Library/GoogleTest/MockPciHostBridgeLib/MockPciHostBridgeLib.cpp | 8 +-
MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/SafeIntLibUintnIntnUnitTests32.cpp | 114 ++--
MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/SafeIntLibUintnIntnUnitTests64.cpp | 114 ++--
MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/TestBaseSafeIntLib.cpp | 563 ++++++++++----------
MdePkg/Test/Mock/Include/GoogleTest/Library/MockHobLib.h | 6 +-
MdePkg/Test/Mock/Include/GoogleTest/Library/MockPeiServicesLib.h | 6 +-
MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiLib.h | 4 +-
MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiRuntimeServicesTableLib.h | 4 +-
MdePkg/Test/Mock/Library/GoogleTest/MockHobLib/MockHobLib.cpp | 40 +-
MdePkg/Test/Mock/Library/GoogleTest/MockPeiServicesLib/MockPeiServicesLib.cpp | 52 +-
MdePkg/Test/Mock/Library/GoogleTest/MockUefiLib/MockUefiLib.cpp | 6 +-
MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.cpp | 12 +-
SecurityPkg/Library/SecureBootVariableLib/GoogleTest/SecureBootVariableLibGoogleTest.cpp | 205 ++++---
SecurityPkg/Test/Mock/Include/GoogleTest/Library/MockPlatformPKProtectionLib.h | 4 +-
SecurityPkg/Test/Mock/Library/GoogleTest/MockPlatformPKProtectionLib/MockPlatformPKProtectionLib.cpp | 4 +-
UnitTestFrameworkPkg/Include/Library/GoogleTestLib.h | 2 +-
UnitTestFrameworkPkg/Test/GoogleTest/Sample/SampleGoogleTest/SampleGoogleTest.cpp | 76 +--
21 files changed, 664 insertions(+), 603 deletions(-)
--
2.41.0.windows.3
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107665): https://edk2.groups.io/g/devel/message/107665
Mute This Topic: https://groups.io/mt/100655288/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 15+ messages in thread
* [edk2-devel] [PATCH v1 1/7] .pytool: Set uncrustify check to audit only
2023-08-09 21:32 [edk2-devel] [PATCH v1 0/7] Uncrustify GoogleTest update VivianNK
@ 2023-08-09 21:32 ` VivianNK
2023-08-15 1:06 ` Michael Kubacki
[not found] ` <177B69072E52D32F.12117@groups.io>
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 2/7] .pytool: Add cpp support to uncrustify plugin VivianNK
` (6 subsequent siblings)
7 siblings, 2 replies; 15+ messages in thread
From: VivianNK @ 2023-08-09 21:32 UTC (permalink / raw)
To: devel
Temporarily set uncrustify to audit only to prevent build failures.
CC: Sean Brogan <sean.brogan@microsoft.com>
CC: Michael Kubacki <mikuback@linux.microsoft.com>
CC: Michael D Kinney <michael.d.kinney@intel.com>
CC: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Vivian Nowka-Keane <vnowkakeane@linux.microsoft.com>
---
.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
index 8dc9ffe6945a..8978ffc443bf 100644
--- a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
+++ b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
@@ -530,7 +530,7 @@ class UncrustifyCheck(ICiBuildPlugin):
"""
Initializes options that influence test case output.
"""
- self._audit_only_mode = False
+ self._audit_only_mode = True
self._output_file_diffs = True
if "AuditOnly" in self._package_config and self._package_config["AuditOnly"]:
--
2.41.0.windows.3
1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107667): https://edk2.groups.io/g/devel/message/107667
Mute This Topic: https://groups.io/mt/100655290/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [edk2-devel] [PATCH v1 2/7] .pytool: Add cpp support to uncrustify plugin
2023-08-09 21:32 [edk2-devel] [PATCH v1 0/7] Uncrustify GoogleTest update VivianNK
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 1/7] .pytool: Set uncrustify check to audit only VivianNK
@ 2023-08-09 21:32 ` VivianNK
2023-08-15 1:22 ` Michael Kubacki
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 3/7] MdeModulePkg: Applyy uncrustify formatting to relevant files VivianNK
` (5 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: VivianNK @ 2023-08-09 21:32 UTC (permalink / raw)
To: devel
Modified the uncrustify config to apply cpp specific formatting rules.
Modified uncrustify check to include *.cpp files.
CC: Sean Brogan <sean.brogan@microsoft.com>
CC: Michael Kubacki <mikuback@linux.microsoft.com>
CC: Michael D Kinney <michael.d.kinney@intel.com>
CC: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Vivian Nowka-Keane <vnowkakeane@linux.microsoft.com>
---
.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py | 2 +-
.pytool/Plugin/UncrustifyCheck/uncrustify.cfg | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
index 8978ffc443bf..17f77b48d954 100644
--- a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
+++ b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
@@ -110,7 +110,7 @@ class UncrustifyCheck(ICiBuildPlugin):
# A package can add any additional paths with "AdditionalIncludePaths"
# A package can remove any of these paths with "IgnoreStandardPaths"
#
- STANDARD_PLUGIN_DEFINED_PATHS = ("*.c", "*.h")
+ STANDARD_PLUGIN_DEFINED_PATHS = ("*.c", "*.h", "*.cpp")
#
# The Uncrustify application path should set in this environment variable
diff --git a/.pytool/Plugin/UncrustifyCheck/uncrustify.cfg b/.pytool/Plugin/UncrustifyCheck/uncrustify.cfg
index 8506c3333715..d7e86a6e57e6 100644
--- a/.pytool/Plugin/UncrustifyCheck/uncrustify.cfg
+++ b/.pytool/Plugin/UncrustifyCheck/uncrustify.cfg
@@ -215,7 +215,7 @@ indent_braces = false
indent_braces_no_class = false
indent_braces_no_func = true
indent_braces_no_struct = false
-indent_class = false
+indent_class = true
indent_class_colon = false
indent_cmt_with_tabs = false # Whether to indent comments that are not at a brace level with tabs on
# a tabstop. Requires indent_with_tabs=2. If false, will use spaces.
@@ -223,7 +223,7 @@ indent_col1_comment = true
indent_col1_multi_string_literal= true
indent_comma_paren = true
indent_else_if = true
-indent_extern = false
+indent_extern = true
indent_first_bool_expr = true
indent_func_def_param_paren_pos_threshold = 0
--
2.41.0.windows.3
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107666): https://edk2.groups.io/g/devel/message/107666
Mute This Topic: https://groups.io/mt/100655289/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [edk2-devel] [PATCH v1 3/7] MdeModulePkg: Applyy uncrustify formatting to relevant files.
2023-08-09 21:32 [edk2-devel] [PATCH v1 0/7] Uncrustify GoogleTest update VivianNK
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 1/7] .pytool: Set uncrustify check to audit only VivianNK
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 2/7] .pytool: Add cpp support to uncrustify plugin VivianNK
@ 2023-08-09 21:32 ` VivianNK
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 4/7] MdePkg: Apply " VivianNK
` (4 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: VivianNK @ 2023-08-09 21:32 UTC (permalink / raw)
To: devel
Apply uncrustify formatting to GoogleTest cpp files and respective
header file.
CC: Jian J Wang <jian.j.wang@intel.com>
CC: Liming Gao <gaoliming@byosoft.com.cn>
CC: Hao A Wu <hao.a.wu@intel.com>
CC: Ray Ni <ray.ni@intel.com>
Signed-off-by: Vivian Nowka-Keane <vnowkakeane@linux.microsoft.com>
---
MdeModulePkg/Library/UefiSortLib/GoogleTest/UefiSortLibGoogleTest.cpp | 37 +++++++++++---------
MdeModulePkg/Test/Mock/Include/GoogleTest/Library/MockPciHostBridgeLib.h | 4 +--
MdeModulePkg/Test/Mock/Library/GoogleTest/MockPciHostBridgeLib/MockPciHostBridgeLib.cpp | 8 ++---
3 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/MdeModulePkg/Library/UefiSortLib/GoogleTest/UefiSortLibGoogleTest.cpp b/MdeModulePkg/Library/UefiSortLib/GoogleTest/UefiSortLibGoogleTest.cpp
index 23f6e9cc0611..16986a512fa3 100644
--- a/MdeModulePkg/Library/UefiSortLib/GoogleTest/UefiSortLibGoogleTest.cpp
+++ b/MdeModulePkg/Library/UefiSortLib/GoogleTest/UefiSortLibGoogleTest.cpp
@@ -20,9 +20,9 @@ CompareUint32 (
IN CONST VOID *Right
)
{
- if (*(UINT32*)Right > *(UINT32*)Left) {
+ if (*(UINT32 *)Right > *(UINT32 *)Left) {
return 1;
- } else if (*(UINT32*)Right < *(UINT32*)Left) {
+ } else if (*(UINT32 *)Right < *(UINT32 *)Left) {
return -1;
}
@@ -31,31 +31,36 @@ CompareUint32 (
// Test PerformQuickSort() API from UefiSortLib to verify a UINT32 array
// with 9 elements in ascending order is sorted into descending order.
-TEST(PerformQuickSortTest, SortUint32AscendingArray_Size9) {
- CONST UINT32 ArraySize = 9;
- UINT32 BuffActual[ArraySize];
- UINT32 BuffExpected[ArraySize];
+TEST (PerformQuickSortTest, SortUint32AscendingArray_Size9) {
+ CONST UINT32 ArraySize = 9;
+ UINT32 BuffActual[ArraySize];
+ UINT32 BuffExpected[ArraySize];
for (UINT32 Index = 0; Index < ArraySize; Index++) {
- BuffActual[Index] = Index + 1;
+ BuffActual[Index] = Index + 1;
BuffExpected[Index] = ArraySize - Index;
}
- PerformQuickSort (BuffActual, (UINTN)ArraySize, sizeof(UINT32), (SORT_COMPARE)CompareUint32);
- EXPECT_THAT(BuffActual, ElementsAreArray(BuffExpected, ArraySize));
+ PerformQuickSort (BuffActual, (UINTN)ArraySize, sizeof (UINT32), (SORT_COMPARE)CompareUint32);
+ EXPECT_THAT (BuffActual, ElementsAreArray (BuffExpected, ArraySize));
}
// Test StringCompare() API from UefiSortLib to verify the comparison
// succeeds when the same buffer is compared with itself.
-TEST(StringCompareTest, CompareSameBuffer) {
- INTN RetVal;
- CONST CHAR16 *Buffer = (CHAR16*)L"abcdefg";
+TEST (StringCompareTest, CompareSameBuffer) {
+ INTN RetVal;
+ CONST CHAR16 *Buffer = (CHAR16 *)L"abcdefg";
RetVal = StringCompare (&Buffer, &Buffer);
- EXPECT_EQ(RetVal, 0);
+ EXPECT_EQ (RetVal, 0);
}
-int main(int argc, char* argv[]) {
- testing::InitGoogleTest(&argc, argv);
- return RUN_ALL_TESTS();
+int
+main (
+ int argc,
+ char *argv[]
+ )
+{
+ testing::InitGoogleTest (&argc, argv);
+ return RUN_ALL_TESTS ();
}
diff --git a/MdeModulePkg/Test/Mock/Include/GoogleTest/Library/MockPciHostBridgeLib.h b/MdeModulePkg/Test/Mock/Include/GoogleTest/Library/MockPciHostBridgeLib.h
index a63bed895c60..51eefa6c21e8 100644
--- a/MdeModulePkg/Test/Mock/Include/GoogleTest/Library/MockPciHostBridgeLib.h
+++ b/MdeModulePkg/Test/Mock/Include/GoogleTest/Library/MockPciHostBridgeLib.h
@@ -11,8 +11,8 @@
#include <Library/GoogleTestLib.h>
#include <Library/FunctionMockLib.h>
extern "C" {
-#include <Uefi.h>
-#include <Library/PciHostBridgeLib.h>
+ #include <Uefi.h>
+ #include <Library/PciHostBridgeLib.h>
}
struct MockPciHostBridgeLib {
diff --git a/MdeModulePkg/Test/Mock/Library/GoogleTest/MockPciHostBridgeLib/MockPciHostBridgeLib.cpp b/MdeModulePkg/Test/Mock/Library/GoogleTest/MockPciHostBridgeLib/MockPciHostBridgeLib.cpp
index 4b15aed16966..1891727d3b2a 100644
--- a/MdeModulePkg/Test/Mock/Library/GoogleTest/MockPciHostBridgeLib/MockPciHostBridgeLib.cpp
+++ b/MdeModulePkg/Test/Mock/Library/GoogleTest/MockPciHostBridgeLib/MockPciHostBridgeLib.cpp
@@ -7,8 +7,8 @@
#include <GoogleTest/Library/MockPciHostBridgeLib.h>
-MOCK_INTERFACE_DEFINITION(MockPciHostBridgeLib);
+MOCK_INTERFACE_DEFINITION (MockPciHostBridgeLib);
-MOCK_FUNCTION_DEFINITION(MockPciHostBridgeLib, PciHostBridgeGetRootBridges, 1, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPciHostBridgeLib, PciHostBridgeFreeRootBridges, 2, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPciHostBridgeLib, PciHostBridgeResourceConflict, 2, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPciHostBridgeLib, PciHostBridgeGetRootBridges, 1, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPciHostBridgeLib, PciHostBridgeFreeRootBridges, 2, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPciHostBridgeLib, PciHostBridgeResourceConflict, 2, EFIAPI);
--
2.41.0.windows.3
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107668): https://edk2.groups.io/g/devel/message/107668
Mute This Topic: https://groups.io/mt/100655291/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [edk2-devel] [PATCH v1 4/7] MdePkg: Apply uncrustify formatting to relevant files
2023-08-09 21:32 [edk2-devel] [PATCH v1 0/7] Uncrustify GoogleTest update VivianNK
` (2 preceding siblings ...)
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 3/7] MdeModulePkg: Applyy uncrustify formatting to relevant files VivianNK
@ 2023-08-09 21:32 ` VivianNK
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 5/7] SecurityPkg: " VivianNK
` (3 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: VivianNK @ 2023-08-09 21:32 UTC (permalink / raw)
To: devel
Apply uncrustify formatting to GoogleTest cpp and header files.
CC: Michael D Kinney <michael.d.kinney@intel.com>
CC: Liming Gao <gaoliming@byosoft.com.cn>
CC: Zhiguang Liu <zhiguang.liu@intel.com>
Signed-off-by: Vivian Nowka-Keane <vnowkakeane@linux.microsoft.com>
---
MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/SafeIntLibUintnIntnUnitTests32.cpp | 114 ++--
MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/SafeIntLibUintnIntnUnitTests64.cpp | 114 ++--
MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/TestBaseSafeIntLib.cpp | 563 ++++++++++----------
MdePkg/Test/Mock/Include/GoogleTest/Library/MockHobLib.h | 6 +-
MdePkg/Test/Mock/Include/GoogleTest/Library/MockPeiServicesLib.h | 6 +-
MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiLib.h | 4 +-
MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiRuntimeServicesTableLib.h | 4 +-
MdePkg/Test/Mock/Library/GoogleTest/MockHobLib/MockHobLib.cpp | 40 +-
MdePkg/Test/Mock/Library/GoogleTest/MockPeiServicesLib/MockPeiServicesLib.cpp | 52 +-
MdePkg/Test/Mock/Library/GoogleTest/MockUefiLib/MockUefiLib.cpp | 6 +-
MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.cpp | 12 +-
11 files changed, 463 insertions(+), 458 deletions(-)
diff --git a/MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/SafeIntLibUintnIntnUnitTests32.cpp b/MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/SafeIntLibUintnIntnUnitTests32.cpp
index 6fbf302c1c5e..3f50f0cd99db 100644
--- a/MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/SafeIntLibUintnIntnUnitTests32.cpp
+++ b/MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/SafeIntLibUintnIntnUnitTests32.cpp
@@ -14,10 +14,10 @@ extern "C" {
#include <Library/SafeIntLib.h>
}
-TEST(ConversionTestSuite, TestSafeInt32ToUintn) {
+TEST (ConversionTestSuite, TestSafeInt32ToUintn) {
RETURN_STATUS Status;
- INT32 Operand;
- UINTN Result;
+ INT32 Operand;
+ UINTN Result;
//
// If Operand is non-negative, then it's a cast
@@ -36,10 +36,10 @@ TEST(ConversionTestSuite, TestSafeInt32ToUintn) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint32ToIntn) {
+TEST (ConversionTestSuite, TestSafeUint32ToIntn) {
RETURN_STATUS Status;
- UINT32 Operand;
- INTN Result;
+ UINT32 Operand;
+ INTN Result;
//
// If Operand is <= MAX_INTN, then it's a cast
@@ -58,10 +58,10 @@ TEST(ConversionTestSuite, TestSafeUint32ToIntn) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeIntnToInt32) {
+TEST (ConversionTestSuite, TestSafeIntnToInt32) {
RETURN_STATUS Status;
- INTN Operand;
- INT32 Result;
+ INTN Operand;
+ INT32 Result;
//
// INTN is same as INT32 in IA32, so this is just a cast
@@ -73,10 +73,10 @@ TEST(ConversionTestSuite, TestSafeIntnToInt32) {
ASSERT_EQ (0x5bababab, Result);
}
-TEST(ConversionTestSuite, TestSafeIntnToUint32) {
+TEST (ConversionTestSuite, TestSafeIntnToUint32) {
RETURN_STATUS Status;
- INTN Operand;
- UINT32 Result;
+ INTN Operand;
+ UINT32 Result;
//
// If Operand is non-negative, then it's a cast
@@ -95,10 +95,10 @@ TEST(ConversionTestSuite, TestSafeIntnToUint32) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUintnToUint32) {
+TEST (ConversionTestSuite, TestSafeUintnToUint32) {
RETURN_STATUS Status;
- UINTN Operand;
- UINT32 Result;
+ UINTN Operand;
+ UINT32 Result;
//
// UINTN is same as UINT32 in IA32, so this is just a cast
@@ -110,10 +110,10 @@ TEST(ConversionTestSuite, TestSafeUintnToUint32) {
ASSERT_EQ (0xabababab, Result);
}
-TEST(ConversionTestSuite, TestSafeUintnToIntn) {
+TEST (ConversionTestSuite, TestSafeUintnToIntn) {
RETURN_STATUS Status;
- UINTN Operand;
- INTN Result;
+ UINTN Operand;
+ INTN Result;
//
// If Operand is <= MAX_INTN, then it's a cast
@@ -132,10 +132,10 @@ TEST(ConversionTestSuite, TestSafeUintnToIntn) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUintnToInt64) {
+TEST (ConversionTestSuite, TestSafeUintnToInt64) {
RETURN_STATUS Status;
- UINTN Operand;
- INT64 Result;
+ UINTN Operand;
+ INT64 Result;
//
// UINTN is same as UINT32 in IA32, and UINT32 is a subset of
@@ -148,10 +148,10 @@ TEST(ConversionTestSuite, TestSafeUintnToInt64) {
ASSERT_EQ (0xabababab, Result);
}
-TEST(ConversionTestSuite, TestSafeInt64ToIntn) {
+TEST (ConversionTestSuite, TestSafeInt64ToIntn) {
RETURN_STATUS Status;
- INT64 Operand;
- INTN Result;
+ INT64 Operand;
+ INTN Result;
//
// If Operand is between MIN_INTN and MAX_INTN2 inclusive, then it's a cast
@@ -179,10 +179,10 @@ TEST(ConversionTestSuite, TestSafeInt64ToIntn) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt64ToUintn) {
+TEST (ConversionTestSuite, TestSafeInt64ToUintn) {
RETURN_STATUS Status;
- INT64 Operand;
- UINTN Result;
+ INT64 Operand;
+ UINTN Result;
//
// If Operand is between 0 and MAX_UINTN inclusive, then it's a cast
@@ -205,10 +205,10 @@ TEST(ConversionTestSuite, TestSafeInt64ToUintn) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint64ToIntn) {
+TEST (ConversionTestSuite, TestSafeUint64ToIntn) {
RETURN_STATUS Status;
- UINT64 Operand;
- INTN Result;
+ UINT64 Operand;
+ INTN Result;
//
// If Operand is <= MAX_INTN, then it's a cast
@@ -227,10 +227,10 @@ TEST(ConversionTestSuite, TestSafeUint64ToIntn) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint64ToUintn) {
+TEST (ConversionTestSuite, TestSafeUint64ToUintn) {
RETURN_STATUS Status;
- UINT64 Operand;
- UINTN Result;
+ UINT64 Operand;
+ UINTN Result;
//
// If Operand is <= MAX_UINTN, then it's a cast
@@ -249,11 +249,11 @@ TEST(ConversionTestSuite, TestSafeUint64ToUintn) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeUintnAdd) {
+TEST (AdditionSubtractionTestSuite, TestSafeUintnAdd) {
RETURN_STATUS Status;
- UINTN Augend;
- UINTN Addend;
- UINTN Result;
+ UINTN Augend;
+ UINTN Addend;
+ UINTN Result;
//
// If the result of addition doesn't overflow MAX_UINTN, then it's addition
@@ -274,11 +274,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeUintnAdd) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeIntnAdd) {
+TEST (AdditionSubtractionTestSuite, TestSafeIntnAdd) {
RETURN_STATUS Status;
- INTN Augend;
- INTN Addend;
- INTN Result;
+ INTN Augend;
+ INTN Addend;
+ INTN Result;
//
// If the result of addition doesn't overflow MAX_INTN
@@ -311,11 +311,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeIntnAdd) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeUintnSub) {
+TEST (AdditionSubtractionTestSuite, TestSafeUintnSub) {
RETURN_STATUS Status;
- UINTN Minuend;
- UINTN Subtrahend;
- UINTN Result;
+ UINTN Minuend;
+ UINTN Subtrahend;
+ UINTN Result;
//
// If Minuend >= Subtrahend, then it's subtraction
@@ -336,11 +336,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeUintnSub) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeIntnSub) {
+TEST (AdditionSubtractionTestSuite, TestSafeIntnSub) {
RETURN_STATUS Status;
- INTN Minuend;
- INTN Subtrahend;
- INTN Result;
+ INTN Minuend;
+ INTN Subtrahend;
+ INTN Result;
//
// If the result of subtractions doesn't overflow MAX_INTN or
@@ -373,11 +373,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeIntnSub) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(MultiplicationTestSuite, TestSafeUintnMult) {
+TEST (MultiplicationTestSuite, TestSafeUintnMult) {
RETURN_STATUS Status;
- UINTN Multiplicand;
- UINTN Multiplier;
- UINTN Result;
+ UINTN Multiplicand;
+ UINTN Multiplier;
+ UINTN Result;
//
// If the result of multiplication doesn't overflow MAX_UINTN, it will succeed
@@ -398,11 +398,11 @@ TEST(MultiplicationTestSuite, TestSafeUintnMult) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(MultiplicationTestSuite, TestSafeIntnMult) {
+TEST (MultiplicationTestSuite, TestSafeIntnMult) {
RETURN_STATUS Status;
- INTN Multiplicand;
- INTN Multiplier;
- INTN Result;
+ INTN Multiplicand;
+ INTN Multiplier;
+ INTN Result;
//
// If the result of multiplication doesn't overflow MAX_INTN and doesn't
diff --git a/MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/SafeIntLibUintnIntnUnitTests64.cpp b/MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/SafeIntLibUintnIntnUnitTests64.cpp
index 6fb0710cfed6..6efdd3be7c5e 100644
--- a/MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/SafeIntLibUintnIntnUnitTests64.cpp
+++ b/MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/SafeIntLibUintnIntnUnitTests64.cpp
@@ -14,10 +14,10 @@ extern "C" {
#include <Library/SafeIntLib.h>
}
-TEST(ConversionTestSuite, TestSafeInt32ToUintn) {
+TEST (ConversionTestSuite, TestSafeInt32ToUintn) {
RETURN_STATUS Status;
- INT32 Operand;
- UINTN Result;
+ INT32 Operand;
+ UINTN Result;
//
// If Operand is non-negative, then it's a cast
@@ -36,10 +36,10 @@ TEST(ConversionTestSuite, TestSafeInt32ToUintn) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint32ToIntn) {
+TEST (ConversionTestSuite, TestSafeUint32ToIntn) {
RETURN_STATUS Status;
- UINT32 Operand;
- INTN Result;
+ UINT32 Operand;
+ INTN Result;
//
// For x64, INTN is same as INT64 which is a superset of INT32
@@ -56,10 +56,10 @@ TEST(ConversionTestSuite, TestSafeUint32ToIntn) {
ASSERT_EQ (0xabababab, Result);
}
-TEST(ConversionTestSuite, TestSafeIntnToInt32) {
+TEST (ConversionTestSuite, TestSafeIntnToInt32) {
RETURN_STATUS Status;
- INTN Operand;
- INT32 Result;
+ INTN Operand;
+ INT32 Result;
//
// If Operand is between MIN_INT32 and MAX_INT32 inclusive, then it's a cast
@@ -87,10 +87,10 @@ TEST(ConversionTestSuite, TestSafeIntnToInt32) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeIntnToUint32) {
+TEST (ConversionTestSuite, TestSafeIntnToUint32) {
RETURN_STATUS Status;
- INTN Operand;
- UINT32 Result;
+ INTN Operand;
+ UINT32 Result;
//
// If Operand is between 0 and MAX_UINT32 inclusive, then it's a cast
@@ -113,10 +113,10 @@ TEST(ConversionTestSuite, TestSafeIntnToUint32) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUintnToUint32) {
+TEST (ConversionTestSuite, TestSafeUintnToUint32) {
RETURN_STATUS Status;
- UINTN Operand;
- UINT32 Result;
+ UINTN Operand;
+ UINT32 Result;
//
// If Operand is <= MAX_UINT32, then it's a cast
@@ -135,10 +135,10 @@ TEST(ConversionTestSuite, TestSafeUintnToUint32) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUintnToIntn) {
+TEST (ConversionTestSuite, TestSafeUintnToIntn) {
RETURN_STATUS Status;
- UINTN Operand;
- INTN Result;
+ UINTN Operand;
+ INTN Result;
//
// If Operand is <= MAX_INTN (0x7fff_ffff_ffff_ffff), then it's a cast
@@ -157,10 +157,10 @@ TEST(ConversionTestSuite, TestSafeUintnToIntn) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUintnToInt64) {
+TEST (ConversionTestSuite, TestSafeUintnToInt64) {
RETURN_STATUS Status;
- UINTN Operand;
- INT64 Result;
+ UINTN Operand;
+ INT64 Result;
//
// If Operand is <= MAX_INT64, then it's a cast
@@ -179,10 +179,10 @@ TEST(ConversionTestSuite, TestSafeUintnToInt64) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt64ToIntn) {
+TEST (ConversionTestSuite, TestSafeInt64ToIntn) {
RETURN_STATUS Status;
- INT64 Operand;
- INTN Result;
+ INT64 Operand;
+ INTN Result;
//
// INTN is same as INT64 in x64, so this is just a cast
@@ -194,10 +194,10 @@ TEST(ConversionTestSuite, TestSafeInt64ToIntn) {
ASSERT_EQ (0x5babababefefefef, Result);
}
-TEST(ConversionTestSuite, TestSafeInt64ToUintn) {
+TEST (ConversionTestSuite, TestSafeInt64ToUintn) {
RETURN_STATUS Status;
- INT64 Operand;
- UINTN Result;
+ INT64 Operand;
+ UINTN Result;
//
// If Operand is non-negative, then it's a cast
@@ -216,10 +216,10 @@ TEST(ConversionTestSuite, TestSafeInt64ToUintn) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint64ToIntn) {
+TEST (ConversionTestSuite, TestSafeUint64ToIntn) {
RETURN_STATUS Status;
- UINT64 Operand;
- INTN Result;
+ UINT64 Operand;
+ INTN Result;
//
// If Operand is <= MAX_INTN (0x7fff_ffff_ffff_ffff), then it's a cast
@@ -238,10 +238,10 @@ TEST(ConversionTestSuite, TestSafeUint64ToIntn) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint64ToUintn) {
+TEST (ConversionTestSuite, TestSafeUint64ToUintn) {
RETURN_STATUS Status;
- UINT64 Operand;
- UINTN Result;
+ UINT64 Operand;
+ UINTN Result;
//
// UINTN is same as UINT64 in x64, so this is just a cast
@@ -253,11 +253,11 @@ TEST(ConversionTestSuite, TestSafeUint64ToUintn) {
ASSERT_EQ (0xababababefefefef, Result);
}
-TEST(AdditionSubtractionTestSuite, TestSafeUintnAdd) {
+TEST (AdditionSubtractionTestSuite, TestSafeUintnAdd) {
RETURN_STATUS Status;
- UINTN Augend;
- UINTN Addend;
- UINTN Result;
+ UINTN Augend;
+ UINTN Addend;
+ UINTN Result;
//
// If the result of addition doesn't overflow MAX_UINTN, then it's addition
@@ -278,11 +278,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeUintnAdd) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeIntnAdd) {
+TEST (AdditionSubtractionTestSuite, TestSafeIntnAdd) {
RETURN_STATUS Status;
- INTN Augend;
- INTN Addend;
- INTN Result;
+ INTN Augend;
+ INTN Addend;
+ INTN Result;
//
// If the result of addition doesn't overflow MAX_INTN
@@ -315,11 +315,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeIntnAdd) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeUintnSub) {
+TEST (AdditionSubtractionTestSuite, TestSafeUintnSub) {
RETURN_STATUS Status;
- UINTN Minuend;
- UINTN Subtrahend;
- UINTN Result;
+ UINTN Minuend;
+ UINTN Subtrahend;
+ UINTN Result;
//
// If Minuend >= Subtrahend, then it's subtraction
@@ -340,11 +340,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeUintnSub) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeIntnSub) {
+TEST (AdditionSubtractionTestSuite, TestSafeIntnSub) {
RETURN_STATUS Status;
- INTN Minuend;
- INTN Subtrahend;
- INTN Result;
+ INTN Minuend;
+ INTN Subtrahend;
+ INTN Result;
//
// If the result of subtractions doesn't overflow MAX_INTN or
@@ -377,11 +377,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeIntnSub) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(MultiplicationTestSuite, TestSafeUintnMult) {
+TEST (MultiplicationTestSuite, TestSafeUintnMult) {
RETURN_STATUS Status;
- UINTN Multiplicand;
- UINTN Multiplier;
- UINTN Result;
+ UINTN Multiplicand;
+ UINTN Multiplier;
+ UINTN Result;
//
// If the result of multiplication doesn't overflow MAX_UINTN, it will succeed
@@ -402,11 +402,11 @@ TEST(MultiplicationTestSuite, TestSafeUintnMult) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(MultiplicationTestSuite, TestSafeIntnMult) {
+TEST (MultiplicationTestSuite, TestSafeIntnMult) {
RETURN_STATUS Status;
- INTN Multiplicand;
- INTN Multiplier;
- INTN Result;
+ INTN Multiplicand;
+ INTN Multiplier;
+ INTN Result;
//
// If the result of multiplication doesn't overflow MAX_INTN and doesn't
diff --git a/MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/TestBaseSafeIntLib.cpp b/MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/TestBaseSafeIntLib.cpp
index 1fd51067a1f3..857ab4d1d36c 100644
--- a/MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/TestBaseSafeIntLib.cpp
+++ b/MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/TestBaseSafeIntLib.cpp
@@ -15,10 +15,10 @@ extern "C" {
//
// Conversion function tests:
//
-TEST(ConversionTestSuite, TestSafeInt8ToUint8) {
+TEST (ConversionTestSuite, TestSafeInt8ToUint8) {
RETURN_STATUS Status;
- INT8 Operand;
- UINT8 Result;
+ INT8 Operand;
+ UINT8 Result;
//
// Positive UINT8 should result in just a cast
@@ -37,10 +37,10 @@ TEST(ConversionTestSuite, TestSafeInt8ToUint8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt8ToUint16) {
+TEST (ConversionTestSuite, TestSafeInt8ToUint16) {
RETURN_STATUS Status;
- INT8 Operand;
- UINT16 Result;
+ INT8 Operand;
+ UINT16 Result;
//
// Positive UINT8 should result in just a cast
@@ -59,10 +59,10 @@ TEST(ConversionTestSuite, TestSafeInt8ToUint16) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt8ToUint32) {
+TEST (ConversionTestSuite, TestSafeInt8ToUint32) {
RETURN_STATUS Status;
- INT8 Operand;
- UINT32 Result;
+ INT8 Operand;
+ UINT32 Result;
//
// Positive UINT8 should result in just a cast
@@ -81,10 +81,10 @@ TEST(ConversionTestSuite, TestSafeInt8ToUint32) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt8ToUintn) {
+TEST (ConversionTestSuite, TestSafeInt8ToUintn) {
RETURN_STATUS Status;
- INT8 Operand;
- UINTN Result;
+ INT8 Operand;
+ UINTN Result;
//
// Positive UINT8 should result in just a cast
@@ -103,10 +103,10 @@ TEST(ConversionTestSuite, TestSafeInt8ToUintn) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt8ToUint64) {
+TEST (ConversionTestSuite, TestSafeInt8ToUint64) {
RETURN_STATUS Status;
- INT8 Operand;
- UINT64 Result;
+ INT8 Operand;
+ UINT64 Result;
//
// Positive UINT8 should result in just a cast
@@ -125,10 +125,10 @@ TEST(ConversionTestSuite, TestSafeInt8ToUint64) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint8ToInt8) {
+TEST (ConversionTestSuite, TestSafeUint8ToInt8) {
RETURN_STATUS Status;
- UINT8 Operand;
- INT8 Result;
+ UINT8 Operand;
+ INT8 Result;
//
// Operand <= 0x7F (MAX_INT8) should result in a cast
@@ -147,10 +147,10 @@ TEST(ConversionTestSuite, TestSafeUint8ToInt8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint8ToChar8) {
+TEST (ConversionTestSuite, TestSafeUint8ToChar8) {
RETURN_STATUS Status;
- UINT8 Operand;
- CHAR8 Result;
+ UINT8 Operand;
+ CHAR8 Result;
//
// CHAR8 is typedefed as char, which by default is signed, thus
@@ -174,10 +174,10 @@ TEST(ConversionTestSuite, TestSafeUint8ToChar8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt16ToInt8) {
+TEST (ConversionTestSuite, TestSafeInt16ToInt8) {
RETURN_STATUS Status;
- INT16 Operand;
- INT8 Result;
+ INT16 Operand;
+ INT8 Result;
//
// If Operand is between MIN_INT8 and MAX_INT8 inclusive, then it's a cast
@@ -205,10 +205,10 @@ TEST(ConversionTestSuite, TestSafeInt16ToInt8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt16ToChar8) {
+TEST (ConversionTestSuite, TestSafeInt16ToChar8) {
RETURN_STATUS Status;
- INT16 Operand;
- CHAR8 Result;
+ INT16 Operand;
+ CHAR8 Result;
//
// CHAR8 is typedefed as char, which may be signed or unsigned based
@@ -252,10 +252,10 @@ TEST(ConversionTestSuite, TestSafeInt16ToChar8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt16ToUint8) {
+TEST (ConversionTestSuite, TestSafeInt16ToUint8) {
RETURN_STATUS Status;
- INT16 Operand;
- UINT8 Result;
+ INT16 Operand;
+ UINT8 Result;
//
// If Operand is between 0 and MAX_INT8 inclusive, then it's a cast
@@ -278,10 +278,10 @@ TEST(ConversionTestSuite, TestSafeInt16ToUint8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt16ToUint16) {
+TEST (ConversionTestSuite, TestSafeInt16ToUint16) {
RETURN_STATUS Status;
- INT16 Operand = 0x5b5b;
- UINT16 Result = 0;
+ INT16 Operand = 0x5b5b;
+ UINT16 Result = 0;
//
// If Operand is non-negative, then it's a cast
@@ -298,10 +298,10 @@ TEST(ConversionTestSuite, TestSafeInt16ToUint16) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt16ToUint32) {
+TEST (ConversionTestSuite, TestSafeInt16ToUint32) {
RETURN_STATUS Status;
- INT16 Operand;
- UINT32 Result;
+ INT16 Operand;
+ UINT32 Result;
//
// If Operand is non-negative, then it's a cast
@@ -320,10 +320,10 @@ TEST(ConversionTestSuite, TestSafeInt16ToUint32) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt16ToUintn) {
+TEST (ConversionTestSuite, TestSafeInt16ToUintn) {
RETURN_STATUS Status;
- INT16 Operand;
- UINTN Result;
+ INT16 Operand;
+ UINTN Result;
//
// If Operand is non-negative, then it's a cast
@@ -342,10 +342,10 @@ TEST(ConversionTestSuite, TestSafeInt16ToUintn) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt16ToUint64) {
+TEST (ConversionTestSuite, TestSafeInt16ToUint64) {
RETURN_STATUS Status;
- INT16 Operand;
- UINT64 Result;
+ INT16 Operand;
+ UINT64 Result;
//
// If Operand is non-negative, then it's a cast
@@ -364,10 +364,10 @@ TEST(ConversionTestSuite, TestSafeInt16ToUint64) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint16ToInt8) {
+TEST (ConversionTestSuite, TestSafeUint16ToInt8) {
RETURN_STATUS Status;
- UINT16 Operand;
- INT8 Result;
+ UINT16 Operand;
+ INT8 Result;
//
// If Operand is <= MAX_INT8, it's a cast
@@ -386,10 +386,10 @@ TEST(ConversionTestSuite, TestSafeUint16ToInt8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint16ToChar8) {
+TEST (ConversionTestSuite, TestSafeUint16ToChar8) {
RETURN_STATUS Status;
- UINT16 Operand;
- CHAR8 Result;
+ UINT16 Operand;
+ CHAR8 Result;
// CHAR8 is typedefed as char, which by default is signed, thus
// CHAR8 is same as INT8, so same tests as above:
@@ -411,10 +411,10 @@ TEST(ConversionTestSuite, TestSafeUint16ToChar8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint16ToUint8) {
+TEST (ConversionTestSuite, TestSafeUint16ToUint8) {
RETURN_STATUS Status;
- UINT16 Operand;
- UINT8 Result;
+ UINT16 Operand;
+ UINT8 Result;
//
// If Operand is <= MAX_UINT8 (0xff), it's a cast
@@ -433,10 +433,10 @@ TEST(ConversionTestSuite, TestSafeUint16ToUint8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint16ToInt16) {
+TEST (ConversionTestSuite, TestSafeUint16ToInt16) {
RETURN_STATUS Status;
- UINT16 Operand;
- INT16 Result;
+ UINT16 Operand;
+ INT16 Result;
//
// If Operand is <= MAX_INT16 (0x7fff), it's a cast
@@ -455,10 +455,10 @@ TEST(ConversionTestSuite, TestSafeUint16ToInt16) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt32ToInt8) {
+TEST (ConversionTestSuite, TestSafeInt32ToInt8) {
RETURN_STATUS Status;
- INT32 Operand;
- INT8 Result;
+ INT32 Operand;
+ INT8 Result;
//
// If Operand is between MIN_INT8 and MAX_INT8 inclusive, then it's a cast
@@ -486,10 +486,10 @@ TEST(ConversionTestSuite, TestSafeInt32ToInt8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt32ToChar8) {
+TEST (ConversionTestSuite, TestSafeInt32ToChar8) {
RETURN_STATUS Status;
- INT32 Operand;
- CHAR8 Result;
+ INT32 Operand;
+ CHAR8 Result;
//
// CHAR8 is typedefed as char, which may be signed or unsigned based
@@ -533,10 +533,10 @@ TEST(ConversionTestSuite, TestSafeInt32ToChar8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt32ToUint8) {
+TEST (ConversionTestSuite, TestSafeInt32ToUint8) {
RETURN_STATUS Status;
- INT32 Operand;
- UINT8 Result;
+ INT32 Operand;
+ UINT8 Result;
//
// If Operand is between 0 and MAX_INT8 inclusive, then it's a cast
@@ -563,10 +563,10 @@ TEST(ConversionTestSuite, TestSafeInt32ToUint8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt32ToInt16) {
+TEST (ConversionTestSuite, TestSafeInt32ToInt16) {
RETURN_STATUS Status;
- INT32 Operand;
- INT16 Result;
+ INT32 Operand;
+ INT16 Result;
//
// If Operand is between MIN_INT16 and MAX_INT16 inclusive, then it's a cast
@@ -594,10 +594,10 @@ TEST(ConversionTestSuite, TestSafeInt32ToInt16) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt32ToUint16) {
+TEST (ConversionTestSuite, TestSafeInt32ToUint16) {
RETURN_STATUS Status;
- INT32 Operand;
- UINT16 Result;
+ INT32 Operand;
+ UINT16 Result;
//
// If Operand is between 0 and MAX_UINT16 inclusive, then it's a cast
@@ -624,10 +624,10 @@ TEST(ConversionTestSuite, TestSafeInt32ToUint16) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt32ToUint32) {
+TEST (ConversionTestSuite, TestSafeInt32ToUint32) {
RETURN_STATUS Status;
- INT32 Operand;
- UINT32 Result;
+ INT32 Operand;
+ UINT32 Result;
//
// If Operand is non-negative, then it's a cast
@@ -646,10 +646,10 @@ TEST(ConversionTestSuite, TestSafeInt32ToUint32) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt32ToUint64) {
+TEST (ConversionTestSuite, TestSafeInt32ToUint64) {
RETURN_STATUS Status;
- INT32 Operand;
- UINT64 Result;
+ INT32 Operand;
+ UINT64 Result;
//
// If Operand is non-negative, then it's a cast
@@ -668,10 +668,10 @@ TEST(ConversionTestSuite, TestSafeInt32ToUint64) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint32ToInt8) {
+TEST (ConversionTestSuite, TestSafeUint32ToInt8) {
RETURN_STATUS Status;
- UINT32 Operand;
- INT8 Result;
+ UINT32 Operand;
+ INT8 Result;
//
// If Operand is <= MAX_INT8, then it's a cast
@@ -690,10 +690,10 @@ TEST(ConversionTestSuite, TestSafeUint32ToInt8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint32ToChar8) {
+TEST (ConversionTestSuite, TestSafeUint32ToChar8) {
RETURN_STATUS Status;
- UINT32 Operand;
- CHAR8 Result;
+ UINT32 Operand;
+ CHAR8 Result;
// CHAR8 is typedefed as char, which by default is signed, thus
// CHAR8 is same as INT8, so same tests as above:
@@ -715,10 +715,10 @@ TEST(ConversionTestSuite, TestSafeUint32ToChar8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint32ToUint8) {
+TEST (ConversionTestSuite, TestSafeUint32ToUint8) {
RETURN_STATUS Status;
- UINT32 Operand;
- UINT8 Result;
+ UINT32 Operand;
+ UINT8 Result;
//
// If Operand is <= MAX_UINT8, then it's a cast
@@ -737,10 +737,10 @@ TEST(ConversionTestSuite, TestSafeUint32ToUint8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint32ToInt16) {
+TEST (ConversionTestSuite, TestSafeUint32ToInt16) {
RETURN_STATUS Status;
- UINT32 Operand;
- INT16 Result;
+ UINT32 Operand;
+ INT16 Result;
//
// If Operand is <= MAX_INT16, then it's a cast
@@ -759,10 +759,10 @@ TEST(ConversionTestSuite, TestSafeUint32ToInt16) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint32ToUint16) {
+TEST (ConversionTestSuite, TestSafeUint32ToUint16) {
RETURN_STATUS Status;
- UINT32 Operand;
- UINT16 Result;
+ UINT32 Operand;
+ UINT16 Result;
//
// If Operand is <= MAX_UINT16, then it's a cast
@@ -781,10 +781,10 @@ TEST(ConversionTestSuite, TestSafeUint32ToUint16) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint32ToInt32) {
+TEST (ConversionTestSuite, TestSafeUint32ToInt32) {
RETURN_STATUS Status;
- UINT32 Operand;
- INT32 Result;
+ UINT32 Operand;
+ INT32 Result;
//
// If Operand is <= MAX_INT32, then it's a cast
@@ -803,10 +803,10 @@ TEST(ConversionTestSuite, TestSafeUint32ToInt32) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeIntnToInt8) {
+TEST (ConversionTestSuite, TestSafeIntnToInt8) {
RETURN_STATUS Status;
- INTN Operand;
- INT8 Result;
+ INTN Operand;
+ INT8 Result;
//
// If Operand is between MIN_INT8 and MAX_INT8 inclusive, then it's a cast
@@ -834,10 +834,10 @@ TEST(ConversionTestSuite, TestSafeIntnToInt8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeIntnToChar8) {
+TEST (ConversionTestSuite, TestSafeIntnToChar8) {
RETURN_STATUS Status;
- INTN Operand;
- CHAR8 Result;
+ INTN Operand;
+ CHAR8 Result;
//
// CHAR8 is typedefed as char, which may be signed or unsigned based
@@ -881,10 +881,10 @@ TEST(ConversionTestSuite, TestSafeIntnToChar8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeIntnToUint8) {
+TEST (ConversionTestSuite, TestSafeIntnToUint8) {
RETURN_STATUS Status;
- INTN Operand;
- UINT8 Result;
+ INTN Operand;
+ UINT8 Result;
//
// If Operand is between 0 and MAX_UINT8 inclusive, then it's a cast
@@ -907,10 +907,10 @@ TEST(ConversionTestSuite, TestSafeIntnToUint8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeIntnToInt16) {
+TEST (ConversionTestSuite, TestSafeIntnToInt16) {
RETURN_STATUS Status;
- INTN Operand;
- INT16 Result;
+ INTN Operand;
+ INT16 Result;
//
// If Operand is between MIN_INT16 and MAX_INT16 inclusive, then it's a cast
@@ -938,10 +938,10 @@ TEST(ConversionTestSuite, TestSafeIntnToInt16) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeIntnToUint16) {
+TEST (ConversionTestSuite, TestSafeIntnToUint16) {
RETURN_STATUS Status;
- INTN Operand;
- UINT16 Result;
+ INTN Operand;
+ UINT16 Result;
//
// If Operand is between 0 and MAX_UINT16 inclusive, then it's a cast
@@ -964,10 +964,10 @@ TEST(ConversionTestSuite, TestSafeIntnToUint16) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeIntnToUintn) {
+TEST (ConversionTestSuite, TestSafeIntnToUintn) {
RETURN_STATUS Status;
- INTN Operand;
- UINTN Result;
+ INTN Operand;
+ UINTN Result;
//
// If Operand is non-negative, then it's a cast
@@ -986,10 +986,10 @@ TEST(ConversionTestSuite, TestSafeIntnToUintn) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeIntnToUint64) {
+TEST (ConversionTestSuite, TestSafeIntnToUint64) {
RETURN_STATUS Status;
- INTN Operand;
- UINT64 Result;
+ INTN Operand;
+ UINT64 Result;
//
// If Operand is non-negative, then it's a cast
@@ -1008,10 +1008,10 @@ TEST(ConversionTestSuite, TestSafeIntnToUint64) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUintnToInt8) {
+TEST (ConversionTestSuite, TestSafeUintnToInt8) {
RETURN_STATUS Status;
- UINTN Operand;
- INT8 Result;
+ UINTN Operand;
+ INT8 Result;
//
// If Operand is <= MAX_INT8, then it's a cast
@@ -1030,10 +1030,10 @@ TEST(ConversionTestSuite, TestSafeUintnToInt8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUintnToChar8) {
+TEST (ConversionTestSuite, TestSafeUintnToChar8) {
RETURN_STATUS Status;
- UINTN Operand;
- CHAR8 Result;
+ UINTN Operand;
+ CHAR8 Result;
// CHAR8 is typedefed as char, which by default is signed, thus
// CHAR8 is same as INT8, so same tests as above:
@@ -1055,10 +1055,10 @@ TEST(ConversionTestSuite, TestSafeUintnToChar8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUintnToUint8) {
+TEST (ConversionTestSuite, TestSafeUintnToUint8) {
RETURN_STATUS Status;
- UINTN Operand;
- UINT8 Result;
+ UINTN Operand;
+ UINT8 Result;
//
// If Operand is <= MAX_UINT8, then it's a cast
@@ -1077,10 +1077,10 @@ TEST(ConversionTestSuite, TestSafeUintnToUint8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUintnToInt16) {
+TEST (ConversionTestSuite, TestSafeUintnToInt16) {
RETURN_STATUS Status;
- UINTN Operand;
- INT16 Result;
+ UINTN Operand;
+ INT16 Result;
//
// If Operand is <= MAX_INT16, then it's a cast
@@ -1099,10 +1099,10 @@ TEST(ConversionTestSuite, TestSafeUintnToInt16) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUintnToUint16) {
+TEST (ConversionTestSuite, TestSafeUintnToUint16) {
RETURN_STATUS Status;
- UINTN Operand;
- UINT16 Result;
+ UINTN Operand;
+ UINT16 Result;
//
// If Operand is <= MAX_UINT16, then it's a cast
@@ -1121,10 +1121,10 @@ TEST(ConversionTestSuite, TestSafeUintnToUint16) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUintnToInt32) {
+TEST (ConversionTestSuite, TestSafeUintnToInt32) {
RETURN_STATUS Status;
- UINTN Operand;
- INT32 Result;
+ UINTN Operand;
+ INT32 Result;
//
// If Operand is <= MAX_INT32, then it's a cast
@@ -1143,10 +1143,10 @@ TEST(ConversionTestSuite, TestSafeUintnToInt32) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt64ToInt8) {
+TEST (ConversionTestSuite, TestSafeInt64ToInt8) {
RETURN_STATUS Status;
- INT64 Operand;
- INT8 Result;
+ INT64 Operand;
+ INT8 Result;
//
// If Operand is between MIN_INT8 and MAX_INT8 inclusive, then it's a cast
@@ -1174,10 +1174,10 @@ TEST(ConversionTestSuite, TestSafeInt64ToInt8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt64ToChar8) {
+TEST (ConversionTestSuite, TestSafeInt64ToChar8) {
RETURN_STATUS Status;
- INT64 Operand;
- CHAR8 Result;
+ INT64 Operand;
+ CHAR8 Result;
//
// CHAR8 is typedefed as char, which may be signed or unsigned based
@@ -1221,10 +1221,10 @@ TEST(ConversionTestSuite, TestSafeInt64ToChar8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt64ToUint8) {
+TEST (ConversionTestSuite, TestSafeInt64ToUint8) {
RETURN_STATUS Status;
- INT64 Operand;
- UINT8 Result;
+ INT64 Operand;
+ UINT8 Result;
//
// If Operand is between 0 and MAX_UINT8 inclusive, then it's a cast
@@ -1247,10 +1247,10 @@ TEST(ConversionTestSuite, TestSafeInt64ToUint8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt64ToInt16) {
+TEST (ConversionTestSuite, TestSafeInt64ToInt16) {
RETURN_STATUS Status;
- INT64 Operand;
- INT16 Result;
+ INT64 Operand;
+ INT16 Result;
//
// If Operand is between MIN_INT16 and MAX_INT16 inclusive, then it's a cast
@@ -1278,10 +1278,10 @@ TEST(ConversionTestSuite, TestSafeInt64ToInt16) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt64ToUint16) {
+TEST (ConversionTestSuite, TestSafeInt64ToUint16) {
RETURN_STATUS Status;
- INT64 Operand;
- UINT16 Result;
+ INT64 Operand;
+ UINT16 Result;
//
// If Operand is between 0 and MAX_UINT16 inclusive, then it's a cast
@@ -1304,10 +1304,10 @@ TEST(ConversionTestSuite, TestSafeInt64ToUint16) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt64ToInt32) {
+TEST (ConversionTestSuite, TestSafeInt64ToInt32) {
RETURN_STATUS Status;
- INT64 Operand;
- INT32 Result;
+ INT64 Operand;
+ INT32 Result;
//
// If Operand is between MIN_INT32 and MAX_INT32 inclusive, then it's a cast
@@ -1335,10 +1335,10 @@ TEST(ConversionTestSuite, TestSafeInt64ToInt32) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt64ToUint32) {
+TEST (ConversionTestSuite, TestSafeInt64ToUint32) {
RETURN_STATUS Status;
- INT64 Operand;
- UINT32 Result;
+ INT64 Operand;
+ UINT32 Result;
//
// If Operand is between 0 and MAX_UINT32 inclusive, then it's a cast
@@ -1361,10 +1361,10 @@ TEST(ConversionTestSuite, TestSafeInt64ToUint32) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeInt64ToUint64) {
+TEST (ConversionTestSuite, TestSafeInt64ToUint64) {
RETURN_STATUS Status;
- INT64 Operand;
- UINT64 Result;
+ INT64 Operand;
+ UINT64 Result;
//
// If Operand is non-negative, then it's a cast
@@ -1383,10 +1383,10 @@ TEST(ConversionTestSuite, TestSafeInt64ToUint64) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint64ToInt8) {
+TEST (ConversionTestSuite, TestSafeUint64ToInt8) {
RETURN_STATUS Status;
- UINT64 Operand;
- INT8 Result;
+ UINT64 Operand;
+ INT8 Result;
//
// If Operand is <= MAX_INT8, then it's a cast
@@ -1405,10 +1405,10 @@ TEST(ConversionTestSuite, TestSafeUint64ToInt8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint64ToChar8) {
+TEST (ConversionTestSuite, TestSafeUint64ToChar8) {
RETURN_STATUS Status;
- UINT64 Operand;
- CHAR8 Result;
+ UINT64 Operand;
+ CHAR8 Result;
// CHAR8 is typedefed as char, which by default is signed, thus
// CHAR8 is same as INT8, so same tests as above:
@@ -1430,10 +1430,10 @@ TEST(ConversionTestSuite, TestSafeUint64ToChar8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint64ToUint8) {
+TEST (ConversionTestSuite, TestSafeUint64ToUint8) {
RETURN_STATUS Status;
- UINT64 Operand;
- UINT8 Result;
+ UINT64 Operand;
+ UINT8 Result;
//
// If Operand is <= MAX_UINT8, then it's a cast
@@ -1452,10 +1452,10 @@ TEST(ConversionTestSuite, TestSafeUint64ToUint8) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint64ToInt16) {
+TEST (ConversionTestSuite, TestSafeUint64ToInt16) {
RETURN_STATUS Status;
- UINT64 Operand;
- INT16 Result;
+ UINT64 Operand;
+ INT16 Result;
//
// If Operand is <= MAX_INT16, then it's a cast
@@ -1474,10 +1474,10 @@ TEST(ConversionTestSuite, TestSafeUint64ToInt16) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint64ToUint16) {
+TEST (ConversionTestSuite, TestSafeUint64ToUint16) {
RETURN_STATUS Status;
- UINT64 Operand;
- UINT16 Result;
+ UINT64 Operand;
+ UINT16 Result;
//
// If Operand is <= MAX_UINT16, then it's a cast
@@ -1496,10 +1496,10 @@ TEST(ConversionTestSuite, TestSafeUint64ToUint16) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint64ToInt32) {
+TEST (ConversionTestSuite, TestSafeUint64ToInt32) {
RETURN_STATUS Status;
- UINT64 Operand;
- INT32 Result;
+ UINT64 Operand;
+ INT32 Result;
//
// If Operand is <= MAX_INT32, then it's a cast
@@ -1518,10 +1518,10 @@ TEST(ConversionTestSuite, TestSafeUint64ToInt32) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint64ToUint32) {
+TEST (ConversionTestSuite, TestSafeUint64ToUint32) {
RETURN_STATUS Status;
- UINT64 Operand;
- UINT32 Result;
+ UINT64 Operand;
+ UINT32 Result;
//
// If Operand is <= MAX_UINT32, then it's a cast
@@ -1540,10 +1540,10 @@ TEST(ConversionTestSuite, TestSafeUint64ToUint32) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(ConversionTestSuite, TestSafeUint64ToInt64) {
+TEST (ConversionTestSuite, TestSafeUint64ToInt64) {
RETURN_STATUS Status;
- UINT64 Operand;
- INT64 Result;
+ UINT64 Operand;
+ INT64 Result;
//
// If Operand is <= MAX_INT64, then it's a cast
@@ -1565,11 +1565,11 @@ TEST(ConversionTestSuite, TestSafeUint64ToInt64) {
//
// Addition function tests:
//
-TEST(AdditionSubtractionTestSuite, TestSafeUint8Add) {
+TEST (AdditionSubtractionTestSuite, TestSafeUint8Add) {
RETURN_STATUS Status;
- UINT8 Augend;
- UINT8 Addend;
- UINT8 Result;
+ UINT8 Augend;
+ UINT8 Addend;
+ UINT8 Result;
//
// If the result of addition doesn't overflow MAX_UINT8, then it's addition
@@ -1590,11 +1590,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeUint8Add) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeUint16Add) {
+TEST (AdditionSubtractionTestSuite, TestSafeUint16Add) {
RETURN_STATUS Status;
- UINT16 Augend = 0x3a3a;
- UINT16 Addend = 0x3a3a;
- UINT16 Result = 0;
+ UINT16 Augend = 0x3a3a;
+ UINT16 Addend = 0x3a3a;
+ UINT16 Result = 0;
//
// If the result of addition doesn't overflow MAX_UINT16, then it's addition
@@ -1612,11 +1612,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeUint16Add) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeUint32Add) {
+TEST (AdditionSubtractionTestSuite, TestSafeUint32Add) {
RETURN_STATUS Status;
- UINT32 Augend;
- UINT32 Addend;
- UINT32 Result;
+ UINT32 Augend;
+ UINT32 Addend;
+ UINT32 Result;
//
// If the result of addition doesn't overflow MAX_UINT32, then it's addition
@@ -1637,11 +1637,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeUint32Add) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeUint64Add) {
+TEST (AdditionSubtractionTestSuite, TestSafeUint64Add) {
RETURN_STATUS Status;
- UINT64 Augend;
- UINT64 Addend;
- UINT64 Result;
+ UINT64 Augend;
+ UINT64 Addend;
+ UINT64 Result;
//
// If the result of addition doesn't overflow MAX_UINT64, then it's addition
@@ -1662,11 +1662,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeUint64Add) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeInt8Add) {
+TEST (AdditionSubtractionTestSuite, TestSafeInt8Add) {
RETURN_STATUS Status;
- INT8 Augend;
- INT8 Addend;
- INT8 Result;
+ INT8 Augend;
+ INT8 Addend;
+ INT8 Result;
//
// If the result of addition doesn't overflow MAX_INT8
@@ -1699,11 +1699,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeInt8Add) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeInt16Add) {
+TEST (AdditionSubtractionTestSuite, TestSafeInt16Add) {
RETURN_STATUS Status;
- INT16 Augend;
- INT16 Addend;
- INT16 Result;
+ INT16 Augend;
+ INT16 Addend;
+ INT16 Result;
//
// If the result of addition doesn't overflow MAX_INT16
@@ -1736,11 +1736,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeInt16Add) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeInt32Add) {
+TEST (AdditionSubtractionTestSuite, TestSafeInt32Add) {
RETURN_STATUS Status;
- INT32 Augend;
- INT32 Addend;
- INT32 Result;
+ INT32 Augend;
+ INT32 Addend;
+ INT32 Result;
//
// If the result of addition doesn't overflow MAX_INT32
@@ -1773,11 +1773,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeInt32Add) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeInt64Add) {
+TEST (AdditionSubtractionTestSuite, TestSafeInt64Add) {
RETURN_STATUS Status;
- INT64 Augend;
- INT64 Addend;
- INT64 Result;
+ INT64 Augend;
+ INT64 Addend;
+ INT64 Result;
//
// If the result of addition doesn't overflow MAX_INT64
@@ -1813,11 +1813,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeInt64Add) {
//
// Subtraction function tests:
//
-TEST(AdditionSubtractionTestSuite, TestSafeUint8Sub) {
+TEST (AdditionSubtractionTestSuite, TestSafeUint8Sub) {
RETURN_STATUS Status;
- UINT8 Minuend;
- UINT8 Subtrahend;
- UINT8 Result;
+ UINT8 Minuend;
+ UINT8 Subtrahend;
+ UINT8 Result;
//
// If Minuend >= Subtrahend, then it's subtraction
@@ -1838,11 +1838,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeUint8Sub) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeUint16Sub) {
+TEST (AdditionSubtractionTestSuite, TestSafeUint16Sub) {
RETURN_STATUS Status;
- UINT16 Minuend;
- UINT16 Subtrahend;
- UINT16 Result;
+ UINT16 Minuend;
+ UINT16 Subtrahend;
+ UINT16 Result;
//
// If Minuend >= Subtrahend, then it's subtraction
@@ -1863,11 +1863,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeUint16Sub) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeUint32Sub) {
+TEST (AdditionSubtractionTestSuite, TestSafeUint32Sub) {
RETURN_STATUS Status;
- UINT32 Minuend;
- UINT32 Subtrahend;
- UINT32 Result;
+ UINT32 Minuend;
+ UINT32 Subtrahend;
+ UINT32 Result;
//
// If Minuend >= Subtrahend, then it's subtraction
@@ -1888,11 +1888,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeUint32Sub) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeUint64Sub) {
+TEST (AdditionSubtractionTestSuite, TestSafeUint64Sub) {
RETURN_STATUS Status;
- UINT64 Minuend;
- UINT64 Subtrahend;
- UINT64 Result;
+ UINT64 Minuend;
+ UINT64 Subtrahend;
+ UINT64 Result;
//
// If Minuend >= Subtrahend, then it's subtraction
@@ -1913,11 +1913,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeUint64Sub) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeInt8Sub) {
+TEST (AdditionSubtractionTestSuite, TestSafeInt8Sub) {
RETURN_STATUS Status;
- INT8 Minuend;
- INT8 Subtrahend;
- INT8 Result;
+ INT8 Minuend;
+ INT8 Subtrahend;
+ INT8 Result;
//
// If the result of subtractions doesn't overflow MAX_INT8 or
@@ -1950,11 +1950,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeInt8Sub) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeInt16Sub) {
+TEST (AdditionSubtractionTestSuite, TestSafeInt16Sub) {
RETURN_STATUS Status;
- INT16 Minuend;
- INT16 Subtrahend;
- INT16 Result;
+ INT16 Minuend;
+ INT16 Subtrahend;
+ INT16 Result;
//
// If the result of subtractions doesn't overflow MAX_INT16 or
@@ -1987,11 +1987,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeInt16Sub) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeInt32Sub) {
+TEST (AdditionSubtractionTestSuite, TestSafeInt32Sub) {
RETURN_STATUS Status;
- INT32 Minuend;
- INT32 Subtrahend;
- INT32 Result;
+ INT32 Minuend;
+ INT32 Subtrahend;
+ INT32 Result;
//
// If the result of subtractions doesn't overflow MAX_INT32 or
@@ -2024,11 +2024,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeInt32Sub) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(AdditionSubtractionTestSuite, TestSafeInt64Sub) {
+TEST (AdditionSubtractionTestSuite, TestSafeInt64Sub) {
RETURN_STATUS Status;
- INT64 Minuend;
- INT64 Subtrahend;
- INT64 Result;
+ INT64 Minuend;
+ INT64 Subtrahend;
+ INT64 Result;
//
// If the result of subtractions doesn't overflow MAX_INT64 or
@@ -2064,11 +2064,11 @@ TEST(AdditionSubtractionTestSuite, TestSafeInt64Sub) {
//
// Multiplication function tests:
//
-TEST(MultiplicationTestSuite, TestSafeUint8Mult) {
+TEST (MultiplicationTestSuite, TestSafeUint8Mult) {
RETURN_STATUS Status;
- UINT8 Multiplicand;
- UINT8 Multiplier;
- UINT8 Result;
+ UINT8 Multiplicand;
+ UINT8 Multiplier;
+ UINT8 Result;
//
// If the result of multiplication doesn't overflow MAX_UINT8, it will succeed
@@ -2089,11 +2089,11 @@ TEST(MultiplicationTestSuite, TestSafeUint8Mult) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(MultiplicationTestSuite, TestSafeUint16Mult) {
+TEST (MultiplicationTestSuite, TestSafeUint16Mult) {
RETURN_STATUS Status;
- UINT16 Multiplicand;
- UINT16 Multiplier;
- UINT16 Result;
+ UINT16 Multiplicand;
+ UINT16 Multiplier;
+ UINT16 Result;
//
// If the result of multiplication doesn't overflow MAX_UINT16, it will succeed
@@ -2114,11 +2114,11 @@ TEST(MultiplicationTestSuite, TestSafeUint16Mult) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(MultiplicationTestSuite, TestSafeUint32Mult) {
+TEST (MultiplicationTestSuite, TestSafeUint32Mult) {
RETURN_STATUS Status;
- UINT32 Multiplicand;
- UINT32 Multiplier;
- UINT32 Result;
+ UINT32 Multiplicand;
+ UINT32 Multiplier;
+ UINT32 Result;
//
// If the result of multiplication doesn't overflow MAX_UINT32, it will succeed
@@ -2139,11 +2139,11 @@ TEST(MultiplicationTestSuite, TestSafeUint32Mult) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(MultiplicationTestSuite, TestSafeUint64Mult) {
+TEST (MultiplicationTestSuite, TestSafeUint64Mult) {
RETURN_STATUS Status;
- UINT64 Multiplicand;
- UINT64 Multiplier;
- UINT64 Result;
+ UINT64 Multiplicand;
+ UINT64 Multiplier;
+ UINT64 Result;
//
// If the result of multiplication doesn't overflow MAX_UINT64, it will succeed
@@ -2164,11 +2164,11 @@ TEST(MultiplicationTestSuite, TestSafeUint64Mult) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(MultiplicationTestSuite, TestSafeInt8Mult) {
+TEST (MultiplicationTestSuite, TestSafeInt8Mult) {
RETURN_STATUS Status;
- INT8 Multiplicand;
- INT8 Multiplier;
- INT8 Result;
+ INT8 Multiplicand;
+ INT8 Multiplier;
+ INT8 Result;
//
// If the result of multiplication doesn't overflow MAX_INT8 and doesn't
@@ -2190,11 +2190,11 @@ TEST(MultiplicationTestSuite, TestSafeInt8Mult) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(MultiplicationTestSuite, TestSafeInt16Mult) {
+TEST (MultiplicationTestSuite, TestSafeInt16Mult) {
RETURN_STATUS Status;
- INT16 Multiplicand;
- INT16 Multiplier;
- INT16 Result;
+ INT16 Multiplicand;
+ INT16 Multiplier;
+ INT16 Result;
//
// If the result of multiplication doesn't overflow MAX_INT16 and doesn't
@@ -2216,11 +2216,11 @@ TEST(MultiplicationTestSuite, TestSafeInt16Mult) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(MultiplicationTestSuite, TestSafeInt32Mult) {
+TEST (MultiplicationTestSuite, TestSafeInt32Mult) {
RETURN_STATUS Status;
- INT32 Multiplicand;
- INT32 Multiplier;
- INT32 Result;
+ INT32 Multiplicand;
+ INT32 Multiplier;
+ INT32 Result;
//
// If the result of multiplication doesn't overflow MAX_INT32 and doesn't
@@ -2242,11 +2242,11 @@ TEST(MultiplicationTestSuite, TestSafeInt32Mult) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-TEST(MultiplicationTestSuite, TestSafeInt64Mult) {
+TEST (MultiplicationTestSuite, TestSafeInt64Mult) {
RETURN_STATUS Status;
- INT64 Multiplicand;
- INT64 Multiplier;
- INT64 Result;
+ INT64 Multiplicand;
+ INT64 Multiplier;
+ INT64 Result;
//
// If the result of multiplication doesn't overflow MAX_INT64 and doesn't
@@ -2268,7 +2268,12 @@ TEST(MultiplicationTestSuite, TestSafeInt64Mult) {
ASSERT_EQ (RETURN_BUFFER_TOO_SMALL, Status);
}
-int main(int argc, char* argv[]) {
- testing::InitGoogleTest(&argc, argv);
- return RUN_ALL_TESTS();
+int
+main (
+ int argc,
+ char *argv[]
+ )
+{
+ testing::InitGoogleTest (&argc, argv);
+ return RUN_ALL_TESTS ();
}
diff --git a/MdePkg/Test/Mock/Include/GoogleTest/Library/MockHobLib.h b/MdePkg/Test/Mock/Include/GoogleTest/Library/MockHobLib.h
index 994b8133e5d0..586b479ea5d2 100644
--- a/MdePkg/Test/Mock/Include/GoogleTest/Library/MockHobLib.h
+++ b/MdePkg/Test/Mock/Include/GoogleTest/Library/MockHobLib.h
@@ -11,9 +11,9 @@
#include <Library/GoogleTestLib.h>
#include <Library/FunctionMockLib.h>
extern "C" {
-#include <Pi/PiMultiPhase.h>
-#include <Uefi.h>
-#include <Library/HobLib.h>
+ #include <Pi/PiMultiPhase.h>
+ #include <Uefi.h>
+ #include <Library/HobLib.h>
}
struct MockHobLib {
diff --git a/MdePkg/Test/Mock/Include/GoogleTest/Library/MockPeiServicesLib.h b/MdePkg/Test/Mock/Include/GoogleTest/Library/MockPeiServicesLib.h
index 4a99fec539c0..6a6424d7c6fc 100644
--- a/MdePkg/Test/Mock/Include/GoogleTest/Library/MockPeiServicesLib.h
+++ b/MdePkg/Test/Mock/Include/GoogleTest/Library/MockPeiServicesLib.h
@@ -11,9 +11,9 @@
#include <Library/GoogleTestLib.h>
#include <Library/FunctionMockLib.h>
extern "C" {
-#include <PiPei.h>
-#include <Uefi.h>
-#include <Library/PeiServicesLib.h>
+ #include <PiPei.h>
+ #include <Uefi.h>
+ #include <Library/PeiServicesLib.h>
}
struct MockPeiServicesLib {
diff --git a/MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiLib.h b/MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiLib.h
index dec2c93e1b34..93697da9cf86 100644
--- a/MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiLib.h
+++ b/MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiLib.h
@@ -11,8 +11,8 @@
#include <Library/GoogleTestLib.h>
#include <Library/FunctionMockLib.h>
extern "C" {
-#include <Uefi.h>
-#include <Library/UefiLib.h>
+ #include <Uefi.h>
+ #include <Library/UefiLib.h>
}
struct MockUefiLib {
diff --git a/MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiRuntimeServicesTableLib.h b/MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiRuntimeServicesTableLib.h
index afdfc6b85597..241abc55c079 100644
--- a/MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiRuntimeServicesTableLib.h
+++ b/MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiRuntimeServicesTableLib.h
@@ -11,8 +11,8 @@
#include <Library/GoogleTestLib.h>
#include <Library/FunctionMockLib.h>
extern "C" {
-#include <Uefi.h>
-#include <Library/UefiRuntimeServicesTableLib.h>
+ #include <Uefi.h>
+ #include <Library/UefiRuntimeServicesTableLib.h>
}
struct MockUefiRuntimeServicesTableLib {
diff --git a/MdePkg/Test/Mock/Library/GoogleTest/MockHobLib/MockHobLib.cpp b/MdePkg/Test/Mock/Library/GoogleTest/MockHobLib/MockHobLib.cpp
index 5a5a9159fcfe..51ee09065e92 100644
--- a/MdePkg/Test/Mock/Library/GoogleTest/MockHobLib/MockHobLib.cpp
+++ b/MdePkg/Test/Mock/Library/GoogleTest/MockHobLib/MockHobLib.cpp
@@ -7,24 +7,24 @@
#include <GoogleTest/Library/MockHobLib.h>
-MOCK_INTERFACE_DEFINITION(MockHobLib);
+MOCK_INTERFACE_DEFINITION (MockHobLib);
-MOCK_FUNCTION_DEFINITION(MockHobLib, GetHobList, 0, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockHobLib, GetNextHob, 2, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockHobLib, GetFirstHob, 1, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockHobLib, GetNextGuidHob, 2, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockHobLib, GetFirstGuidHob, 1, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockHobLib, GetBootModeHob, 0, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockHobLib, BuildModuleHob, 4, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockHobLib, BuildResourceDescriptorWithOwnerHob, 5, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockHobLib, BuildResourceDescriptorHob, 4, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockHobLib, BuildGuidHob, 2, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockHobLib, BuildGuidDataHob, 3, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockHobLib, BuildFvHob, 2, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockHobLib, BuildFv2Hob, 4, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockHobLib, BuildFv3Hob, 6, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockHobLib, BuildCvHob, 2, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockHobLib, BuildCpuHob, 2, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockHobLib, BuildStackHob, 2, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockHobLib, BuildBspStoreHob, 3, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockHobLib, BuildMemoryAllocationHob, 3, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockHobLib, GetHobList, 0, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockHobLib, GetNextHob, 2, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockHobLib, GetFirstHob, 1, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockHobLib, GetNextGuidHob, 2, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockHobLib, GetFirstGuidHob, 1, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockHobLib, GetBootModeHob, 0, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockHobLib, BuildModuleHob, 4, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockHobLib, BuildResourceDescriptorWithOwnerHob, 5, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockHobLib, BuildResourceDescriptorHob, 4, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockHobLib, BuildGuidHob, 2, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockHobLib, BuildGuidDataHob, 3, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockHobLib, BuildFvHob, 2, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockHobLib, BuildFv2Hob, 4, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockHobLib, BuildFv3Hob, 6, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockHobLib, BuildCvHob, 2, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockHobLib, BuildCpuHob, 2, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockHobLib, BuildStackHob, 2, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockHobLib, BuildBspStoreHob, 3, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockHobLib, BuildMemoryAllocationHob, 3, EFIAPI);
diff --git a/MdePkg/Test/Mock/Library/GoogleTest/MockPeiServicesLib/MockPeiServicesLib.cpp b/MdePkg/Test/Mock/Library/GoogleTest/MockPeiServicesLib/MockPeiServicesLib.cpp
index 9a7ff4bd8ffb..c6035bd664cf 100644
--- a/MdePkg/Test/Mock/Library/GoogleTest/MockPeiServicesLib/MockPeiServicesLib.cpp
+++ b/MdePkg/Test/Mock/Library/GoogleTest/MockPeiServicesLib/MockPeiServicesLib.cpp
@@ -7,30 +7,30 @@
#include <GoogleTest/Library/MockPeiServicesLib.h>
-MOCK_INTERFACE_DEFINITION(MockPeiServicesLib);
+MOCK_INTERFACE_DEFINITION (MockPeiServicesLib);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesInstallPpi, 1, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesReInstallPpi, 2, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesLocatePpi, 4, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesNotifyPpi, 1, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesGetBootMode, 1, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesSetBootMode, 1, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesGetHobList, 1, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesCreateHob, 3, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesFfsFindNextVolume, 2, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesFfsFindNextFile, 3, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesFfsFindSectionData, 3, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesFfsFindSectionData3, 5, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesInstallPeiMemory, 2, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesAllocatePages, 3, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesFreePages, 2, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesAllocatePool, 2, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesResetSystem, 0, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesFfsFindFileByName, 3, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesFfsGetFileInfo, 2, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesFfsGetFileInfo2, 2, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesFfsGetVolumeInfo, 2, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesRegisterForShadow, 1, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesInstallFvInfoPpi, 5, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesInstallFvInfo2Ppi, 6, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockPeiServicesLib, PeiServicesResetSystem2, 4, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesInstallPpi, 1, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesReInstallPpi, 2, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesLocatePpi, 4, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesNotifyPpi, 1, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesGetBootMode, 1, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesSetBootMode, 1, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesGetHobList, 1, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesCreateHob, 3, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesFfsFindNextVolume, 2, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesFfsFindNextFile, 3, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesFfsFindSectionData, 3, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesFfsFindSectionData3, 5, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesInstallPeiMemory, 2, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesAllocatePages, 3, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesFreePages, 2, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesAllocatePool, 2, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesResetSystem, 0, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesFfsFindFileByName, 3, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesFfsGetFileInfo, 2, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesFfsGetFileInfo2, 2, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesFfsGetVolumeInfo, 2, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesRegisterForShadow, 1, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesInstallFvInfoPpi, 5, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesInstallFvInfo2Ppi, 6, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPeiServicesLib, PeiServicesResetSystem2, 4, EFIAPI);
diff --git a/MdePkg/Test/Mock/Library/GoogleTest/MockUefiLib/MockUefiLib.cpp b/MdePkg/Test/Mock/Library/GoogleTest/MockUefiLib/MockUefiLib.cpp
index 5339d040c999..2a0c9613eaa2 100644
--- a/MdePkg/Test/Mock/Library/GoogleTest/MockUefiLib/MockUefiLib.cpp
+++ b/MdePkg/Test/Mock/Library/GoogleTest/MockUefiLib/MockUefiLib.cpp
@@ -6,7 +6,7 @@
**/
#include <GoogleTest/Library/MockUefiLib.h>
-MOCK_INTERFACE_DEFINITION(MockUefiLib);
+MOCK_INTERFACE_DEFINITION (MockUefiLib);
-MOCK_FUNCTION_DEFINITION(MockUefiLib, GetVariable2, 4, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockUefiLib, GetEfiGlobalVariable2, 3, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockUefiLib, GetVariable2, 4, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockUefiLib, GetEfiGlobalVariable2, 3, EFIAPI);
diff --git a/MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.cpp b/MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.cpp
index ecd1ba82366c..14296b0ccb88 100644
--- a/MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.cpp
+++ b/MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.cpp
@@ -6,13 +6,13 @@
**/
#include <GoogleTest/Library/MockUefiRuntimeServicesTableLib.h>
-MOCK_INTERFACE_DEFINITION(MockUefiRuntimeServicesTableLib);
+MOCK_INTERFACE_DEFINITION (MockUefiRuntimeServicesTableLib);
-MOCK_FUNCTION_DEFINITION(MockUefiRuntimeServicesTableLib, gRT_GetVariable, 5, EFIAPI);
-MOCK_FUNCTION_DEFINITION(MockUefiRuntimeServicesTableLib, gRT_SetVariable, 5, EFIAPI);
+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
+static EFI_RUNTIME_SERVICES localRt = {
+ { 0 }, // EFI_TABLE_HEADER
NULL, // EFI_GET_TIME
NULL, // EFI_SET_TIME
@@ -36,5 +36,5 @@ static EFI_RUNTIME_SERVICES localRt = {
};
extern "C" {
- EFI_RUNTIME_SERVICES* gRT = &localRt;
+ EFI_RUNTIME_SERVICES *gRT = &localRt;
}
--
2.41.0.windows.3
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107669): https://edk2.groups.io/g/devel/message/107669
Mute This Topic: https://groups.io/mt/100655292/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [edk2-devel] [PATCH v1 5/7] SecurityPkg: Apply uncrustify formatting to relevant files
2023-08-09 21:32 [edk2-devel] [PATCH v1 0/7] Uncrustify GoogleTest update VivianNK
` (3 preceding siblings ...)
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 4/7] MdePkg: Apply " VivianNK
@ 2023-08-09 21:32 ` VivianNK
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 6/7] UnitTestFrameworkPkg: " VivianNK
` (2 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: VivianNK @ 2023-08-09 21:32 UTC (permalink / raw)
To: devel
Apply uncrustify formatting to GoogleTest cpp and header files.
CC: Jiewen Yao <jiewen.yao@intel.com>
CC: Jian J Wang <jian.j.wang@intel.com>
Signed-off-by: Vivian Nowka-Keane <vnowkakeane@linux.microsoft.com>
---
SecurityPkg/Library/SecureBootVariableLib/GoogleTest/SecureBootVariableLibGoogleTest.cpp | 205 ++++++++++++--------
SecurityPkg/Test/Mock/Include/GoogleTest/Library/MockPlatformPKProtectionLib.h | 4 +-
SecurityPkg/Test/Mock/Library/GoogleTest/MockPlatformPKProtectionLib/MockPlatformPKProtectionLib.cpp | 4 +-
3 files changed, 124 insertions(+), 89 deletions(-)
diff --git a/SecurityPkg/Library/SecureBootVariableLib/GoogleTest/SecureBootVariableLibGoogleTest.cpp b/SecurityPkg/Library/SecureBootVariableLib/GoogleTest/SecureBootVariableLibGoogleTest.cpp
index c9190c8ffd61..f66c595a97a8 100644
--- a/SecurityPkg/Library/SecureBootVariableLib/GoogleTest/SecureBootVariableLibGoogleTest.cpp
+++ b/SecurityPkg/Library/SecureBootVariableLib/GoogleTest/SecureBootVariableLibGoogleTest.cpp
@@ -21,154 +21,189 @@ using namespace testing;
//////////////////////////////////////////////////////////////////////////////
class SetSecureBootModeTest : public Test {
- protected:
- MockUefiRuntimeServicesTableLib RtServicesMock;
- UINT8 SecureBootMode;
- EFI_STATUS Status;
+protected:
+ MockUefiRuntimeServicesTableLib RtServicesMock;
+ UINT8 SecureBootMode;
+ EFI_STATUS Status;
- void SetUp() override {
- // Any random magic number can be used for these tests
- SecureBootMode = 0xAB;
- }
+ void
+ SetUp (
+ ) override
+ {
+ // Any random magic number can be used for these tests
+ SecureBootMode = 0xAB;
+ }
};
// Test SetSecureBootMode() API from SecureBootVariableLib to verify the
// expected error is returned when the call to gRT->SetVariable() fails.
-TEST_F(SetSecureBootModeTest, SetVarError) {
- EXPECT_CALL(RtServicesMock, gRT_SetVariable)
- .WillOnce(Return(EFI_INVALID_PARAMETER));
+TEST_F (SetSecureBootModeTest, SetVarError) {
+ EXPECT_CALL (RtServicesMock, gRT_SetVariable)
+ .WillOnce (Return (EFI_INVALID_PARAMETER));
- Status = SetSecureBootMode(SecureBootMode);
- EXPECT_EQ(Status, EFI_INVALID_PARAMETER);
+ Status = SetSecureBootMode (SecureBootMode);
+ EXPECT_EQ (Status, EFI_INVALID_PARAMETER);
}
// Test SetSecureBootMode() API from SecureBootVariableLib to verify the
// expected secure boot mode is written to the correct variable in the call
// to gRT->SetVariable().
-TEST_F(SetSecureBootModeTest, PropogateModeToSetVar) {
- EXPECT_CALL(RtServicesMock,
- gRT_SetVariable(
- Char16StrEq(EFI_CUSTOM_MODE_NAME),
- BufferEq(&gEfiCustomModeEnableGuid, sizeof(EFI_GUID)),
+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));
+ sizeof (SecureBootMode),
+ BufferEq (&SecureBootMode, sizeof (SecureBootMode))
+ )
+ )
+ .WillOnce (Return (EFI_SUCCESS));
- Status = SetSecureBootMode(SecureBootMode);
- EXPECT_EQ(Status, EFI_SUCCESS);
+ Status = SetSecureBootMode (SecureBootMode);
+ EXPECT_EQ (Status, EFI_SUCCESS);
}
//////////////////////////////////////////////////////////////////////////////
class GetSetupModeTest : public Test {
- protected:
- MockUefiRuntimeServicesTableLib RtServicesMock;
- UINT8 SetupMode;
- EFI_STATUS Status;
- UINT8 ExpSetupMode;
+protected:
+ MockUefiRuntimeServicesTableLib RtServicesMock;
+ UINT8 SetupMode;
+ EFI_STATUS Status;
+ UINT8 ExpSetupMode;
- void SetUp() override {
- // Any random magic number can be used for these tests
- ExpSetupMode = 0xAB;
- }
+ void
+ SetUp (
+ ) override
+ {
+ // Any random magic number can be used for these tests
+ ExpSetupMode = 0xAB;
+ }
};
// Test GetSetupMode() API from SecureBootVariableLib to verify the expected
// error is returned when the call to gRT->GetVariable() fails.
-TEST_F(GetSetupModeTest, GetVarError) {
- EXPECT_CALL(RtServicesMock, gRT_GetVariable)
- .WillOnce(Return(EFI_INVALID_PARAMETER));
+TEST_F (GetSetupModeTest, GetVarError) {
+ EXPECT_CALL (RtServicesMock, gRT_GetVariable)
+ .WillOnce (Return (EFI_INVALID_PARAMETER));
Status = GetSetupMode (&SetupMode);
- EXPECT_EQ(Status, EFI_INVALID_PARAMETER);
+ EXPECT_EQ (Status, EFI_INVALID_PARAMETER);
}
// Test GetSetupMode() API from SecureBootVariableLib to verify the expected
// setup mode is returned (and with a success return code) when the mode is
// successfully read from the call to gRT->GetVariable().
-TEST_F(GetSetupModeTest, FetchModeFromGetVar) {
- EXPECT_CALL(RtServicesMock,
- gRT_GetVariable(
- Char16StrEq(EFI_SETUP_MODE_NAME),
- BufferEq(&gEfiGlobalVariableGuid, sizeof(EFI_GUID)),
+TEST_F (GetSetupModeTest, FetchModeFromGetVar) {
+ EXPECT_CALL (
+ RtServicesMock,
+ gRT_GetVariable (
+ Char16StrEq (EFI_SETUP_MODE_NAME),
+ BufferEq (&gEfiGlobalVariableGuid, sizeof (EFI_GUID)),
_,
- Pointee(Eq(sizeof(SetupMode))),
- NotNull()))
- .WillOnce(DoAll(
- SetArgPointee<3>(sizeof(ExpSetupMode)),
- SetArgBuffer<4>(&ExpSetupMode, sizeof(ExpSetupMode)),
- Return(EFI_SUCCESS)));
+ Pointee (Eq (sizeof (SetupMode))),
+ NotNull ()
+ )
+ )
+ .WillOnce (
+ DoAll (
+ SetArgPointee<3>(sizeof (ExpSetupMode)),
+ SetArgBuffer<4>(&ExpSetupMode, sizeof (ExpSetupMode)),
+ Return (EFI_SUCCESS)
+ )
+ );
Status = GetSetupMode (&SetupMode);
- ASSERT_EQ(Status, EFI_SUCCESS);
- EXPECT_EQ(SetupMode, ExpSetupMode);
+ ASSERT_EQ (Status, EFI_SUCCESS);
+ EXPECT_EQ (SetupMode, ExpSetupMode);
}
//////////////////////////////////////////////////////////////////////////////
class IsSecureBootEnabledTest : public Test {
- protected:
- MockUefiLib UefiLibMock;
- BOOLEAN Enabled;
+protected:
+ MockUefiLib UefiLibMock;
+ BOOLEAN Enabled;
};
// Test IsSecureBootEnabled() API from SecureBootVariableLib to verify FALSE
// is returned when the call to GetEfiGlobalVariable2() fails.
-TEST_F(IsSecureBootEnabledTest, GetVarError) {
- EXPECT_CALL(UefiLibMock, GetEfiGlobalVariable2)
- .WillOnce(Return(EFI_ABORTED));
+TEST_F (IsSecureBootEnabledTest, GetVarError) {
+ EXPECT_CALL (UefiLibMock, GetEfiGlobalVariable2)
+ .WillOnce (Return (EFI_ABORTED));
Enabled = IsSecureBootEnabled ();
- EXPECT_EQ(Enabled, FALSE);
+ EXPECT_EQ (Enabled, FALSE);
}
//////////////////////////////////////////////////////////////////////////////
class IsSecureBootEnabledAllocTest : public IsSecureBootEnabledTest {
- protected:
- UINT8 *BootEnabledBuffer;
+protected:
+ UINT8 *BootEnabledBuffer;
- void SetUp() override {
- BootEnabledBuffer = (UINT8*) AllocatePool(1);
- ASSERT_NE(BootEnabledBuffer, nullptr);
- }
+ void
+ SetUp (
+ ) override
+ {
+ BootEnabledBuffer = (UINT8 *)AllocatePool (1);
+ ASSERT_NE (BootEnabledBuffer, nullptr);
+ }
};
// Test IsSecureBootEnabled() API from SecureBootVariableLib to verify TRUE
// is returned when the call to GetEfiGlobalVariable2() is successful and
// returns SECURE_BOOT_MODE_ENABLE.
-TEST_F(IsSecureBootEnabledAllocTest, IsEnabled) {
+TEST_F (IsSecureBootEnabledAllocTest, IsEnabled) {
*BootEnabledBuffer = SECURE_BOOT_MODE_ENABLE;
- EXPECT_CALL(UefiLibMock,
- GetEfiGlobalVariable2(
- Char16StrEq(EFI_SECURE_BOOT_MODE_NAME),
- NotNull(),
- _))
- .WillOnce(DoAll(
- SetArgBuffer<1>(&BootEnabledBuffer, sizeof(VOID*)),
- Return(EFI_SUCCESS)));
+ EXPECT_CALL (
+ UefiLibMock,
+ GetEfiGlobalVariable2 (
+ Char16StrEq (EFI_SECURE_BOOT_MODE_NAME),
+ NotNull (),
+ _
+ )
+ )
+ .WillOnce (
+ DoAll (
+ SetArgBuffer<1>(&BootEnabledBuffer, sizeof (VOID *)),
+ Return (EFI_SUCCESS)
+ )
+ );
Enabled = IsSecureBootEnabled ();
- EXPECT_EQ(Enabled, TRUE);
+ EXPECT_EQ (Enabled, TRUE);
}
// Test IsSecureBootEnabled() API from SecureBootVariableLib to verify FALSE
// is returned when the call to GetEfiGlobalVariable2() is successful and
// returns SECURE_BOOT_MODE_DISABLE.
-TEST_F(IsSecureBootEnabledAllocTest, IsDisabled) {
+TEST_F (IsSecureBootEnabledAllocTest, IsDisabled) {
*BootEnabledBuffer = SECURE_BOOT_MODE_DISABLE;
- EXPECT_CALL(UefiLibMock,
- GetEfiGlobalVariable2(
- Char16StrEq(EFI_SECURE_BOOT_MODE_NAME),
- NotNull(),
- _))
- .WillOnce(DoAll(
- SetArgBuffer<1>(&BootEnabledBuffer, sizeof(VOID*)),
- Return(EFI_SUCCESS)));
+ EXPECT_CALL (
+ UefiLibMock,
+ GetEfiGlobalVariable2 (
+ Char16StrEq (EFI_SECURE_BOOT_MODE_NAME),
+ NotNull (),
+ _
+ )
+ )
+ .WillOnce (
+ DoAll (
+ SetArgBuffer<1>(&BootEnabledBuffer, sizeof (VOID *)),
+ Return (EFI_SUCCESS)
+ )
+ );
Enabled = IsSecureBootEnabled ();
- EXPECT_EQ(Enabled, FALSE);
+ EXPECT_EQ (Enabled, FALSE);
}
-int main(int argc, char* argv[]) {
- testing::InitGoogleTest(&argc, argv);
- return RUN_ALL_TESTS();
+int
+main (
+ int argc,
+ char *argv[]
+ )
+{
+ testing::InitGoogleTest (&argc, argv);
+ return RUN_ALL_TESTS ();
}
diff --git a/SecurityPkg/Test/Mock/Include/GoogleTest/Library/MockPlatformPKProtectionLib.h b/SecurityPkg/Test/Mock/Include/GoogleTest/Library/MockPlatformPKProtectionLib.h
index 8024f4be2975..04288f2b75a3 100644
--- a/SecurityPkg/Test/Mock/Include/GoogleTest/Library/MockPlatformPKProtectionLib.h
+++ b/SecurityPkg/Test/Mock/Include/GoogleTest/Library/MockPlatformPKProtectionLib.h
@@ -11,8 +11,8 @@
#include <Library/GoogleTestLib.h>
#include <Library/FunctionMockLib.h>
extern "C" {
-#include <Uefi.h>
-#include <Library/PlatformPKProtectionLib.h>
+ #include <Uefi.h>
+ #include <Library/PlatformPKProtectionLib.h>
}
struct MockPlatformPKProtectionLib {
diff --git a/SecurityPkg/Test/Mock/Library/GoogleTest/MockPlatformPKProtectionLib/MockPlatformPKProtectionLib.cpp b/SecurityPkg/Test/Mock/Library/GoogleTest/MockPlatformPKProtectionLib/MockPlatformPKProtectionLib.cpp
index 5ea030f6dfcf..6613d5ed199a 100644
--- a/SecurityPkg/Test/Mock/Library/GoogleTest/MockPlatformPKProtectionLib/MockPlatformPKProtectionLib.cpp
+++ b/SecurityPkg/Test/Mock/Library/GoogleTest/MockPlatformPKProtectionLib/MockPlatformPKProtectionLib.cpp
@@ -6,6 +6,6 @@
**/
#include <GoogleTest/Library/MockPlatformPKProtectionLib.h>
-MOCK_INTERFACE_DEFINITION(MockPlatformPKProtectionLib);
+MOCK_INTERFACE_DEFINITION (MockPlatformPKProtectionLib);
-MOCK_FUNCTION_DEFINITION(MockPlatformPKProtectionLib, DisablePKProtection, 0, EFIAPI);
+MOCK_FUNCTION_DEFINITION (MockPlatformPKProtectionLib, DisablePKProtection, 0, EFIAPI);
--
2.41.0.windows.3
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107670): https://edk2.groups.io/g/devel/message/107670
Mute This Topic: https://groups.io/mt/100655293/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [edk2-devel] [PATCH v1 6/7] UnitTestFrameworkPkg: Apply uncrustify formatting to relevant files
2023-08-09 21:32 [edk2-devel] [PATCH v1 0/7] Uncrustify GoogleTest update VivianNK
` (4 preceding siblings ...)
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 5/7] SecurityPkg: " VivianNK
@ 2023-08-09 21:32 ` VivianNK
2023-08-10 19:25 ` Michael D Kinney
2023-08-15 1:22 ` Michael Kubacki
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 7/7] .pytool: Undo uncrustify check change VivianNK
2023-08-15 1:32 ` [edk2-devel] [PATCH v1 0/7] Uncrustify GoogleTest update Michael Kubacki
7 siblings, 2 replies; 15+ messages in thread
From: VivianNK @ 2023-08-09 21:32 UTC (permalink / raw)
To: devel
Apply uncrustify formatting to GoogleTest cpp and header files.
CC: Michael D Kinney <michael.d.kinney@intel.com>
CC: Michael Kubacki <mikuback@linux.microsoft.com>
CC: Sean Brogan <sean.brogan@microsoft.com>
Signed-off-by: Vivian Nowka-Keane <vnowkakeane@linux.microsoft.com>
---
UnitTestFrameworkPkg/Include/Library/GoogleTestLib.h | 2 +-
UnitTestFrameworkPkg/Test/GoogleTest/Sample/SampleGoogleTest/SampleGoogleTest.cpp | 76 ++++++++++++--------
2 files changed, 47 insertions(+), 31 deletions(-)
diff --git a/UnitTestFrameworkPkg/Include/Library/GoogleTestLib.h b/UnitTestFrameworkPkg/Include/Library/GoogleTestLib.h
index c0a3d8e66011..c723b5c23050 100644
--- a/UnitTestFrameworkPkg/Include/Library/GoogleTestLib.h
+++ b/UnitTestFrameworkPkg/Include/Library/GoogleTestLib.h
@@ -14,7 +14,7 @@
#include <cstring>
extern "C" {
-#include <Uefi.h>
+ #include <Uefi.h>
}
//////////////////////////////////////////////////////////////////////////////
diff --git a/UnitTestFrameworkPkg/Test/GoogleTest/Sample/SampleGoogleTest/SampleGoogleTest.cpp b/UnitTestFrameworkPkg/Test/GoogleTest/Sample/SampleGoogleTest/SampleGoogleTest.cpp
index c83e58596a82..94cbf2cf0b3c 100644
--- a/UnitTestFrameworkPkg/Test/GoogleTest/Sample/SampleGoogleTest/SampleGoogleTest.cpp
+++ b/UnitTestFrameworkPkg/Test/GoogleTest/Sample/SampleGoogleTest/SampleGoogleTest.cpp
@@ -18,7 +18,7 @@ extern "C" {
Sample unit test that verifies the expected result of an unsigned integer
addition operation.
**/
-TEST(SimpleMathTests, OnePlusOneShouldEqualTwo) {
+TEST (SimpleMathTests, OnePlusOneShouldEqualTwo) {
UINTN A;
UINTN B;
UINTN C;
@@ -34,11 +34,11 @@ TEST(SimpleMathTests, OnePlusOneShouldEqualTwo) {
Sample unit test that verifies that a global BOOLEAN is updatable.
**/
class GlobalBooleanVarTests : public ::testing::Test {
- public:
- BOOLEAN SampleGlobalTestBoolean = FALSE;
+public:
+ BOOLEAN SampleGlobalTestBoolean = FALSE;
};
-TEST_F(GlobalBooleanVarTests, GlobalBooleanShouldBeChangeable) {
+TEST_F (GlobalBooleanVarTests, GlobalBooleanShouldBeChangeable) {
SampleGlobalTestBoolean = TRUE;
ASSERT_TRUE (SampleGlobalTestBoolean);
@@ -51,37 +51,46 @@ TEST_F(GlobalBooleanVarTests, GlobalBooleanShouldBeChangeable) {
pointer is updatable.
**/
class GlobalVarTests : public ::testing::Test {
- public:
- VOID *SampleGlobalTestPointer = NULL;
+public:
+ VOID *SampleGlobalTestPointer = NULL;
- protected:
- void SetUp() override {
+protected:
+ void
+ SetUp (
+ ) override
+ {
ASSERT_EQ ((UINTN)SampleGlobalTestPointer, (UINTN)NULL);
}
- void TearDown() {
+
+ void
+ TearDown (
+ )
+ {
SampleGlobalTestPointer = NULL;
}
};
-TEST_F(GlobalVarTests, GlobalPointerShouldBeChangeable) {
+TEST_F (GlobalVarTests, GlobalPointerShouldBeChangeable) {
SampleGlobalTestPointer = (VOID *)-1;
ASSERT_EQ ((UINTN)SampleGlobalTestPointer, (UINTN)((VOID *)-1));
}
-
/**
Set PcdDebugPropertyMask for each MacroTestsAssertsEnabledDisabled test
**/
class MacroTestsAssertsEnabledDisabled : public testing::TestWithParam<UINT8> {
- void SetUp() {
- PatchPcdSet8 (PcdDebugPropertyMask, GetParam());
+ void
+ SetUp (
+ )
+ {
+ PatchPcdSet8 (PcdDebugPropertyMask, GetParam ());
}
};
/**
Sample unit test using the ASSERT_TRUE() macro.
**/
-TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertTrue) {
+TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertTrue) {
UINT64 Result;
//
@@ -99,7 +108,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertTrue) {
/**
Sample unit test using the ASSERT_FALSE() macro.
**/
-TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertFalse) {
+TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertFalse) {
UINT64 Result;
//
@@ -117,7 +126,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertFalse) {
/**
Sample unit test using the ASSERT_EQ() macro.
**/
-TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertEqual) {
+TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertEqual) {
UINT64 Result;
//
@@ -135,7 +144,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertEqual) {
/**
Sample unit test using the ASSERT_STREQ() macro.
**/
-TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertMemEqual) {
+TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertMemEqual) {
CHAR8 *String1;
CHAR8 *String2;
@@ -150,7 +159,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertMemEqual) {
/**
Sample unit test using the ASSERT_NE() macro.
**/
-TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertNotEqual) {
+TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertNotEqual) {
UINT64 Result;
//
@@ -169,7 +178,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertNotEqual) {
Sample unit test using the ASSERT_TRUE() and ASSERT(FALSE)
and EFI_EFFOR() macros to check status
**/
-TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertNotEfiError) {
+TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertNotEfiError) {
//
// This test passes because the status is not an EFI error.
//
@@ -184,7 +193,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertNotEfiError) {
/**
Sample unit test using the ASSERT_EQ() macro to compare EFI_STATUS values.
**/
-TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertStatusEqual) {
+TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertStatusEqual) {
//
// This test passes because the status value are always equal.
//
@@ -194,7 +203,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertStatusEqual) {
/**
Sample unit test using ASSERT_NE() macro to make sure a pointer is not NULL.
**/
-TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertNotNull) {
+TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertNotNull) {
UINT64 Result;
//
@@ -206,7 +215,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertNotNull) {
/**
Sample unit test using that should not generate any ASSERTs()
**/
-TEST_P(MacroTestsAssertsEnabledDisabled, MacroExpectNoAssertFailure) {
+TEST_P (MacroTestsAssertsEnabledDisabled, MacroExpectNoAssertFailure) {
//
// This test passes because it never triggers an ASSERT().
//
@@ -222,7 +231,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroExpectNoAssertFailure) {
/**
Sample unit test using the ASSERT_DEATH() macro to test expected ASSERT()s.
**/
-TEST_P(MacroTestsAssertsEnabledDisabled, MacroExpectAssertFailure) {
+TEST_P (MacroTestsAssertsEnabledDisabled, MacroExpectAssertFailure) {
//
// Skip tests that verify an ASSERT() is triggered if ASSERT()s are disabled.
//
@@ -243,21 +252,28 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroExpectAssertFailure) {
ASSERT_DEATH (DecimalToBcd8 (101), "");
}
-INSTANTIATE_TEST_SUITE_P(ValidInput,
- MacroTestsAssertsEnabledDisabled,
- ::testing::Values(PcdGet8 (PcdDebugPropertyMask) | BIT0, PcdGet8 (PcdDebugPropertyMask) & (~BIT0)));
+INSTANTIATE_TEST_SUITE_P (
+ ValidInput,
+ MacroTestsAssertsEnabledDisabled,
+ ::testing::Values (PcdGet8 (PcdDebugPropertyMask) | BIT0, PcdGet8 (PcdDebugPropertyMask) & (~BIT0))
+ );
/**
Sample unit test using the SCOPED_TRACE() macro for trace messages.
**/
-TEST(MacroTestsMessages, MacroTraceMessage) {
+TEST (MacroTestsMessages, MacroTraceMessage) {
//
// Example of logging.
//
SCOPED_TRACE ("SCOPED_TRACE message\n");
}
-int main(int argc, char* argv[]) {
- testing::InitGoogleTest(&argc, argv);
- return RUN_ALL_TESTS();
+int
+main (
+ int argc,
+ char *argv[]
+ )
+{
+ testing::InitGoogleTest (&argc, argv);
+ return RUN_ALL_TESTS ();
}
--
2.41.0.windows.3
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107671): https://edk2.groups.io/g/devel/message/107671
Mute This Topic: https://groups.io/mt/100655294/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [edk2-devel] [PATCH v1 7/7] .pytool: Undo uncrustify check change
2023-08-09 21:32 [edk2-devel] [PATCH v1 0/7] Uncrustify GoogleTest update VivianNK
` (5 preceding siblings ...)
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 6/7] UnitTestFrameworkPkg: " VivianNK
@ 2023-08-09 21:32 ` VivianNK
2023-08-15 1:28 ` Michael Kubacki
2023-08-15 1:32 ` [edk2-devel] [PATCH v1 0/7] Uncrustify GoogleTest update Michael Kubacki
7 siblings, 1 reply; 15+ messages in thread
From: VivianNK @ 2023-08-09 21:32 UTC (permalink / raw)
To: devel
Set global audit only to False now that new rules have been applied to
all necessary packages.
Signed-off-by: Vivian Nowka-Keane <vnowkakeane@linux.microsoft.com>
---
.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
index 17f77b48d954..ffc72f2c5918 100644
--- a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
+++ b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
@@ -530,7 +530,7 @@ class UncrustifyCheck(ICiBuildPlugin):
"""
Initializes options that influence test case output.
"""
- self._audit_only_mode = True
+ self._audit_only_mode = False
self._output_file_diffs = True
if "AuditOnly" in self._package_config and self._package_config["AuditOnly"]:
--
2.41.0.windows.3
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107672): https://edk2.groups.io/g/devel/message/107672
Mute This Topic: https://groups.io/mt/100655295/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [edk2-devel] [PATCH v1 6/7] UnitTestFrameworkPkg: Apply uncrustify formatting to relevant files
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 6/7] UnitTestFrameworkPkg: " VivianNK
@ 2023-08-10 19:25 ` Michael D Kinney
2023-08-15 1:22 ` Michael Kubacki
1 sibling, 0 replies; 15+ messages in thread
From: Michael D Kinney @ 2023-08-10 19:25 UTC (permalink / raw)
To: devel@edk2.groups.io, vnowkakeane@linux.microsoft.com; +Cc: Kinney, Michael D
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of VivianNK
> Sent: Wednesday, August 9, 2023 2:32 PM
> To: devel@edk2.groups.io
> Subject: [edk2-devel] [PATCH v1 6/7] UnitTestFrameworkPkg: Apply
> uncrustify formatting to relevant files
>
> Apply uncrustify formatting to GoogleTest cpp and header files.
>
> CC: Michael D Kinney <michael.d.kinney@intel.com>
> CC: Michael Kubacki <mikuback@linux.microsoft.com>
> CC: Sean Brogan <sean.brogan@microsoft.com>
> Signed-off-by: Vivian Nowka-Keane <vnowkakeane@linux.microsoft.com>
> ---
> UnitTestFrameworkPkg/Include/Library/GoogleTestLib.h
> | 2 +-
>
> UnitTestFrameworkPkg/Test/GoogleTest/Sample/SampleGoogleTest/SampleGoogle
> Test.cpp | 76 ++++++++++++--------
> 2 files changed, 47 insertions(+), 31 deletions(-)
>
> diff --git a/UnitTestFrameworkPkg/Include/Library/GoogleTestLib.h
> b/UnitTestFrameworkPkg/Include/Library/GoogleTestLib.h
> index c0a3d8e66011..c723b5c23050 100644
> --- a/UnitTestFrameworkPkg/Include/Library/GoogleTestLib.h
> +++ b/UnitTestFrameworkPkg/Include/Library/GoogleTestLib.h
> @@ -14,7 +14,7 @@
> #include <cstring>
>
>
>
> extern "C" {
>
> -#include <Uefi.h>
>
> + #include <Uefi.h>
>
> }
>
>
>
>
> /////////////////////////////////////////////////////////////////////////
> /////
>
> diff --git
> a/UnitTestFrameworkPkg/Test/GoogleTest/Sample/SampleGoogleTest/SampleGoog
> leTest.cpp
> b/UnitTestFrameworkPkg/Test/GoogleTest/Sample/SampleGoogleTest/SampleGoog
> leTest.cpp
> index c83e58596a82..94cbf2cf0b3c 100644
> ---
> a/UnitTestFrameworkPkg/Test/GoogleTest/Sample/SampleGoogleTest/SampleGoog
> leTest.cpp
> +++
> b/UnitTestFrameworkPkg/Test/GoogleTest/Sample/SampleGoogleTest/SampleGoog
> leTest.cpp
> @@ -18,7 +18,7 @@ extern "C" {
> Sample unit test that verifies the expected result of an unsigned
> integer
>
> addition operation.
>
> **/
>
> -TEST(SimpleMathTests, OnePlusOneShouldEqualTwo) {
>
> +TEST (SimpleMathTests, OnePlusOneShouldEqualTwo) {
>
> UINTN A;
>
> UINTN B;
>
> UINTN C;
>
> @@ -34,11 +34,11 @@ TEST(SimpleMathTests, OnePlusOneShouldEqualTwo) {
> Sample unit test that verifies that a global BOOLEAN is updatable.
>
> **/
>
> class GlobalBooleanVarTests : public ::testing::Test {
>
> - public:
>
> - BOOLEAN SampleGlobalTestBoolean = FALSE;
>
> +public:
>
> + BOOLEAN SampleGlobalTestBoolean = FALSE;
>
> };
>
>
>
> -TEST_F(GlobalBooleanVarTests, GlobalBooleanShouldBeChangeable) {
>
> +TEST_F (GlobalBooleanVarTests, GlobalBooleanShouldBeChangeable) {
>
> SampleGlobalTestBoolean = TRUE;
>
> ASSERT_TRUE (SampleGlobalTestBoolean);
>
>
>
> @@ -51,37 +51,46 @@ TEST_F(GlobalBooleanVarTests,
> GlobalBooleanShouldBeChangeable) {
> pointer is updatable.
>
> **/
>
> class GlobalVarTests : public ::testing::Test {
>
> - public:
>
> - VOID *SampleGlobalTestPointer = NULL;
>
> +public:
>
> + VOID *SampleGlobalTestPointer = NULL;
>
>
>
> - protected:
>
> - void SetUp() override {
>
> +protected:
>
> + void
>
> + SetUp (
>
> + ) override
>
> + {
>
> ASSERT_EQ ((UINTN)SampleGlobalTestPointer, (UINTN)NULL);
>
> }
>
> - void TearDown() {
>
> +
>
> + void
>
> + TearDown (
>
> + )
>
> + {
>
> SampleGlobalTestPointer = NULL;
>
> }
>
> };
>
>
>
> -TEST_F(GlobalVarTests, GlobalPointerShouldBeChangeable) {
>
> +TEST_F (GlobalVarTests, GlobalPointerShouldBeChangeable) {
>
> SampleGlobalTestPointer = (VOID *)-1;
>
> ASSERT_EQ ((UINTN)SampleGlobalTestPointer, (UINTN)((VOID *)-1));
>
> }
>
>
>
> -
>
> /**
>
> Set PcdDebugPropertyMask for each MacroTestsAssertsEnabledDisabled
> test
>
> **/
>
> class MacroTestsAssertsEnabledDisabled : public
> testing::TestWithParam<UINT8> {
>
> - void SetUp() {
>
> - PatchPcdSet8 (PcdDebugPropertyMask, GetParam());
>
> + void
>
> + SetUp (
>
> + )
>
> + {
>
> + PatchPcdSet8 (PcdDebugPropertyMask, GetParam ());
>
> }
>
> };
>
>
>
> /**
>
> Sample unit test using the ASSERT_TRUE() macro.
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertTrue) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertTrue) {
>
> UINT64 Result;
>
>
>
> //
>
> @@ -99,7 +108,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled,
> MacroAssertTrue) {
> /**
>
> Sample unit test using the ASSERT_FALSE() macro.
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertFalse) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertFalse) {
>
> UINT64 Result;
>
>
>
> //
>
> @@ -117,7 +126,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled,
> MacroAssertFalse) {
> /**
>
> Sample unit test using the ASSERT_EQ() macro.
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertEqual) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertEqual) {
>
> UINT64 Result;
>
>
>
> //
>
> @@ -135,7 +144,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled,
> MacroAssertEqual) {
> /**
>
> Sample unit test using the ASSERT_STREQ() macro.
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertMemEqual) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertMemEqual) {
>
> CHAR8 *String1;
>
> CHAR8 *String2;
>
>
>
> @@ -150,7 +159,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled,
> MacroAssertMemEqual) {
> /**
>
> Sample unit test using the ASSERT_NE() macro.
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertNotEqual) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertNotEqual) {
>
> UINT64 Result;
>
>
>
> //
>
> @@ -169,7 +178,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled,
> MacroAssertNotEqual) {
> Sample unit test using the ASSERT_TRUE() and ASSERT(FALSE)
>
> and EFI_EFFOR() macros to check status
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertNotEfiError) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertNotEfiError) {
>
> //
>
> // This test passes because the status is not an EFI error.
>
> //
>
> @@ -184,7 +193,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled,
> MacroAssertNotEfiError) {
> /**
>
> Sample unit test using the ASSERT_EQ() macro to compare EFI_STATUS
> values.
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertStatusEqual) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertStatusEqual) {
>
> //
>
> // This test passes because the status value are always equal.
>
> //
>
> @@ -194,7 +203,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled,
> MacroAssertStatusEqual) {
> /**
>
> Sample unit test using ASSERT_NE() macro to make sure a pointer is not
> NULL.
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertNotNull) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertNotNull) {
>
> UINT64 Result;
>
>
>
> //
>
> @@ -206,7 +215,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled,
> MacroAssertNotNull) {
> /**
>
> Sample unit test using that should not generate any ASSERTs()
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroExpectNoAssertFailure) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroExpectNoAssertFailure) {
>
> //
>
> // This test passes because it never triggers an ASSERT().
>
> //
>
> @@ -222,7 +231,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled,
> MacroExpectNoAssertFailure) {
> /**
>
> Sample unit test using the ASSERT_DEATH() macro to test expected
> ASSERT()s.
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroExpectAssertFailure) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroExpectAssertFailure) {
>
> //
>
> // Skip tests that verify an ASSERT() is triggered if ASSERT()s are
> disabled.
>
> //
>
> @@ -243,21 +252,28 @@ TEST_P(MacroTestsAssertsEnabledDisabled,
> MacroExpectAssertFailure) {
> ASSERT_DEATH (DecimalToBcd8 (101), "");
>
> }
>
>
>
> -INSTANTIATE_TEST_SUITE_P(ValidInput,
>
> - MacroTestsAssertsEnabledDisabled,
>
> - ::testing::Values(PcdGet8
> (PcdDebugPropertyMask) | BIT0, PcdGet8 (PcdDebugPropertyMask) &
> (~BIT0)));
>
> +INSTANTIATE_TEST_SUITE_P (
>
> + ValidInput,
>
> + MacroTestsAssertsEnabledDisabled,
>
> + ::testing::Values (PcdGet8 (PcdDebugPropertyMask) | BIT0, PcdGet8
> (PcdDebugPropertyMask) & (~BIT0))
>
> + );
>
>
>
> /**
>
> Sample unit test using the SCOPED_TRACE() macro for trace messages.
>
> **/
>
> -TEST(MacroTestsMessages, MacroTraceMessage) {
>
> +TEST (MacroTestsMessages, MacroTraceMessage) {
>
> //
>
> // Example of logging.
>
> //
>
> SCOPED_TRACE ("SCOPED_TRACE message\n");
>
> }
>
>
>
> -int main(int argc, char* argv[]) {
>
> - testing::InitGoogleTest(&argc, argv);
>
> - return RUN_ALL_TESTS();
>
> +int
>
> +main (
>
> + int argc,
>
> + char *argv[]
>
> + )
>
> +{
>
> + testing::InitGoogleTest (&argc, argv);
>
> + return RUN_ALL_TESTS ();
>
> }
>
> --
> 2.41.0.windows.3
>
>
>
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#107671):
> https://edk2.groups.io/g/devel/message/107671
> Mute This Topic: https://groups.io/mt/100655294/1643496
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub
> [michael.d.kinney@intel.com]
> -=-=-=-=-=-=
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107700): https://edk2.groups.io/g/devel/message/107700
Mute This Topic: https://groups.io/mt/100655294/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [edk2-devel] [PATCH v1 1/7] .pytool: Set uncrustify check to audit only
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 1/7] .pytool: Set uncrustify check to audit only VivianNK
@ 2023-08-15 1:06 ` Michael Kubacki
[not found] ` <177B69072E52D32F.12117@groups.io>
1 sibling, 0 replies; 15+ messages in thread
From: Michael Kubacki @ 2023-08-15 1:06 UTC (permalink / raw)
To: devel, vnowkakeane
Was this meant to be included in the series? We wouldn't want audit only
mode always enabled.
On 8/9/2023 5:32 PM, VivianNK wrote:
> Temporarily set uncrustify to audit only to prevent build failures.
>
> CC: Sean Brogan <sean.brogan@microsoft.com>
> CC: Michael Kubacki <mikuback@linux.microsoft.com>
> CC: Michael D Kinney <michael.d.kinney@intel.com>
> CC: Liming Gao <gaoliming@byosoft.com.cn>
> Signed-off-by: Vivian Nowka-Keane <vnowkakeane@linux.microsoft.com>
> ---
> .pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
> index 8dc9ffe6945a..8978ffc443bf 100644
> --- a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
> +++ b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
> @@ -530,7 +530,7 @@ class UncrustifyCheck(ICiBuildPlugin):
> """
>
> Initializes options that influence test case output.
>
> """
>
> - self._audit_only_mode = False
>
> + self._audit_only_mode = True
>
> self._output_file_diffs = True
>
>
>
> if "AuditOnly" in self._package_config and self._package_config["AuditOnly"]:
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107751): https://edk2.groups.io/g/devel/message/107751
Mute This Topic: https://groups.io/mt/100655290/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [edk2-devel] [PATCH v1 1/7] .pytool: Set uncrustify check to audit only
[not found] ` <177B69072E52D32F.12117@groups.io>
@ 2023-08-15 1:22 ` Michael Kubacki
0 siblings, 0 replies; 15+ messages in thread
From: Michael Kubacki @ 2023-08-15 1:22 UTC (permalink / raw)
To: devel, vnowkakeane
Looking at the whole series, I see you did this to prevent intermediate
CI failures while adjusting the code to comply with the future settings
change.
If it stays this way, the commit message should clearly call this out.
For example:
"Temporarily set uncrustify to audit only mode so the following commits
can adjust the code for new formatting settings before those settings
are applied."
The scope could also be adjusted in uncrustify_plug_in.yaml to something
other than "cibuild" that does not match known scopes (like "inactive")
but I think this is fine if the message is clear about why the value is
being temporarily modified.
Thanks,
Michael
On 8/14/2023 9:06 PM, Michael Kubacki wrote:
> Was this meant to be included in the series? We wouldn't want audit only
> mode always enabled.
>
> On 8/9/2023 5:32 PM, VivianNK wrote:
>> Temporarily set uncrustify to audit only to prevent build failures.
>>
>> CC: Sean Brogan <sean.brogan@microsoft.com>
>> CC: Michael Kubacki <mikuback@linux.microsoft.com>
>> CC: Michael D Kinney <michael.d.kinney@intel.com>
>> CC: Liming Gao <gaoliming@byosoft.com.cn>
>> Signed-off-by: Vivian Nowka-Keane <vnowkakeane@linux.microsoft.com>
>> ---
>> .pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
>> b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
>> index 8dc9ffe6945a..8978ffc443bf 100644
>> --- a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
>> +++ b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
>> @@ -530,7 +530,7 @@ class UncrustifyCheck(ICiBuildPlugin):
>> """
>>
>> Initializes options that influence test case output.
>>
>> """
>>
>> - self._audit_only_mode = False
>>
>> + self._audit_only_mode = True
>>
>> self._output_file_diffs = True
>>
>>
>> if "AuditOnly" in self._package_config and
>> self._package_config["AuditOnly"]:
>>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107753): https://edk2.groups.io/g/devel/message/107753
Mute This Topic: https://groups.io/mt/100655290/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [edk2-devel] [PATCH v1 2/7] .pytool: Add cpp support to uncrustify plugin
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 2/7] .pytool: Add cpp support to uncrustify plugin VivianNK
@ 2023-08-15 1:22 ` Michael Kubacki
0 siblings, 0 replies; 15+ messages in thread
From: Michael Kubacki @ 2023-08-15 1:22 UTC (permalink / raw)
To: devel, vnowkakeane
Reviewed-by: Michael Kubacki <michael.kubacki@microsoft.com>
On 8/9/2023 5:32 PM, VivianNK wrote:
> Modified the uncrustify config to apply cpp specific formatting rules.
> Modified uncrustify check to include *.cpp files.
>
> CC: Sean Brogan <sean.brogan@microsoft.com>
> CC: Michael Kubacki <mikuback@linux.microsoft.com>
> CC: Michael D Kinney <michael.d.kinney@intel.com>
> CC: Liming Gao <gaoliming@byosoft.com.cn>
> Signed-off-by: Vivian Nowka-Keane <vnowkakeane@linux.microsoft.com>
> ---
> .pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py | 2 +-
> .pytool/Plugin/UncrustifyCheck/uncrustify.cfg | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
> index 8978ffc443bf..17f77b48d954 100644
> --- a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
> +++ b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
> @@ -110,7 +110,7 @@ class UncrustifyCheck(ICiBuildPlugin):
> # A package can add any additional paths with "AdditionalIncludePaths"
>
> # A package can remove any of these paths with "IgnoreStandardPaths"
>
> #
>
> - STANDARD_PLUGIN_DEFINED_PATHS = ("*.c", "*.h")
>
> + STANDARD_PLUGIN_DEFINED_PATHS = ("*.c", "*.h", "*.cpp")
>
>
>
> #
>
> # The Uncrustify application path should set in this environment variable
>
> diff --git a/.pytool/Plugin/UncrustifyCheck/uncrustify.cfg b/.pytool/Plugin/UncrustifyCheck/uncrustify.cfg
> index 8506c3333715..d7e86a6e57e6 100644
> --- a/.pytool/Plugin/UncrustifyCheck/uncrustify.cfg
> +++ b/.pytool/Plugin/UncrustifyCheck/uncrustify.cfg
> @@ -215,7 +215,7 @@ indent_braces = false
> indent_braces_no_class = false
>
> indent_braces_no_func = true
>
> indent_braces_no_struct = false
>
> -indent_class = false
>
> +indent_class = true
>
> indent_class_colon = false
>
> indent_cmt_with_tabs = false # Whether to indent comments that are not at a brace level with tabs on
>
> # a tabstop. Requires indent_with_tabs=2. If false, will use spaces.
>
> @@ -223,7 +223,7 @@ indent_col1_comment = true
> indent_col1_multi_string_literal= true
>
> indent_comma_paren = true
>
> indent_else_if = true
>
> -indent_extern = false
>
> +indent_extern = true
>
> indent_first_bool_expr = true
>
>
>
> indent_func_def_param_paren_pos_threshold = 0
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107754): https://edk2.groups.io/g/devel/message/107754
Mute This Topic: https://groups.io/mt/100655289/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [edk2-devel] [PATCH v1 6/7] UnitTestFrameworkPkg: Apply uncrustify formatting to relevant files
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 6/7] UnitTestFrameworkPkg: " VivianNK
2023-08-10 19:25 ` Michael D Kinney
@ 2023-08-15 1:22 ` Michael Kubacki
1 sibling, 0 replies; 15+ messages in thread
From: Michael Kubacki @ 2023-08-15 1:22 UTC (permalink / raw)
To: devel, vnowkakeane
Reviewed-by: Michael Kubacki <michael.kubacki@microsoft.com>
On 8/9/2023 5:32 PM, VivianNK wrote:
> Apply uncrustify formatting to GoogleTest cpp and header files.
>
> CC: Michael D Kinney <michael.d.kinney@intel.com>
> CC: Michael Kubacki <mikuback@linux.microsoft.com>
> CC: Sean Brogan <sean.brogan@microsoft.com>
> Signed-off-by: Vivian Nowka-Keane <vnowkakeane@linux.microsoft.com>
> ---
> UnitTestFrameworkPkg/Include/Library/GoogleTestLib.h | 2 +-
> UnitTestFrameworkPkg/Test/GoogleTest/Sample/SampleGoogleTest/SampleGoogleTest.cpp | 76 ++++++++++++--------
> 2 files changed, 47 insertions(+), 31 deletions(-)
>
> diff --git a/UnitTestFrameworkPkg/Include/Library/GoogleTestLib.h b/UnitTestFrameworkPkg/Include/Library/GoogleTestLib.h
> index c0a3d8e66011..c723b5c23050 100644
> --- a/UnitTestFrameworkPkg/Include/Library/GoogleTestLib.h
> +++ b/UnitTestFrameworkPkg/Include/Library/GoogleTestLib.h
> @@ -14,7 +14,7 @@
> #include <cstring>
>
>
>
> extern "C" {
>
> -#include <Uefi.h>
>
> + #include <Uefi.h>
>
> }
>
>
>
> //////////////////////////////////////////////////////////////////////////////
>
> diff --git a/UnitTestFrameworkPkg/Test/GoogleTest/Sample/SampleGoogleTest/SampleGoogleTest.cpp b/UnitTestFrameworkPkg/Test/GoogleTest/Sample/SampleGoogleTest/SampleGoogleTest.cpp
> index c83e58596a82..94cbf2cf0b3c 100644
> --- a/UnitTestFrameworkPkg/Test/GoogleTest/Sample/SampleGoogleTest/SampleGoogleTest.cpp
> +++ b/UnitTestFrameworkPkg/Test/GoogleTest/Sample/SampleGoogleTest/SampleGoogleTest.cpp
> @@ -18,7 +18,7 @@ extern "C" {
> Sample unit test that verifies the expected result of an unsigned integer
>
> addition operation.
>
> **/
>
> -TEST(SimpleMathTests, OnePlusOneShouldEqualTwo) {
>
> +TEST (SimpleMathTests, OnePlusOneShouldEqualTwo) {
>
> UINTN A;
>
> UINTN B;
>
> UINTN C;
>
> @@ -34,11 +34,11 @@ TEST(SimpleMathTests, OnePlusOneShouldEqualTwo) {
> Sample unit test that verifies that a global BOOLEAN is updatable.
>
> **/
>
> class GlobalBooleanVarTests : public ::testing::Test {
>
> - public:
>
> - BOOLEAN SampleGlobalTestBoolean = FALSE;
>
> +public:
>
> + BOOLEAN SampleGlobalTestBoolean = FALSE;
>
> };
>
>
>
> -TEST_F(GlobalBooleanVarTests, GlobalBooleanShouldBeChangeable) {
>
> +TEST_F (GlobalBooleanVarTests, GlobalBooleanShouldBeChangeable) {
>
> SampleGlobalTestBoolean = TRUE;
>
> ASSERT_TRUE (SampleGlobalTestBoolean);
>
>
>
> @@ -51,37 +51,46 @@ TEST_F(GlobalBooleanVarTests, GlobalBooleanShouldBeChangeable) {
> pointer is updatable.
>
> **/
>
> class GlobalVarTests : public ::testing::Test {
>
> - public:
>
> - VOID *SampleGlobalTestPointer = NULL;
>
> +public:
>
> + VOID *SampleGlobalTestPointer = NULL;
>
>
>
> - protected:
>
> - void SetUp() override {
>
> +protected:
>
> + void
>
> + SetUp (
>
> + ) override
>
> + {
>
> ASSERT_EQ ((UINTN)SampleGlobalTestPointer, (UINTN)NULL);
>
> }
>
> - void TearDown() {
>
> +
>
> + void
>
> + TearDown (
>
> + )
>
> + {
>
> SampleGlobalTestPointer = NULL;
>
> }
>
> };
>
>
>
> -TEST_F(GlobalVarTests, GlobalPointerShouldBeChangeable) {
>
> +TEST_F (GlobalVarTests, GlobalPointerShouldBeChangeable) {
>
> SampleGlobalTestPointer = (VOID *)-1;
>
> ASSERT_EQ ((UINTN)SampleGlobalTestPointer, (UINTN)((VOID *)-1));
>
> }
>
>
>
> -
>
> /**
>
> Set PcdDebugPropertyMask for each MacroTestsAssertsEnabledDisabled test
>
> **/
>
> class MacroTestsAssertsEnabledDisabled : public testing::TestWithParam<UINT8> {
>
> - void SetUp() {
>
> - PatchPcdSet8 (PcdDebugPropertyMask, GetParam());
>
> + void
>
> + SetUp (
>
> + )
>
> + {
>
> + PatchPcdSet8 (PcdDebugPropertyMask, GetParam ());
>
> }
>
> };
>
>
>
> /**
>
> Sample unit test using the ASSERT_TRUE() macro.
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertTrue) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertTrue) {
>
> UINT64 Result;
>
>
>
> //
>
> @@ -99,7 +108,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertTrue) {
> /**
>
> Sample unit test using the ASSERT_FALSE() macro.
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertFalse) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertFalse) {
>
> UINT64 Result;
>
>
>
> //
>
> @@ -117,7 +126,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertFalse) {
> /**
>
> Sample unit test using the ASSERT_EQ() macro.
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertEqual) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertEqual) {
>
> UINT64 Result;
>
>
>
> //
>
> @@ -135,7 +144,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertEqual) {
> /**
>
> Sample unit test using the ASSERT_STREQ() macro.
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertMemEqual) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertMemEqual) {
>
> CHAR8 *String1;
>
> CHAR8 *String2;
>
>
>
> @@ -150,7 +159,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertMemEqual) {
> /**
>
> Sample unit test using the ASSERT_NE() macro.
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertNotEqual) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertNotEqual) {
>
> UINT64 Result;
>
>
>
> //
>
> @@ -169,7 +178,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertNotEqual) {
> Sample unit test using the ASSERT_TRUE() and ASSERT(FALSE)
>
> and EFI_EFFOR() macros to check status
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertNotEfiError) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertNotEfiError) {
>
> //
>
> // This test passes because the status is not an EFI error.
>
> //
>
> @@ -184,7 +193,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertNotEfiError) {
> /**
>
> Sample unit test using the ASSERT_EQ() macro to compare EFI_STATUS values.
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertStatusEqual) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertStatusEqual) {
>
> //
>
> // This test passes because the status value are always equal.
>
> //
>
> @@ -194,7 +203,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertStatusEqual) {
> /**
>
> Sample unit test using ASSERT_NE() macro to make sure a pointer is not NULL.
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertNotNull) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroAssertNotNull) {
>
> UINT64 Result;
>
>
>
> //
>
> @@ -206,7 +215,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroAssertNotNull) {
> /**
>
> Sample unit test using that should not generate any ASSERTs()
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroExpectNoAssertFailure) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroExpectNoAssertFailure) {
>
> //
>
> // This test passes because it never triggers an ASSERT().
>
> //
>
> @@ -222,7 +231,7 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroExpectNoAssertFailure) {
> /**
>
> Sample unit test using the ASSERT_DEATH() macro to test expected ASSERT()s.
>
> **/
>
> -TEST_P(MacroTestsAssertsEnabledDisabled, MacroExpectAssertFailure) {
>
> +TEST_P (MacroTestsAssertsEnabledDisabled, MacroExpectAssertFailure) {
>
> //
>
> // Skip tests that verify an ASSERT() is triggered if ASSERT()s are disabled.
>
> //
>
> @@ -243,21 +252,28 @@ TEST_P(MacroTestsAssertsEnabledDisabled, MacroExpectAssertFailure) {
> ASSERT_DEATH (DecimalToBcd8 (101), "");
>
> }
>
>
>
> -INSTANTIATE_TEST_SUITE_P(ValidInput,
>
> - MacroTestsAssertsEnabledDisabled,
>
> - ::testing::Values(PcdGet8 (PcdDebugPropertyMask) | BIT0, PcdGet8 (PcdDebugPropertyMask) & (~BIT0)));
>
> +INSTANTIATE_TEST_SUITE_P (
>
> + ValidInput,
>
> + MacroTestsAssertsEnabledDisabled,
>
> + ::testing::Values (PcdGet8 (PcdDebugPropertyMask) | BIT0, PcdGet8 (PcdDebugPropertyMask) & (~BIT0))
>
> + );
>
>
>
> /**
>
> Sample unit test using the SCOPED_TRACE() macro for trace messages.
>
> **/
>
> -TEST(MacroTestsMessages, MacroTraceMessage) {
>
> +TEST (MacroTestsMessages, MacroTraceMessage) {
>
> //
>
> // Example of logging.
>
> //
>
> SCOPED_TRACE ("SCOPED_TRACE message\n");
>
> }
>
>
>
> -int main(int argc, char* argv[]) {
>
> - testing::InitGoogleTest(&argc, argv);
>
> - return RUN_ALL_TESTS();
>
> +int
>
> +main (
>
> + int argc,
>
> + char *argv[]
>
> + )
>
> +{
>
> + testing::InitGoogleTest (&argc, argv);
>
> + return RUN_ALL_TESTS ();
>
> }
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107755): https://edk2.groups.io/g/devel/message/107755
Mute This Topic: https://groups.io/mt/100655294/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [edk2-devel] [PATCH v1 7/7] .pytool: Undo uncrustify check change
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 7/7] .pytool: Undo uncrustify check change VivianNK
@ 2023-08-15 1:28 ` Michael Kubacki
0 siblings, 0 replies; 15+ messages in thread
From: Michael Kubacki @ 2023-08-15 1:28 UTC (permalink / raw)
To: devel, vnowkakeane
This patch does not have any Cc lines like the others in the series.
On 8/9/2023 5:32 PM, VivianNK wrote:
> Set global audit only to False now that new rules have been applied to
> all necessary packages.
>
> Signed-off-by: Vivian Nowka-Keane <vnowkakeane@linux.microsoft.com>
> ---
> .pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
> index 17f77b48d954..ffc72f2c5918 100644
> --- a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
> +++ b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
> @@ -530,7 +530,7 @@ class UncrustifyCheck(ICiBuildPlugin):
> """
>
> Initializes options that influence test case output.
>
> """
>
> - self._audit_only_mode = True
>
> + self._audit_only_mode = False
>
> self._output_file_diffs = True
>
>
>
> if "AuditOnly" in self._package_config and self._package_config["AuditOnly"]:
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107756): https://edk2.groups.io/g/devel/message/107756
Mute This Topic: https://groups.io/mt/100655295/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [edk2-devel] [PATCH v1 0/7] Uncrustify GoogleTest update
2023-08-09 21:32 [edk2-devel] [PATCH v1 0/7] Uncrustify GoogleTest update VivianNK
` (6 preceding siblings ...)
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 7/7] .pytool: Undo uncrustify check change VivianNK
@ 2023-08-15 1:32 ` Michael Kubacki
7 siblings, 0 replies; 15+ messages in thread
From: Michael Kubacki @ 2023-08-15 1:32 UTC (permalink / raw)
To: devel, vnowkakeane
I don't see the package maintainers actually in Cc for these patches.
You might want to resend the series with them copied as their email
rules might otherwise not bring the emails to their attention.
Thanks,
Michael
On 8/9/2023 5:32 PM, VivianNK wrote:
> Introduce cpp-specific formatting rules to Uncrustify for readability:
> * indent_class: indent lines inside of a class
> * indent_extern: indent lines inside of an extern
>
> Apply all Uncrustify formatting rules defined in the config to existing
> cpp and header files (GoogleTest files).
>
> Moving forward all GoogleTest files will be included in uncrustify
> formatting checks, leading to more consistency and greater readability.
>
> VivianNK (7):
> .pytool: Set uncrustify check to audit only
> .pytool: Add cpp support to uncrustify plugin
> MdeModulePkg: Applyy uncrustify formatting to relevant files.
> MdePkg: Apply uncrustify formatting to relevant files
> SecurityPkg: Apply uncrustify formatting to relevant files
> UnitTestFrameworkPkg: Apply uncrustify formatting to relevant files
> .pytool: Undo uncrustify check change
>
> .pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py | 2 +-
> .pytool/Plugin/UncrustifyCheck/uncrustify.cfg | 4 +-
> MdeModulePkg/Library/UefiSortLib/GoogleTest/UefiSortLibGoogleTest.cpp | 37 +-
> MdeModulePkg/Test/Mock/Include/GoogleTest/Library/MockPciHostBridgeLib.h | 4 +-
> MdeModulePkg/Test/Mock/Library/GoogleTest/MockPciHostBridgeLib/MockPciHostBridgeLib.cpp | 8 +-
> MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/SafeIntLibUintnIntnUnitTests32.cpp | 114 ++--
> MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/SafeIntLibUintnIntnUnitTests64.cpp | 114 ++--
> MdePkg/Test/GoogleTest/Library/BaseSafeIntLib/TestBaseSafeIntLib.cpp | 563 ++++++++++----------
> MdePkg/Test/Mock/Include/GoogleTest/Library/MockHobLib.h | 6 +-
> MdePkg/Test/Mock/Include/GoogleTest/Library/MockPeiServicesLib.h | 6 +-
> MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiLib.h | 4 +-
> MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiRuntimeServicesTableLib.h | 4 +-
> MdePkg/Test/Mock/Library/GoogleTest/MockHobLib/MockHobLib.cpp | 40 +-
> MdePkg/Test/Mock/Library/GoogleTest/MockPeiServicesLib/MockPeiServicesLib.cpp | 52 +-
> MdePkg/Test/Mock/Library/GoogleTest/MockUefiLib/MockUefiLib.cpp | 6 +-
> MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.cpp | 12 +-
> SecurityPkg/Library/SecureBootVariableLib/GoogleTest/SecureBootVariableLibGoogleTest.cpp | 205 ++++---
> SecurityPkg/Test/Mock/Include/GoogleTest/Library/MockPlatformPKProtectionLib.h | 4 +-
> SecurityPkg/Test/Mock/Library/GoogleTest/MockPlatformPKProtectionLib/MockPlatformPKProtectionLib.cpp | 4 +-
> UnitTestFrameworkPkg/Include/Library/GoogleTestLib.h | 2 +-
> UnitTestFrameworkPkg/Test/GoogleTest/Sample/SampleGoogleTest/SampleGoogleTest.cpp | 76 +--
> 21 files changed, 664 insertions(+), 603 deletions(-)
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107758): https://edk2.groups.io/g/devel/message/107758
Mute This Topic: https://groups.io/mt/100655288/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2023-08-15 1:32 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-09 21:32 [edk2-devel] [PATCH v1 0/7] Uncrustify GoogleTest update VivianNK
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 1/7] .pytool: Set uncrustify check to audit only VivianNK
2023-08-15 1:06 ` Michael Kubacki
[not found] ` <177B69072E52D32F.12117@groups.io>
2023-08-15 1:22 ` Michael Kubacki
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 2/7] .pytool: Add cpp support to uncrustify plugin VivianNK
2023-08-15 1:22 ` Michael Kubacki
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 3/7] MdeModulePkg: Applyy uncrustify formatting to relevant files VivianNK
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 4/7] MdePkg: Apply " VivianNK
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 5/7] SecurityPkg: " VivianNK
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 6/7] UnitTestFrameworkPkg: " VivianNK
2023-08-10 19:25 ` Michael D Kinney
2023-08-15 1:22 ` Michael Kubacki
2023-08-09 21:32 ` [edk2-devel] [PATCH v1 7/7] .pytool: Undo uncrustify check change VivianNK
2023-08-15 1:28 ` Michael Kubacki
2023-08-15 1:32 ` [edk2-devel] [PATCH v1 0/7] Uncrustify GoogleTest update Michael Kubacki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox