EPICS_base/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Unit tests for dbServerStats()

Browse Source
This commit is contained in:
Andrew Johnson
2025-02-03 12:54:26 -06:00
parent bcc6cb96ae
commit fd86f0ff04
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/database/src/ioc/db/dbServer.c
View File

@ -131,7 +131,7 @@ int dbServerStats(const char *name, unsigned *channels, unsigned *clients)
{ {
dbServer *psrv = (dbServer *)ellFirst(&serverList); dbServer *psrv = (dbServer *)ellFirst(&serverList);
if (state != running || !psrv) if (!name || state != running || !psrv)
return -1; return -1;
while (psrv) { while (psrv) {

12
modules/database/test/ioc/db/dbServerTest.c
View File

@ -40,6 +40,8 @@ void oneReport(unsigned level)
void oneStats(unsigned *channels, unsigned *clients) void oneStats(unsigned *channels, unsigned *clients)
{ {
oneState = STATS_CALLED; oneState = STATS_CALLED;
*channels = 2;
*clients = 1;
} }
int oneClient(char *pbuf, size_t len) int oneClient(char *pbuf, size_t len)
@ -128,8 +130,9 @@ MAIN(dbServerTest)
char name[16]; char name[16];
char *theName = "The One"; char *theName = "The One";
int status; int status;
unsigned ch=0, cl=0;
testPlan(25); testPlan(29);
/* Prove that we handle substring names properly */ /* Prove that we handle substring names properly */
epicsEnvSet("EPICS_IOC_IGNORE_SERVERS", "none ones"); epicsEnvSet("EPICS_IOC_IGNORE_SERVERS", "none ones");
@ -163,7 +166,12 @@ MAIN(dbServerTest)
testDiag("Checking server methods called"); testDiag("Checking server methods called");
dbsr(0); dbsr(0);
testOk(oneState == REPORT_CALLED, "dbsr called report()"); testOk(oneState == REPORT_CALLED, "dbsr called one::report()");
testOk(dbServerStats("none", &ch, &cl) != 0, "Stats: unknown name rejected");
testOk(dbServerStats("no-routines", &ch, &cl) != 0, "Stats: no-routine rejected");
testOk(dbServerStats("one", &ch, &cl) == 0 && oneState == STATS_CALLED,
"dbServerStats('one') called one::stats()");
testOk(ch == 2 && cl == 1, "Stats: counts returned as expected");
oneSim = NULL; oneSim = NULL;
name[0] = 0; name[0] = 0;