mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 693341 - Test arrays of strings. r=khuey

This commit is contained in:
Bobby Holley 2011-10-27 12:43:38 -07:00
Родитель aa5ddae600
Коммит 615dab06a5
4 изменённых файлов: 51 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
js/xpconnect/tests/components/js/xpctest_params.js
Просмотреть файл

@ -88,6 +88,8 @@ TestParams.prototype = {
testJsval: f,
testShortArray: f_is,
testLongLongArray: f_is,
testStringArray: f_is,
testWstringArray: f_is,
};
var NSGetFactory = XPCOMUtils.generateNSGetFactory([TestParams]);

41
js/xpconnect/tests/components/native/xpctest_params.cpp
Просмотреть файл

@ -58,7 +58,17 @@ nsXPCTestParams::~nsXPCTestParams()
return NS_OK; \
}
#define BUFFER_METHOD_IMPL(type) { \
#define TAKE_OWNERSHIP_NOOP(val) {}
#define TAKE_OWNERSHIP_STRING(val) { \
nsDependentCString vprime(val); \
val = ToNewCString(vprime); \
}
#define TAKE_OWNERSHIP_WSTRING(val) { \
nsDependentString vprime(val); \
val = ToNewUnicode(vprime); \
}
#define BUFFER_METHOD_IMPL(type, TAKE_OWNERSHIP) { \
PRUint32 elemSize = sizeof(type); \
\
/* Copy b into rv. */ \
@ -76,6 +86,11 @@ nsXPCTestParams::~nsXPCTestParams()
return NS_ERROR_OUT_OF_MEMORY; \
memcpy(*b, a, elemSize * aLength); \
\
/* We need to take ownership of the data we got from a, \
since the caller owns it. */ \
for (unsigned i = 0; i < *bLength; ++i) \
TAKE_OWNERSHIP((*b)[i]); \
\
return NS_OK; \
}
@ -221,7 +236,7 @@ NS_IMETHODIMP nsXPCTestParams::TestShortArray(PRUint32 aLength, PRInt16 *a,
PRUint32 *bLength NS_INOUTPARAM, PRInt16 **b NS_INOUTPARAM,
PRUint32 *rvLength NS_OUTPARAM, PRInt16 **rv NS_OUTPARAM)
{
BUFFER_METHOD_IMPL(PRInt16);
BUFFER_METHOD_IMPL(PRInt16, TAKE_OWNERSHIP_NOOP);
}
/* void testLongLongArray (in unsigned long aLength, [array, size_is (aLength)] in long long a,
@ -231,5 +246,25 @@ NS_IMETHODIMP nsXPCTestParams::TestLongLongArray(PRUint32 aLength, PRInt64 *a,
PRUint32 *bLength NS_INOUTPARAM, PRInt64 **b NS_INOUTPARAM,
PRUint32 *rvLength NS_OUTPARAM, PRInt64 **rv NS_OUTPARAM)
{
BUFFER_METHOD_IMPL(PRInt64);
BUFFER_METHOD_IMPL(PRInt64, TAKE_OWNERSHIP_NOOP);
}
/* void testStringArray (in unsigned long aLength, [array, size_is (aLength)] in string a,
* inout unsigned long bLength, [array, size_is (bLength)] inout string b,
* out unsigned long rvLength, [array, size_is (rvLength), retval] out string rv); */
NS_IMETHODIMP nsXPCTestParams::TestStringArray(PRUint32 aLength, const char * *a,
PRUint32 *bLength NS_INOUTPARAM, char * **b NS_INOUTPARAM,
PRUint32 *rvLength NS_OUTPARAM, char * **rv NS_OUTPARAM)
{
BUFFER_METHOD_IMPL(char*, TAKE_OWNERSHIP_STRING);
}
/* void testWstringArray (in unsigned long aLength, [array, size_is (aLength)] in wstring a,
* inout unsigned long bLength, [array, size_is (bLength)] inout wstring b,
* out unsigned long rvLength, [array, size_is (rvLength), retval] out wstring rv); */
NS_IMETHODIMP nsXPCTestParams::TestWstringArray(PRUint32 aLength, const PRUnichar * *a,
PRUint32 *bLength NS_INOUTPARAM, PRUnichar * **b NS_INOUTPARAM,
PRUint32 *rvLength NS_OUTPARAM, PRUnichar * **rv NS_OUTPARAM)
{
BUFFER_METHOD_IMPL(PRUnichar*, TAKE_OWNERSHIP_WSTRING);
}

8
js/xpconnect/tests/idl/xpctest_params.idl
Просмотреть файл

@ -72,11 +72,17 @@ interface nsIXPCTestParams : nsISupports {
// Dependent parameters use the same types as above, but are handled much differently.
//
// Test arrays with non-allocated parameters.
// Test arrays.
void testShortArray(in unsigned long aLength, [array, size_is(aLength)] in short a,
inout unsigned long bLength, [array, size_is(bLength)] inout short b,
out unsigned long rvLength, [retval, array, size_is(rvLength)] out short rv);
void testLongLongArray(in unsigned long aLength, [array, size_is(aLength)] in long long a,
inout unsigned long bLength, [array, size_is(bLength)] inout long long b,
out unsigned long rvLength, [retval, array, size_is(rvLength)] out long long rv);
void testStringArray(in unsigned long aLength, [array, size_is(aLength)] in string a,
inout unsigned long bLength, [array, size_is(bLength)] inout string b,
out unsigned long rvLength, [retval, array, size_is(rvLength)] out string rv);
void testWstringArray(in unsigned long aLength, [array, size_is(aLength)] in wstring a,
inout unsigned long bLength, [array, size_is(bLength)] inout wstring b,
out unsigned long rvLength, [retval, array, size_is(rvLength)] out wstring rv);
};

4
js/xpconnect/tests/unit/test_params.js
Просмотреть файл

@ -127,4 +127,8 @@ function test_component(contractid) {
// Test arrays.
doIsTest("testShortArray", [2, 4, 6], 3, [1, 3, 5, 7], 4, arrayComparator);
doIsTest("testLongLongArray", [-10000000000], 1, [1, 3, 1234511234551], 3, arrayComparator);
doIsTest("testStringArray", ["mary", "hat", "hey", "lid", "tell", "lam"], 6,
["ids", "fleas", "woes", "wide", "has", "know", "!"], 7, arrayComparator);
doIsTest("testWstringArray", ["沒有語言", "的偉大嗎?]"], 2,
["we", "are", "being", "sooo", "international", "right", "now"], 7, arrayComparator);
}