Improve format on shared data module.

This commit is contained in:
fancy 2023-11-10 16:03:23 -08:00
parent 893319acb6
commit 9fe9bba31a
3 changed files with 332 additions and 356 deletions

View File

@ -4,7 +4,7 @@ Language: Cpp
AccessModifierOffset: -4
AlignAfterOpenBracket: Align
AlignConsecutiveMacros: false
AlignConsecutiveAssignments: true
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignEscapedNewlines: Right
AlignOperands: true
@ -30,7 +30,7 @@ BraceWrapping:
AfterControlStatement: false
AfterEnum: true
AfterFunction: true
AfterNamespace: false
AfterNamespace: true
AfterObjCDeclaration: true
AfterStruct: true
AfterUnion: false

View File

@ -45,10 +45,19 @@ add_custom_target(
-p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell
WORKING_DIRECTORY ${TEST_SOURCE_PATH}/utils/SharedData
)
file(GLOB_RECURSE HEADER_FILES *.h)
add_custom_target(
SharedDataTest_code_format
COMMAND ${CLANG_FORMAT_EXE}
-style=file
-i ${SRC_FILES} ${HEADER_FILES}
WORKING_DIRECTORY ${TEST_SOURCE_PATH}/utils/SharedData
)
add_custom_command(
TARGET ${TARGET_NAME}
PRE_BUILD
COMMAND make SharedDataTest_code_check
COMMAND make SharedDataTest_code_format
WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/
)
endif()

View File

@ -26,22 +26,19 @@ namespace SharedDataTest
constexpr int PROJECT_ID = 9;
SharedData *sharedDataPrimary = CreateSharedData(SHARER_NAME_PRIMARY, "./shared_file", PROJECT_ID);
SharedData *sharedDataMinor = CreateSharedData(SHARER_NAME_MINOR, "./shared_file", PROJECT_ID);
if (nullptr != sharedDataMinor)
{
if (nullptr != sharedDataMinor) {
int writableData = 99;
sharedDataMinor->mMakeSharedData(sharedDataMinor, sizeof(int), sizeof(int));
sharedDataMinor->mSetWritableData(sharedDataMinor, &writableData, sizeof(int));
}
if (nullptr != sharedDataPrimary)
{
if (nullptr != sharedDataPrimary) {
int readableData = -1;
sharedDataPrimary->mMakeSharedData(sharedDataPrimary, sizeof(int), sizeof(int));
sharedDataPrimary->mGetReadableData(sharedDataPrimary, &readableData, sizeof(int));
LogInfo("readableData = %d\n", readableData);
sharedDataPrimary->mFree(sharedDataPrimary);
}
if (nullptr != sharedDataMinor)
{
if (nullptr != sharedDataMinor) {
sharedDataMinor->mFree(sharedDataMinor);
}
ILogUnInit();
@ -55,13 +52,11 @@ namespace SharedDataTest
constexpr int PROJECT_ID = 9;
SharedData *sharedDataPrimary = CreateSharedData(SHARER_NAME_PRIMARY, "./shared_file", PROJECT_ID);
SharedData *sharedDataMinor = CreateSharedData(SHARER_NAME_MINOR, "./shared_file", PROJECT_ID);
if (nullptr != sharedDataMinor)
{
if (nullptr != sharedDataMinor) {
IMakeSharedData(sharedDataMinor, sizeof(int), sizeof(int));
ISetWritableData(sharedDataMinor, (void *)&WRITABLE_DATA, sizeof(int));
}
if (nullptr != sharedDataPrimary)
{
if (nullptr != sharedDataPrimary) {
int readableData = 0;
IMakeSharedData(sharedDataPrimary, sizeof(int), sizeof(int));
StatusCode code = IGetReadableData(sharedDataPrimary, &readableData, sizeof(int));
@ -70,8 +65,7 @@ namespace SharedDataTest
EXPECT_EQ(readableData, WRITABLE_DATA);
IFree(sharedDataPrimary);
}
if (nullptr != sharedDataMinor)
{
if (nullptr != sharedDataMinor) {
IFree(sharedDataMinor);
}
ILogUnInit();
@ -84,15 +78,13 @@ namespace SharedDataTest
constexpr int PROJECT_ID = 9;
SharedData *sharedDataPrimary = CreateSharedData(SHARER_NAME_PRIMARY, "./shared_file", PROJECT_ID);
SharedData *sharedDataMinor = CreateSharedData(SHARER_NAME_MINOR, "./shared_file", PROJECT_ID);
if (nullptr != sharedDataMinor)
{
if (nullptr != sharedDataMinor) {
constexpr int WRITABLE_DATA_LENGTH = 9;
char writableData[WRITABLE_DATA_LENGTH] = {0};
IMakeSharedData(sharedDataMinor, sizeof(int), sizeof(writableData));
ISetWritableData(sharedDataMinor, writableData, sizeof(writableData));
}
if (nullptr != sharedDataPrimary)
{
if (nullptr != sharedDataPrimary) {
constexpr int DEFAULT_DATA = 0;
int readableData = DEFAULT_DATA;
IMakeSharedData(sharedDataPrimary, sizeof(int), sizeof(int));
@ -103,8 +95,7 @@ namespace SharedDataTest
EXPECT_EQ(readableData, DEFAULT_DATA);
IFree(sharedDataPrimary);
}
if (nullptr != sharedDataMinor)
{
if (nullptr != sharedDataMinor) {
IFree(sharedDataMinor);
}
ILogUnInit();
@ -118,13 +109,11 @@ namespace SharedDataTest
constexpr int PROJECT_ID = 9;
SharedData *sharedDataPrimary = CreateSharedData(SHARER_NAME_PRIMARY, "./shared_file", PROJECT_ID);
SharedData *sharedDataMinor = CreateSharedData(SHARER_NAME_MINOR, "./shared_file", PROJECT_ID);
if (nullptr != sharedDataMinor)
{
if (nullptr != sharedDataMinor) {
IMakeSharedData(sharedDataMinor, sizeof(int) * 2, sizeof(int));
ISetWritableData(sharedDataMinor, (void *)&WRITABLE_DATA, sizeof(int));
}
if (nullptr != sharedDataPrimary)
{
if (nullptr != sharedDataPrimary) {
constexpr int DEFAULT_DATA = 0;
int readableData = DEFAULT_DATA;
IMakeSharedData(sharedDataPrimary, sizeof(int), sizeof(int));
@ -135,8 +124,7 @@ namespace SharedDataTest
EXPECT_EQ(readableData, WRITABLE_DATA);
IFree(sharedDataPrimary);
}
if (nullptr != sharedDataMinor)
{
if (nullptr != sharedDataMinor) {
IFree(sharedDataMinor);
}
ILogUnInit();
@ -148,8 +136,7 @@ namespace SharedDataTest
ILogInit(LOG_INSTANCE_TYPE_END);
constexpr int PROJECT_ID = 9;
SharedData *sharedDataPrimary = CreateSharedData(SHARER_NAME_PRIMARY, "./shared_file", PROJECT_ID);
if (nullptr != sharedDataPrimary)
{
if (nullptr != sharedDataPrimary) {
constexpr int DEFAULT_DATA = 0;
int readableData = DEFAULT_DATA;
IMakeSharedData(sharedDataPrimary, sizeof(int), sizeof(int));
@ -170,8 +157,7 @@ namespace SharedDataTest
constexpr int PROJECT_ID = 9;
SharedData *sharedDataPrimary = CreateSharedData(SHARER_NAME_PRIMARY, "./shared_file", PROJECT_ID);
SharedData *sharedDataMinor = CreateSharedData(SHARER_NAME_MINOR, "./shared_file", PROJECT_ID);
if (nullptr != sharedDataPrimary)
{
if (nullptr != sharedDataPrimary) {
constexpr int DEFAULT_DATA = 0;
int readableData = DEFAULT_DATA;
IMakeSharedData(sharedDataPrimary, sizeof(int), sizeof(int));
@ -182,8 +168,7 @@ namespace SharedDataTest
EXPECT_EQ(readableData, DEFAULT_DATA);
IFree(sharedDataPrimary);
}
if (nullptr != sharedDataMinor)
{
if (nullptr != sharedDataMinor) {
IFree(sharedDataMinor);
}
ILogUnInit();
@ -197,13 +182,11 @@ namespace SharedDataTest
constexpr int PROJECT_ID = 9;
SharedData *sharedDataPrimary = CreateSharedData(SHARER_NAME_PRIMARY, "./shared_file", PROJECT_ID);
SharedData *sharedDataMinor = CreateSharedData(SHARER_NAME_MINOR, "./shared_file", PROJECT_ID);
if (nullptr != sharedDataPrimary)
{
if (nullptr != sharedDataPrimary) {
IMakeSharedData(sharedDataPrimary, sizeof(int), sizeof(int));
ISetWritableData(sharedDataPrimary, (void *)&WRITABLE_DATA, sizeof(int));
}
if (nullptr != sharedDataMinor)
{
if (nullptr != sharedDataMinor) {
constexpr int DEFAULT_DATA = 0;
int readableData = DEFAULT_DATA;
IMakeSharedData(sharedDataMinor, sizeof(int), sizeof(int));
@ -214,8 +197,7 @@ namespace SharedDataTest
EXPECT_EQ(readableData, WRITABLE_DATA);
IFree(sharedDataMinor);
}
if (nullptr != sharedDataPrimary)
{
if (nullptr != sharedDataPrimary) {
IFree(sharedDataPrimary);
}
ILogUnInit();
@ -229,13 +211,11 @@ namespace SharedDataTest
constexpr int PROJECT_ID = 9;
SharedData *sharedDataPrimary = CreateSharedData(SHARER_NAME_PRIMARY, "./shared_file", PROJECT_ID);
SharedData *sharedDataMinor = CreateSharedData(SHARER_NAME_MINOR, "./shared_file", PROJECT_ID);
if (nullptr != sharedDataPrimary)
{
if (nullptr != sharedDataPrimary) {
IMakeSharedData(sharedDataPrimary, sizeof(int) * 2, sizeof(int));
ISetWritableData(sharedDataPrimary, (void *)&WRITABLE_DATA, sizeof(int));
}
if (nullptr != sharedDataMinor)
{
if (nullptr != sharedDataMinor) {
constexpr int DEFAULT_DATA = 0;
int readableData = DEFAULT_DATA;
IMakeSharedData(sharedDataMinor, sizeof(int), sizeof(int));
@ -246,8 +226,7 @@ namespace SharedDataTest
EXPECT_EQ(readableData, DEFAULT_DATA);
IFree(sharedDataMinor);
}
if (nullptr != sharedDataPrimary)
{
if (nullptr != sharedDataPrimary) {
IFree(sharedDataPrimary);
}
ILogUnInit();
@ -260,14 +239,12 @@ namespace SharedDataTest
constexpr int PROJECT_ID = 9;
SharedData *sharedDataPrimary = CreateSharedData(SHARER_NAME_PRIMARY, "./shared_file", PROJECT_ID);
SharedData *sharedDataMinor = CreateSharedData(SHARER_NAME_MINOR, "./shared_file", PROJECT_ID);
if (nullptr != sharedDataPrimary)
{
if (nullptr != sharedDataPrimary) {
int writableData[2] = {0};
IMakeSharedData(sharedDataPrimary, sizeof(int), sizeof(int) * 2);
ISetWritableData(sharedDataPrimary, &writableData, sizeof(writableData));
}
if (nullptr != sharedDataMinor)
{
if (nullptr != sharedDataMinor) {
constexpr int DEFAULT_DATA = 0;
int readableData = DEFAULT_DATA;
IMakeSharedData(sharedDataMinor, sizeof(int), sizeof(int));
@ -278,8 +255,7 @@ namespace SharedDataTest
EXPECT_EQ(readableData, DEFAULT_DATA);
IFree(sharedDataMinor);
}
if (nullptr != sharedDataPrimary)
{
if (nullptr != sharedDataPrimary) {
IFree(sharedDataPrimary);
}
ILogUnInit();
@ -293,13 +269,11 @@ namespace SharedDataTest
constexpr int PROJECT_ID = 9;
SharedData *sharedDataPrimary = CreateSharedData(SHARER_NAME_PRIMARY, "./shared_file", PROJECT_ID);
SharedData *sharedDataMinor = CreateSharedData(SHARER_NAME_MINOR, "./shared_file", PROJECT_ID);
if (nullptr != sharedDataPrimary)
{
if (nullptr != sharedDataPrimary) {
IMakeSharedData(sharedDataPrimary, sizeof(int), sizeof(int));
ISetWritableData(sharedDataPrimary, (void *)&WRITABLE_DATA, sizeof(int));
}
if (nullptr != sharedDataMinor)
{
if (nullptr != sharedDataMinor) {
constexpr int DEFAULT_DATA = 0;
int readableData = DEFAULT_DATA;
IMakeSharedData(sharedDataMinor, sizeof(int), sizeof(int) * 2);
@ -310,8 +284,7 @@ namespace SharedDataTest
EXPECT_EQ(readableData, DEFAULT_DATA);
IFree(sharedDataMinor);
}
if (nullptr != sharedDataPrimary)
{
if (nullptr != sharedDataPrimary) {
IFree(sharedDataPrimary);
}
ILogUnInit();
@ -325,13 +298,11 @@ namespace SharedDataTest
constexpr int PROJECT_ID = 9;
SharedData *sharedDataPrimary = CreateSharedData(SHARER_NAME_PRIMARY, "./shared_file", PROJECT_ID);
SharedData *sharedDataMinor = CreateSharedData(SHARER_NAME_MINOR, "./shared_file", PROJECT_ID);
if (nullptr != sharedDataPrimary)
{
if (nullptr != sharedDataPrimary) {
IMakeSharedData(sharedDataPrimary, sizeof(int), sizeof(int));
ISetWritableData(sharedDataPrimary, (void *)&WRITABLE_DATA, sizeof(int));
}
if (nullptr != sharedDataMinor)
{
if (nullptr != sharedDataMinor) {
int readableData[2] = {0};
IMakeSharedData(sharedDataMinor, sizeof(int) * 2, sizeof(int));
StatusCode code = IGetReadableData(sharedDataMinor, readableData, sizeof(readableData));
@ -340,8 +311,7 @@ namespace SharedDataTest
EXPECT_NE(code.mStatusCode, STATUS_CODE_OK);
IFree(sharedDataMinor);
}
if (nullptr != sharedDataPrimary)
{
if (nullptr != sharedDataPrimary) {
IFree(sharedDataPrimary);
}
ILogUnInit();
@ -356,13 +326,11 @@ namespace SharedDataTest
SharedData *sharedDataPrimary = CreateSharedData(SHARER_NAME_PRIMARY, "./shared_file", PROJECT_ID);
SharedData *sharedDataMinor = CreateSharedData(SHARER_NAME_MINOR, "./shared_file", PROJECT_ID);
IMakeSharedData(sharedDataMinor, sizeof(int), sizeof(int));
if (nullptr != sharedDataPrimary)
{
if (nullptr != sharedDataPrimary) {
IMakeSharedData(sharedDataPrimary, sizeof(int), sizeof(int));
ISetWritableData(sharedDataPrimary, (void *)&WRITABLE_DATA, sizeof(int));
}
if (nullptr != sharedDataMinor)
{
if (nullptr != sharedDataMinor) {
int readableData = 0;
StatusCode code = IGetReadableData(sharedDataMinor, &readableData, sizeof(int));
PrintStringCode(code);
@ -371,8 +339,7 @@ namespace SharedDataTest
EXPECT_EQ(readableData, 189);
IFree(sharedDataMinor);
}
if (nullptr != sharedDataPrimary)
{
if (nullptr != sharedDataPrimary) {
IFree(sharedDataPrimary);
}
ILogUnInit();