scrrun/tests: Add a helper to construct test file path.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2017-12-26 21:28:12 +03:00 committed by Alexandre Julliard
parent 86597db834
commit 80a74873ad
1 changed files with 15 additions and 25 deletions

View File

@ -46,6 +46,7 @@ static inline ULONG get_refcount(IUnknown *iface)
static const WCHAR crlfW[] = {'\r','\n',0}; static const WCHAR crlfW[] = {'\r','\n',0};
static const char utf16bom[] = {0xff,0xfe,0}; static const char utf16bom[] = {0xff,0xfe,0};
static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0};
#define GET_REFCOUNT(iface) \ #define GET_REFCOUNT(iface) \
get_refcount((IUnknown*)iface) get_refcount((IUnknown*)iface)
@ -239,7 +240,6 @@ static void test_createfolder(void)
static void test_textstream(void) static void test_textstream(void)
{ {
static const WCHAR testfileW[] = {'t','e','s','t','f','i','l','e','.','t','x','t',0};
ITextStream *stream; ITextStream *stream;
VARIANT_BOOL b; VARIANT_BOOL b;
DWORD written; DWORD written;
@ -1451,10 +1451,18 @@ static void test_DriveCollection(void)
IDriveCollection_Release(drives); IDriveCollection_Release(drives);
} }
static void test_CreateTextFile(void) static void get_temp_filepath(const WCHAR *filename, WCHAR *path, WCHAR *dir)
{ {
static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0};
static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0};
GetTempPathW(MAX_PATH, path);
lstrcatW(path, scrrunW);
lstrcpyW(dir, path);
lstrcatW(path, filename);
}
static void test_CreateTextFile(void)
{
WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10]; WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10];
ITextStream *stream; ITextStream *stream;
BSTR nameW, str; BSTR nameW, str;
@ -1462,10 +1470,7 @@ static void test_CreateTextFile(void)
HRESULT hr; HRESULT hr;
BOOL ret; BOOL ret;
GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); get_temp_filepath(testfileW, pathW, dirW);
lstrcatW(pathW, scrrunW);
lstrcpyW(dirW, pathW);
lstrcatW(pathW, testfileW);
/* dir doesn't exist */ /* dir doesn't exist */
nameW = SysAllocString(pathW); nameW = SysAllocString(pathW);
@ -1533,8 +1538,6 @@ static void test_CreateTextFile(void)
static void test_WriteLine(void) static void test_WriteLine(void)
{ {
static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0};
static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0};
WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; WCHAR pathW[MAX_PATH], dirW[MAX_PATH];
WCHAR buffW[MAX_PATH], buff2W[MAX_PATH]; WCHAR buffW[MAX_PATH], buff2W[MAX_PATH];
char buffA[MAX_PATH]; char buffA[MAX_PATH];
@ -1545,10 +1548,7 @@ static void test_WriteLine(void)
HRESULT hr; HRESULT hr;
BOOL ret; BOOL ret;
GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); get_temp_filepath(testfileW, pathW, dirW);
lstrcatW(pathW, scrrunW);
lstrcpyW(dirW, pathW);
lstrcatW(pathW, testfileW);
ret = CreateDirectoryW(dirW, NULL); ret = CreateDirectoryW(dirW, NULL);
ok(ret, "got %d, %d\n", ret, GetLastError()); ok(ret, "got %d, %d\n", ret, GetLastError());
@ -1607,8 +1607,6 @@ static void test_WriteLine(void)
static void test_ReadAll(void) static void test_ReadAll(void)
{ {
static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0};
static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0};
static const WCHAR secondlineW[] = {'s','e','c','o','n','d',0}; static const WCHAR secondlineW[] = {'s','e','c','o','n','d',0};
static const WCHAR aW[] = {'A',0}; static const WCHAR aW[] = {'A',0};
WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[500]; WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[500];
@ -1618,10 +1616,7 @@ static void test_ReadAll(void)
BOOL ret; BOOL ret;
BSTR str; BSTR str;
GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); get_temp_filepath(testfileW, pathW, dirW);
lstrcatW(pathW, scrrunW);
lstrcpyW(dirW, pathW);
lstrcatW(pathW, testfileW);
ret = CreateDirectoryW(dirW, NULL); ret = CreateDirectoryW(dirW, NULL);
ok(ret, "got %d, %d\n", ret, GetLastError()); ok(ret, "got %d, %d\n", ret, GetLastError());
@ -1741,8 +1736,6 @@ todo_wine
static void test_Read(void) static void test_Read(void)
{ {
static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0};
static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0};
static const WCHAR secondlineW[] = {'s','e','c','o','n','d',0}; static const WCHAR secondlineW[] = {'s','e','c','o','n','d',0};
static const WCHAR aW[] = {'A',0}; static const WCHAR aW[] = {'A',0};
WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[500]; WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[500];
@ -1752,10 +1745,7 @@ static void test_Read(void)
BOOL ret; BOOL ret;
BSTR str; BSTR str;
GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); get_temp_filepath(testfileW, pathW, dirW);
lstrcatW(pathW, scrrunW);
lstrcpyW(dirW, pathW);
lstrcatW(pathW, testfileW);
ret = CreateDirectoryW(dirW, NULL); ret = CreateDirectoryW(dirW, NULL);
ok(ret, "got %d, %d\n", ret, GetLastError()); ok(ret, "got %d, %d\n", ret, GetLastError());