Commit 31707758 authored by Zhiyi Zhang's avatar Zhiyi Zhang Committed by Alexandre Julliard

oledb32/tests: Remove test_odbc_provider().

All these tests are already covered by test_Properties() in msdasql/tests/provider.c.
parent 5823d986
......@@ -984,83 +984,6 @@ static void test_dslocator(void)
}
}
static void test_odbc_provider(void)
{
HRESULT hr;
IDBProperties *props;
DBPROPIDSET propidset;
ULONG infocount;
DBPROPINFOSET *propinfoset;
WCHAR *desc;
DBPROPID properties[14] =
{
DBPROP_AUTH_PASSWORD, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROP_AUTH_USERID,
DBPROP_INIT_DATASOURCE, DBPROP_INIT_HWND, DBPROP_INIT_LOCATION,
DBPROP_INIT_MODE, DBPROP_INIT_PROMPT, DBPROP_INIT_TIMEOUT,
DBPROP_INIT_PROVIDERSTRING, DBPROP_INIT_LCID, DBPROP_INIT_CATALOG,
DBPROP_INIT_OLEDBSERVICES, DBPROP_INIT_GENERALTIMEOUT
};
hr = CoCreateInstance( &CLSID_MSDASQL, NULL, CLSCTX_ALL, &IID_IDBProperties, (void **)&props);
ok(hr == S_OK, "Failed to create object 0x%08lx\n", hr);
if (FAILED(hr))
{
return;
}
propidset.rgPropertyIDs = NULL;
propidset.cPropertyIDs = 0;
propidset.guidPropertySet = DBPROPSET_DBINITALL;
infocount = 0;
hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc);
ok(hr == S_OK, "got 0x%08lx\n", hr);
if (hr == S_OK)
{
ULONG i;
DBPROPIDSET propidlist;
ULONG propcnt;
DBPROPSET *propset;
ok(IsEqualGUID(&propinfoset->guidPropertySet, &DBPROPSET_DBINIT), "got %s\n",
debugstr_guid(&propinfoset->guidPropertySet));
ok(propinfoset->cPropertyInfos == 14, "got %ld\n", propinfoset->cPropertyInfos);
propidlist.guidPropertySet = DBPROPSET_DBINIT;
propidlist.cPropertyIDs = propinfoset->cPropertyInfos;
propidlist.rgPropertyIDs = CoTaskMemAlloc(propinfoset->cPropertyInfos * sizeof(DBPROP));
for (i = 0; i < propinfoset->cPropertyInfos; i++)
{
ok(properties[i] == propinfoset->rgPropertyInfos[i].dwPropertyID, "%ld, got %ld\n", i,
propinfoset->rgPropertyInfos[i].dwPropertyID);
ok(propinfoset->rgPropertyInfos[i].vtType != VT_EMPTY, "%ld, got %d\n", i,
propinfoset->rgPropertyInfos[i].vtType);
propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID;
}
for (i = 0; i < propinfoset->cPropertyInfos; i++)
VariantClear(&propinfoset->rgPropertyInfos[i].vValues);
CoTaskMemFree(propinfoset->rgPropertyInfos);
CoTaskMemFree(propinfoset);
hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset);
ok(hr == S_OK, "got 0x%08lx\n", hr);
ok(propidlist.cPropertyIDs == 14, "got %ld\n", propinfoset->cPropertyInfos);
for (i = 0; i < propidlist.cPropertyIDs; i++)
ok(properties[i] == propidlist.rgPropertyIDs[i], "%ld, got %ld\n", i,
propidlist.rgPropertyIDs[i]);
CoTaskMemFree(propidlist.rgPropertyIDs);
CoTaskMemFree(propset);
}
IDBProperties_Release(props);
}
static void test_odbc_enumerator(void)
{
HRESULT hr;
......@@ -1105,7 +1028,6 @@ START_TEST(database)
test_errorinfo();
test_initializationstring();
test_dslocator();
test_odbc_provider();
test_odbc_enumerator();
/* row position */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment