wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 742384 - CDataFinalizer.dispose now returns a value. r=jorendorff

Browse Source
This commit is contained in:
David Rajchenbach-Teller 2012-04-11 14:58:44 +02:00
parent ea99848944
commit 8152b2083e
3 changed files with 81 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
toolkit/components/ctypes/tests/jsctypes-test-finalizer.cpp
View File

@ -77,6 +77,16 @@ test_finalizer_rel_size_t_return_size_t(size_t i)
return i;
}
RECT
test_finalizer_rel_size_t_return_struct_t(size_t i)
{
if (-- gFinalizerTestResources[i] < 0) {
MOZ_NOT_REACHED("Assertion failed");
}
const PRInt32 narrowed = (PRInt32)i;
RECT result = { narrowed, narrowed, narrowed, narrowed };
return result;
}
bool
test_finalizer_cmp_size_t(size_t a, size_t b)

2
toolkit/components/ctypes/tests/jsctypes-test-finalizer.h
View File

@ -8,7 +8,6 @@
NS_EXTERN_C
{
EXPORT_CDECL(void) test_finalizer_start(size_t size);
EXPORT_CDECL(void) test_finalizer_stop();
EXPORT_CDECL(bool) test_finalizer_resource_is_acquired(size_t i);
@ -16,6 +15,7 @@ NS_EXTERN_C
EXPORT_CDECL(size_t) test_finalizer_acq_size_t(size_t i);
EXPORT_CDECL(void) test_finalizer_rel_size_t(size_t i);
EXPORT_CDECL(size_t) test_finalizer_rel_size_t_return_size_t(size_t i);
EXPORT_CDECL(RECT) test_finalizer_rel_size_t_return_struct_t(size_t i);
EXPORT_CDECL(bool) test_finalizer_cmp_size_t(size_t a, size_t b);
EXPORT_CDECL(int32_t) test_finalizer_acq_int32_t(size_t i);

80
toolkit/components/ctypes/tests/unit/test_finalizer.js
View File

@ -13,6 +13,9 @@ function run_test()
ctypes.default_abi,
ctypes.bool,
ctypes.size_t);
let released = function(value, witness) {
return witness == undefined;
};
let samples = [];
samples.push(
@ -31,7 +34,8 @@ function run_test()
ctypes.bool,
ctypes.size_t,
ctypes.size_t),
status: status
status: status,
released: released
});
samples.push(
{
@ -49,7 +53,8 @@ function run_test()
ctypes.bool,
ctypes.size_t,
ctypes.size_t),
status: status
status: status,
released: released
});
samples.push(
{
@ -67,7 +72,8 @@ function run_test()
ctypes.bool,
ctypes.int32_t,
ctypes.int32_t),
status: status
status: status,
released: released
}
);
samples.push(
@ -86,7 +92,8 @@ function run_test()
ctypes.bool,
ctypes.int64_t,
ctypes.int64_t),
status: status
status: status,
released: released
}
);
samples.push(
@ -105,7 +112,8 @@ function run_test()
ctypes.bool,
ctypes.void_t.ptr,
ctypes.void_t.ptr),
status: status
status: status,
released: released
}
);
samples.push(
@ -124,7 +132,8 @@ function run_test()
ctypes.bool,
ctypes.char.ptr,
ctypes.char.ptr),
status: status
status: status,
released: released
}
);
const rect_t = new ctypes.StructType("RECT",
@ -148,7 +157,8 @@ function run_test()
ctypes.bool,
rect_t,
rect_t),
status: status
status: status,
released: released
}
);
samples.push(
@ -167,12 +177,40 @@ function run_test()
ctypes.bool,
ctypes.size_t,
ctypes.size_t),
status: status
status: status,
released: function(i, witness) {
return i == witness;
}
}
);
samples.push(
{
name: "null",
name: "size_t, release returns RECT",
acquire: library.declare("test_finalizer_acq_size_t",
ctypes.default_abi,
ctypes.size_t,
ctypes.size_t),
release: library.declare("test_finalizer_rel_size_t_return_struct_t",
ctypes.default_abi,
rect_t,
ctypes.size_t),
compare: library.declare("test_finalizer_cmp_size_t",
ctypes.default_abi,
ctypes.bool,
ctypes.size_t,
ctypes.size_t),
status: status,
released: function(i, witness) {
return witness.top == i
&& witness.bottom == i
&& witness.left == i
&& witness.right == i;
}
}
);
samples.push(
{
name: "using null",
acquire: library.declare("test_finalizer_acq_null_t",
ctypes.default_abi,
ctypes.PointerType(ctypes.void_t),
@ -189,7 +227,8 @@ function run_test()
ctypes.default_abi,
ctypes.bool,
ctypes.void_t.ptr,
ctypes.void_t.ptr)
ctypes.void_t.ptr),
released: released
}
);
@ -201,6 +240,7 @@ function run_test()
tester.launch(TEST_SIZE, test_do_not_execute_finalizers_on_referenced_stuff, sample);
tester.launch(TEST_SIZE, test_executing_dispose, sample);
tester.launch(TEST_SIZE, test_executing_forget, sample);
tester.launch(TEST_SIZE, test_result_dispose, sample);
}
);
@ -268,7 +308,27 @@ function test_executing_finalizers(size, tc)
do_check_true(count_finalized(size, tc) > 0);
}
/**
* Check that
* - |dispose| returns the proper result
*/
function test_result_dispose(size, tc) {
dump("test_result_dispose " + tc.name + "\n");
let ref = [];
// Allocate |size| items with references
for (let i = 0; i < size; ++i) {
ref.push(ctypes.CDataFinalizer(tc.acquire(i), tc.release));
}
do_check_eq(count_finalized(size, tc), 0);
for (i = 0; i < size; ++i) {
let witness = ref[i].dispose();
ref[i] = null;
if (!tc.released(i, witness)) {
do_check_true(tc.released(i, witness));
}
}
}
/**
* Check that
* - |dispose| is executed properly