dbUnitTest: rename

src/ioc/db/dbUnitTest.c

@@ -42,12 +42,12 @@ void testdbReadDatabase(const char* file,
                   file, path, substitutions);
 }
 
-int testiocInit(void)
+int testIocInitOk(void)
 {
-    return iocBuildNoCA() || iocRun();
+    return iocBuildIsolated() || iocRun();
 }
 
-int testiocShutdown(void)
+int testIocShutdownOk(void)
 {
     return iocShutdown();
 }
@@ -66,7 +66,7 @@ long testdbPutField(const char* pv, short dbrType, ...)
     long ret;
     va_list ap;
     va_start(ap, dbrType);
-    ret = testVdbPutField(pv, dbrType, ap);
+    ret = testdbVPutField(pv, dbrType, ap);
     va_end(ap);
     return ret;
 }
@@ -76,7 +76,7 @@ union anybuf {
     char bytes[sizeof(epicsAny)];
 };
 
-long testVdbPutField(const char* pv, short dbrType, va_list ap)
+long testdbVPutField(const char* pv, short dbrType, va_list ap)
 {
     DBADDR addr;
     union anybuf pod;
@@ -112,12 +112,12 @@ long testVdbPutField(const char* pv, short dbrType, va_list ap)
     return dbPutField(&addr, dbrType, pod.bytes, 1);
 }
 
-dbCommon* testGetRecord(const char* pv)
+dbCommon* testdbRecordPtr(const char* pv)
 {
     DBADDR addr;
 
     if(dbNameToAddr(pv, &addr))
-        testAbort("Missing PV %s", pv);
+        testAbort("Missing record %s", pv);
 
     return addr.precord;
 }

src/ioc/db/dbUnitTest.h

@@ -29,13 +29,13 @@ epicsShareFunc void testdbPrepare(void);
 epicsShareFunc void testdbReadDatabase(const char* file,
                                        const char* path,
                                        const char* substitutions);
-epicsShareFunc int testiocInit(void);
-epicsShareFunc int testiocShutdown(void);
+epicsShareFunc int testIocInitOk(void);
+epicsShareFunc int testIocShutdownOk(void);
 epicsShareFunc void testdbCleanup(void);
 
 /* Scalar only version.
  *
- * Remember to use the correct argument type!s
+ * Remember to use the correct argument types!
  *
  * int for DBR_UCHAR, DBR_CHAR, DBR_USHORT, DBR_SHORT, DBR_LONG
  * unsigned int for DBR_ULONG
@@ -43,9 +43,9 @@ epicsShareFunc void testdbCleanup(void);
  * const char* for DBR_STRING
  */
 epicsShareFunc long testdbPutField(const char* pv, short dbrType, ...);
-epicsShareFunc long testVdbPutField(const char* pv, short dbrType, va_list ap);
+epicsShareFunc long testdbVPutField(const char* pv, short dbrType, va_list ap);
 
-epicsShareFunc dbCommon* testGetRecord(const char* pv);
+epicsShareFunc dbCommon* testdbRecordPtr(const char* pv);
 
 #ifdef __cplusplus
 }

src/ioc/db/test/dbShutdownTest.c

@@ -72,12 +72,12 @@ void cycle(void) {
 
     testdbReadDatabase("xRecord.db", NULL, NULL);
 
-    testOk1(!testiocInit());
+    testOk1(!testIocInitOk());
 
     epicsThreadMap(findCommonThread);
     checkCommonThreads();
 
-    testOk1(testiocShutdown()==0);
+    testOk1(testIocShutdownOk()==0);
 
     testdbCleanup();
 }

src/ioc/misc/iocInit.c

@@ -185,7 +185,7 @@ int iocBuild(void)
     return status;
 }
 
-int iocBuildNoCA(void)
+int iocBuildIsolated(void)
 {
     int status;
 

src/ioc/misc/iocInit.h

@@ -19,7 +19,7 @@ extern "C" {
 
 epicsShareFunc int iocInit(void);
 epicsShareFunc int iocBuild(void);
-epicsShareFunc int iocBuildNoCA(void);
+epicsShareFunc int iocBuildIsolated(void);
 epicsShareFunc int iocRun(void);
 epicsShareFunc int iocPause(void);
 epicsShareFunc int iocShutdown(void);