vbox的更動 39542 路徑 trunk/src/VBox/HostServices/SharedFolders

時間撮記:

2011-12-6 下午04:48:23 (13 年 以前)

作者:

vboxsync

訊息:

HostServices/SharedFolders: starter unit test, try to make Windows happy.

位置:

trunk/src/VBox/HostServices/SharedFolders

檔案:

• mappings.cpp (修改) (2 筆差異)
• testcase/tstSharedFolderService.cpp (修改) (23 筆差異)
• teststubs.h (修改) (1 筆差異)
• vbsf.cpp (修改) (2 筆差異)

trunk/src/VBox/HostServices/SharedFolders/mappings.cpp

@@ -16 +16 @@
 
 #ifdef UNITTEST
-# include "teststubs.h"
 # include "testcase/tstSharedFolderService.h"
 #endif
@@ -24 +23 @@
 #include <iprt/assert.h>
 #include <iprt/string.h>
+
+#ifdef UNITTEST
+# include "teststubs.h"
+#endif
 
 /* Shared folders order in the saved state and in the FolderMapping can differ.

trunk/src/VBox/HostServices/SharedFolders/testcase/tstSharedFolderService.cpp

@@ -27 +27 @@
 ******************************************************************************/
 
-#include "teststubs.h"
 #include "tstSharedFolderService.h"
 #include "vbsf.h"
@@ -39 +38 @@
 #include <iprt/test.h>
 
+#include "teststubs.h"
 
 /******************************************************************************
@@ -115 +115 @@
 static PRTDIR testRTDirClosepDir;
 
-RTDECL(int) testRTDirClose(PRTDIR pDir)
+extern int testRTDirClose(PRTDIR pDir)
 {
  /* RTPrintf("%s: pDir=%p\n", __func__, pDir); */
@@ -125 +125 @@
 static RTFMODE testRTDirCreateMode;
 
-RTDECL(int) testRTDirCreate(const char *pszPath, RTFMODE fMode)
+extern int testRTDirCreate(const char *pszPath, RTFMODE fMode)
 {
  /* RTPrintf("%s: pszPath=%s, fMode=0x%llx\n", __func__, pszPath,
@@ -136 +136 @@
 static PRTDIR testRTDirOpenpDir;
 
-RTDECL(int) testRTDirOpen(PRTDIR *ppDir, const char *pszPath)
+extern int testRTDirOpen(PRTDIR *ppDir, const char *pszPath)
 {
  /* RTPrintf("%s: pszPath=%s\n", __func__, pszPath); */
@@ -148 +148 @@
 static RTTIMESPEC testRTDirQueryInfoATime;
 
-RTDECL(int) testRTDirQueryInfo(PRTDIR pDir, PRTFSOBJINFO pObjInfo,
+extern int testRTDirQueryInfo(PRTDIR pDir, PRTFSOBJINFO pObjInfo,
                                RTFSOBJATTRADD enmAdditionalAttribs)
 {
@@ -160 +160 @@
 }
 
-RTDECL(int) testRTDirRemove(const char *pszPath) { RTPrintf("%s\n", __func__); return 0; }
+extern int testRTDirRemove(const char *pszPath) { RTPrintf("%s\n", __func__); return 0; }
 
 static PRTDIR testRTDirReadExDir;
 
-RTDECL(int) testRTDirReadEx(PRTDIR pDir, PRTDIRENTRYEX pDirEntry,
+extern int testRTDirReadEx(PRTDIR pDir, PRTDIRENTRYEX pDirEntry,
                             size_t *pcbDirEntry,
                             RTFSOBJATTRADD enmAdditionalAttribs,
@@ -199 +199 @@
 static RTFILE testRTFileCloseFile;
 
-RTDECL(int)  testRTFileClose(RTFILE File)
+extern int  testRTFileClose(RTFILE File)
 {
  /* RTPrintf("%s: File=%p\n", __func__, File); */
@@ -206 +206 @@
 }
 
-RTDECL(int)  testRTFileDelete(const char *pszFilename) { RTPrintf("%s\n", __func__); return 0; }
+extern int  testRTFileDelete(const char *pszFilename) { RTPrintf("%s\n", __func__); return 0; }
 
 static RTFILE testRTFileFlushFile;
 
-RTDECL(int)  testRTFileFlush(RTFILE File)
+extern int  testRTFileFlush(RTFILE File)
 {
  /* RTPrintf("%s: File=%p\n", __func__, File); */
@@ -222 +222 @@
 static uint64_t testRTFileLockSize;
 
-RTDECL(int)  testRTFileLock(RTFILE hFile, unsigned fLock, int64_t offLock,
+extern int  testRTFileLock(RTFILE hFile, unsigned fLock, int64_t offLock,
                             uint64_t cbLock)
 {
@@ -238 +238 @@
 static RTFILE testRTFileOpenpFile;
 
-RTDECL(int)  testRTFileOpen(PRTFILE pFile, const char *pszFilename,
+extern int  testRTFileOpen(PRTFILE pFile, const char *pszFilename,
                             uint64_t fOpen)
 {
@@ -254 +254 @@
 static uint32_t testRTFileQueryInfoFMode;
 
-RTDECL(int)  testRTFileQueryInfo(RTFILE hFile, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAdditionalAttribs)
+extern int  testRTFileQueryInfo(RTFILE hFile, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAdditionalAttribs)
 {
  /* RTPrintf("%s, hFile=%p, enmAdditionalAttribs=0x%llx\n", __func__,
@@ -269 +269 @@
 static const char *testRTFileReadData;
 
-RTDECL(int)  testRTFileRead(RTFILE File, void *pvBuf, size_t cbToRead,
+extern int  testRTFileRead(RTFILE File, void *pvBuf, size_t cbToRead,
                             size_t *pcbRead)
 {
@@ -281 +281 @@
 }
 
-RTDECL(int) testRTFileSeek(RTFILE hFile, int64_t offSeek, unsigned uMethod,
+extern int testRTFileSeek(RTFILE hFile, int64_t offSeek, unsigned uMethod,
                            uint64_t *poffActual)
 {
@@ -293 +293 @@
 static uint64_t testRTFileSetFMode;
 
-RTDECL(int) testRTFileSetMode(RTFILE File, RTFMODE fMode)
+extern int testRTFileSetMode(RTFILE File, RTFMODE fMode)
 {
  /* RTPrintf("%s: fMode=%llu\n", __func__, LLUIFY(fMode)); */
@@ -303 +303 @@
 static RTFOFF testRTFileSetSizeSize;
 
-RTDECL(int)  testRTFileSetSize(RTFILE File, uint64_t cbSize)
+extern int  testRTFileSetSize(RTFILE File, uint64_t cbSize)
 {
  /* RTPrintf("%s: File=%llu, cbSize=%llu\n", __func__, LLUIFY(File),
@@ -314 +314 @@
 static RTTIMESPEC testRTFileSetTimesATime;
 
-RTDECL(int) testRTFileSetTimes(RTFILE File, PCRTTIMESPEC pAccessTime,
+extern int testRTFileSetTimes(RTFILE File, PCRTTIMESPEC pAccessTime,
                                PCRTTIMESPEC pModificationTime,
                                PCRTTIMESPEC pChangeTime,
@@ -337 +337 @@
 static uint64_t testRTFileUnlockSize;
 
-RTDECL(int)  testRTFileUnlock(RTFILE File, int64_t offLock, uint64_t cbLock)
+extern int  testRTFileUnlock(RTFILE File, int64_t offLock, uint64_t cbLock)
 {
  /* RTPrintf("%s: hFile=%p, ofLock=%lli, cbLock=%llu\n", __func__,
@@ -349 +349 @@
 static char testRTFileWriteData[256];
 
-RTDECL(int)  testRTFileWrite(RTFILE File, const void *pvBuf, size_t cbToWrite,
+extern int  testRTFileWrite(RTFILE File, const void *pvBuf, size_t cbToWrite,
                              size_t *pcbWritten)
 {
@@ -388 +388 @@
 }
 
-RTDECL(int) testRTSymlinkDelete(const char *pszSymlink) { RTPrintf("%s\n", __func__); return 0; }
-RTDECL(int) testRTSymlinkRead(const char *pszSymlink, char *pszTarget,
+extern int testRTSymlinkDelete(const char *pszSymlink) { RTPrintf("%s\n", __func__); return 0; }
+extern int testRTSymlinkRead(const char *pszSymlink, char *pszTarget,
                               size_t cbTarget) { RTPrintf("%s\n", __func__); return 0; }
 
@@ -476 +476 @@
     AssertRelease(  strlen(pcszSource) * 2 + 2 < sizeof(*pDest)
                   - RT_UOFFSETOF(SHFLSTRING, String));
-    pDest->string.u16Size = strlen(pcszSource) * 2 + 2;
-    pDest->string.u16Length = strlen(pcszSource);
+    pDest->string.u16Size = (uint16_t)strlen(pcszSource) * 2 + 2;
+    pDest->string.u16Length = (uint16_t)strlen(pcszSource);
     for (i = 0; i < strlen(pcszSource) + 1; ++i)
         pDest->string.String.ucs2[i] = (uint16_t)pcszSource[i];
@@ -778 +778 @@
     testRTFileReadData = pcszReadData;
     rc = readFile(&svcTable, Root, Handle, 0, strlen(pcszReadData) + 1,
-                  &cbRead, acBuf, sizeof(acBuf));
+                  &cbRead, acBuf, (uint32_t)sizeof(acBuf));
     RTTEST_CHECK_RC_OK(hTest, rc);
     RTTEST_CHECK_MSG(hTest,
@@ -800 +800 @@
     SHFLHANDLE Handle;
     const char *pcszWrittenData = "Data to write";
-    uint32_t cbToWrite = strlen(pcszWrittenData) + 1;
+    uint32_t cbToWrite = (uint32_t)strlen(pcszWrittenData) + 1;
     uint32_t cbWritten;
     int rc;

trunk/src/VBox/HostServices/SharedFolders/teststubs.h

@@ -24 +24 @@
 #define __VBSF_TEST_STUBS__H
 
+#include <iprt/dir.h>
+#include <iprt/time.h>
+
 #define RTDirClose           testRTDirClose
+extern int testRTDirClose(PRTDIR pDir);
 #define RTDirCreate          testRTDirCreate
+extern int testRTDirCreate(const char *pszPath, RTFMODE fMode);
 #define RTDirOpen            testRTDirOpen
+extern int testRTDirOpen(PRTDIR *ppDir, const char *pszPath);
 #define RTDirQueryInfo       testRTDirQueryInfo
+extern int testRTDirQueryInfo(PRTDIR pDir, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAdditionalAttribs);
 #define RTDirRemove          testRTDirRemove
+extern int testRTDirRemove(const char *pszPath);
 #define RTDirReadEx          testRTDirReadEx
+extern int testRTDirReadEx(PRTDIR pDir, PRTDIRENTRYEX pDirEntry, size_t *pcbDirEntry, RTFSOBJATTRADD enmAdditionalAttribs, uint32_t fFlags);
 #define RTDirSetTimes        testRTDirSetTimes
+extern int testRTDirSetTimes(PRTDIR pDir, PCRTTIMESPEC pAccessTime, PCRTTIMESPEC pModificationTime, PCRTTIMESPEC pChangeTime, PCRTTIMESPEC pBirthTime);
 #define RTFileClose          testRTFileClose
+extern int testRTFileClose(RTFILE hFile);
 #define RTFileDelete         testRTFileDelete
+extern int testRTFileDelete(const char *pszFilename);
 #define RTFileFlush          testRTFileFlush
+extern int testRTFileFlush(RTFILE hFile);
 #define RTFileLock           testRTFileLock
+extern int testRTFileLock(RTFILE hFile, unsigned fLock, int64_t offLock, uint64_t cbLock);
 #define RTFileOpen           testRTFileOpen
+extern int testRTFileOpen(PRTFILE pFile, const char *pszFilename, uint64_t fOpen);
 #define RTFileQueryInfo      testRTFileQueryInfo
+extern int testRTFileQueryInfo(RTFILE hFile, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAdditionalAttribs);
 #define RTFileRead           testRTFileRead
+extern int testRTFileRead(RTFILE hFile, void *pvBuf, size_t cbToRead, size_t *pcbRead);
 #define RTFileSetMode        testRTFileSetMode
+extern int testRTFileSetMode(RTFILE hFile, RTFMODE fMode);
 #define RTFileSetSize        testRTFileSetSize
+extern int testRTFileSetSize(RTFILE hFile, uint64_t cbSize);
 #define RTFileSetTimes       testRTFileSetTimes
+extern int testRTFileSetTimes(RTFILE hFile, PCRTTIMESPEC pAccessTime, PCRTTIMESPEC pModificationTime, PCRTTIMESPEC pChangeTime, PCRTTIMESPEC pBirthTime);
 #define RTFileSeek           testRTFileSeek
+extern int testRTFileSeek(RTFILE hFile, int64_t offSeek, unsigned uMethod, uint64_t *poffActual);
 #define RTFileUnlock         testRTFileUnlock
+extern int testRTFileUnlock(RTFILE hFile, int64_t offLock, uint64_t cbLock);
 #define RTFileWrite          testRTFileWrite
+extern int testRTFileWrite(RTFILE hFile, const void *pvBuf, size_t cbToWrite, size_t *pcbWritten);
 #define RTFsQueryProperties  testRTFsQueryProperties
+extern int testRTFsQueryProperties(const char *pszFsPath, PRTFSPROPERTIES pProperties);
 #define RTFsQuerySerial      testRTFsQuerySerial
+extern int testRTFsQuerySerial(const char *pszFsPath, uint32_t *pu32Serial);
 #define RTFsQuerySizes       testRTFsQuerySizes
+extern int testRTFsQuerySizes(const char *pszFsPath, RTFOFF *pcbTotal, RTFOFF *pcbFree, uint32_t *pcbBlock, uint32_t *pcbSector);
 #define RTPathQueryInfoEx    testRTPathQueryInfoEx
+extern int testRTPathQueryInfoEx(const char *pszPath, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAdditionalAttribs, uint32_t fFlags);
 #define RTSymlinkDelete      testRTSymlinkDelete
+extern int testRTSymlinkDelete(const char *pszSymlink);
 #define RTSymlinkRead        testRTSymlinkRead
+extern int testRTSymlinkRead(const char *pszSymlink, char *pszTarget, size_t cbTarget);
 
 #endif /* __VBSF_TEST_STUBS__H */

trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp

@@ -17 +17 @@
 
 #ifdef UNITTEST
-# include "teststubs.h"
 # include "testcase/tstSharedFolderService.h"
 #endif
@@ -37 +36 @@
 #ifdef RT_OS_DARWIN
 # include <Carbon/Carbon.h>
+#endif
+
+#ifdef UNITTEST
+# include "teststubs.h"
 #endif