- added function to init both (globals and expected)

- cleaning debug output
This commit is contained in:
2017-03-11 12:41:39 +00:00
parent 0a1f9a39cf
commit 4a4abfa46f
2 changed files with 26 additions and 8 deletions

View File

@@ -60,7 +60,7 @@ STATIC int8_t createStubExpected(char *aNoSuffix, FILE *aFile, FILE *aHeader, cf
}
fprintf(aHeader, "void "STUBFUNCTION_INITEXPECTED_S1"();"NEWLINES NEWLINES, aNoSuffix);
fprintf(aFile, NEWLINES"void "STUBFUNCTION_INITEXPECTED_S1"()"NEWLINES"{"NEWLINES, aNoSuffix);
fprintf(aFile, "void "STUBFUNCTION_INITEXPECTED_S1"()"NEWLINES"{"NEWLINES, aNoSuffix);
work = aList->head;
while (work)
@@ -75,7 +75,7 @@ STATIC int8_t createStubExpected(char *aNoSuffix, FILE *aFile, FILE *aHeader, cf
work = work->next;
}
fprintf(aFile, "}"NEWLINES);
fprintf(aFile, "}"NEWLINES NEWLINES);
return 0;
}
@@ -88,7 +88,20 @@ STATIC int8_t createStubGlobals(char *aNoSuffix, FILE *aFile, FILE *aHeader, cfi
return -1;
}
fprintf(aFile, NEWLINES"void "STUBFUNCTION_INITGLOBALS_S1"()"NEWLINES"{"NEWLINES, aNoSuffix);
work = aList->head;
while (work)
{
if (CVARIABLE_TYPE_REGULAR != work->type)
{
work = work->next;
continue;
}
fprintf(aFile, "%s %s;"NEWLINES, work->dataType, work->name);
fprintf(aHeader, "extern %s %s;"NEWLINES, work->dataType, work->name);
work = work->next;
}
fprintf(aFile, "void "STUBFUNCTION_INITGLOBALS_S1"()"NEWLINES"{"NEWLINES, aNoSuffix);
work = aList->head;
while (work)
@@ -100,13 +113,17 @@ STATIC int8_t createStubGlobals(char *aNoSuffix, FILE *aFile, FILE *aHeader, cfi
}
// TODO type specific initialization
fprintf(aFile, "\t%s = 0x55;"NEWLINES, work->name);
fprintf(aHeader, "extern %s %s;"NEWLINES, work->dataType, work->name);
work = work->next;
}
fprintf(aFile, "}"NEWLINES);
fprintf(aHeader, "void "STUBFUNCTION_INITGLOBALS_S1"();"NEWLINES NEWLINES, aNoSuffix);
fprintf(aHeader, "void "STUBFUNCTION_INITGLOBALS_S1"();"NEWLINES, aNoSuffix);
fprintf(aHeader, "void "STUBFUNCTION_INIT_S1"();"NEWLINES NEWLINES, aNoSuffix);
fprintf(aFile, NEWLINES"void "STUBFUNCTION_INIT_S1"()"NEWLINES"{"NEWLINES, aNoSuffix);
fprintf(aFile, "\t"STUBFUNCTION_INITEXPECTED_S1"();"NEWLINES, aNoSuffix);
fprintf(aFile, "\t"STUBFUNCTION_INITGLOBALS_S1"();"NEWLINES, aNoSuffix);
fprintf(aFile, "}"NEWLINES NEWLINES);
return 0;
}
@@ -119,7 +136,7 @@ STATIC int8_t createStubCheck(char *aNoSuffix, FILE *aFile, FILE *aHeader, cfile
}
fprintf(aHeader, "void "STUBFUNCTION_CHECK_S1"();"NEWLINES NEWLINES, aNoSuffix);
fprintf(aFile, NEWLINES"void "STUBFUNCTION_CHECK_S1"()"NEWLINES"{"NEWLINES, aNoSuffix);
fprintf(aFile, "void "STUBFUNCTION_CHECK_S1"()"NEWLINES"{"NEWLINES, aNoSuffix);
work = aList->head;
while (work)

View File

@@ -38,8 +38,9 @@
#define STUBINIT_PARAM_PARAMETER_S1 "aParameter_%c" // aParameter_a
#define STUBINIT_PARAM_RETURN_S "aReturnValue"
#define STUBFUNCTION_INITEXPECTED_S1 "stub_%s_initExpected" // stub_testfunction_checkGlobals
#define STUBFUNCTION_INITGLOBALS_S1 "stub_%s_initGlobals" // stub_testfunction_checkGlobals
#define STUBFUNCTION_INITEXPECTED_S1 "stub_%s_initExpected" // stub_testfunction_initExpected
#define STUBFUNCTION_INITGLOBALS_S1 "stub_%s_initGlobals" // stub_testfunction_initGlobals
#define STUBFUNCTION_INIT_S1 "stub_%s_init" // stub_testfunction_init
#define STUBFUNCTION_CHECK_S1 "stub_%s_checkGlobals" // stub_testfunction_checkGlobals
#define STUBVARIABLE_EXTENDED_S1 "%s_expected" // variable_expected