Skip to content

Commit 61cd1ec

Browse files
committed
revert tests
1 parent e7e8a81 commit 61cd1ec

File tree

7 files changed

+23
-82
lines changed

7 files changed

+23
-82
lines changed

test/array_buffer.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Value CreateExternalBufferWithFinalize(const CallbackInfo& info) {
6363
uint8_t* data = new uint8_t[testLength];
6464

6565
ArrayBuffer buffer = ArrayBuffer::New(
66-
info.Env(), data, testLength, [](NogcEnv /*env*/, void* finalizeData) {
66+
info.Env(), data, testLength, [](Env /*env*/, void* finalizeData) {
6767
delete[] static_cast<uint8_t*>(finalizeData);
6868
finalizeCount++;
6969
});
@@ -94,7 +94,7 @@ Value CreateExternalBufferWithFinalizeHint(const CallbackInfo& info) {
9494
info.Env(),
9595
data,
9696
testLength,
97-
[](NogcEnv /*env*/, void* finalizeData, char* /*finalizeHint*/) {
97+
[](Env /*env*/, void* finalizeData, char* /*finalizeHint*/) {
9898
delete[] static_cast<uint8_t*>(finalizeData);
9999
finalizeCount++;
100100
},

test/buffer.cc

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,11 @@ Value CreateExternalBufferWithFinalize(const CallbackInfo& info) {
5151

5252
uint16_t* data = new uint16_t[testLength];
5353

54-
Buffer<uint16_t> buffer =
55-
Buffer<uint16_t>::New(info.Env(),
56-
data,
57-
testLength,
58-
[](NogcEnv /*env*/, uint16_t* finalizeData) {
59-
delete[] finalizeData;
60-
finalizeCount++;
61-
});
54+
Buffer<uint16_t> buffer = Buffer<uint16_t>::New(
55+
info.Env(), data, testLength, [](Env /*env*/, uint16_t* finalizeData) {
56+
delete[] finalizeData;
57+
finalizeCount++;
58+
});
6259

6360
if (buffer.Length() != testLength) {
6461
Error::New(info.Env(), "Incorrect buffer length.")
@@ -86,7 +83,7 @@ Value CreateExternalBufferWithFinalizeHint(const CallbackInfo& info) {
8683
info.Env(),
8784
data,
8885
testLength,
89-
[](NogcEnv /*env*/, uint16_t* finalizeData, char* /*finalizeHint*/) {
86+
[](Env /*env*/, uint16_t* finalizeData, char* /*finalizeHint*/) {
9087
delete[] finalizeData;
9188
finalizeCount++;
9289
},

test/buffer_new_or_copy-inl.h

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,11 @@ Value CreateOrCopyExternalBufferWithFinalize(const CallbackInfo& info) {
2424
uint16_t* data = new uint16_t[testLength];
2525
InitData(data, testLength);
2626

27-
Buffer<uint16_t> buffer =
28-
Buffer<uint16_t>::NewOrCopy(info.Env(),
29-
data,
30-
testLength,
31-
[](NogcEnv /*env*/, uint16_t* finalizeData) {
32-
delete[] finalizeData;
33-
finalizeCount++;
34-
});
27+
Buffer<uint16_t> buffer = Buffer<uint16_t>::NewOrCopy(
28+
info.Env(), data, testLength, [](Env /*env*/, uint16_t* finalizeData) {
29+
delete[] finalizeData;
30+
finalizeCount++;
31+
});
3532

3633
if (buffer.Length() != testLength) {
3734
Error::New(info.Env(), "Incorrect buffer length.")
@@ -54,7 +51,7 @@ Value CreateOrCopyExternalBufferWithFinalizeHint(const CallbackInfo& info) {
5451
info.Env(),
5552
data,
5653
testLength,
57-
[](NogcEnv /*env*/, uint16_t* finalizeData, char* /*finalizeHint*/) {
54+
[](Env /*env*/, uint16_t* finalizeData, char* /*finalizeHint*/) {
5855
delete[] finalizeData;
5956
finalizeCount++;
6057
},

test/external.cc

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ Value CreateExternal(const CallbackInfo& info) {
1414

1515
Value CreateExternalWithFinalize(const CallbackInfo& info) {
1616
finalizeCount = 0;
17-
return External<int>::New(
18-
info.Env(), new int(1), [](NogcEnv /*env*/, int* data) {
19-
delete data;
20-
finalizeCount++;
21-
});
17+
return External<int>::New(info.Env(), new int(1), [](Env /*env*/, int* data) {
18+
delete data;
19+
finalizeCount++;
20+
});
2221
}
2322

2423
Value CreateExternalWithFinalizeHint(const CallbackInfo& info) {
@@ -27,7 +26,7 @@ Value CreateExternalWithFinalizeHint(const CallbackInfo& info) {
2726
return External<int>::New(
2827
info.Env(),
2928
new int(1),
30-
[](NogcEnv /*env*/, int* data, char* /*hint*/) {
29+
[](Env /*env*/, int* data, char* /*hint*/) {
3130
delete data;
3231
finalizeCount++;
3332
},
@@ -56,21 +55,6 @@ Value GetFinalizeCount(const CallbackInfo& info) {
5655
}
5756

5857
Value CreateExternalWithFinalizeException(const CallbackInfo& info) {
59-
#ifdef NODE_API_EXPERIMENTAL_HAS_POST_FINALIZER
60-
auto o = External<int>::New(
61-
info.Env(), new int(1), [](NogcEnv /*env*/, int* data) { delete data; });
62-
63-
info.Env().AddPostFinalizer([](Env env) {
64-
Error error = Error::New(env, "Finalizer exception");
65-
#ifdef NAPI_CPP_EXCEPTIONS
66-
throw error;
67-
#else
68-
error.ThrowAsJavaScriptException();
69-
#endif
70-
});
71-
72-
return o;
73-
#else
7458
return External<int>::New(info.Env(), new int(1), [](Env env, int* data) {
7559
Error error = Error::New(env, "Finalizer exception");
7660
delete data;
@@ -80,8 +64,8 @@ Value CreateExternalWithFinalizeException(const CallbackInfo& info) {
8064
error.ThrowAsJavaScriptException();
8165
#endif
8266
});
83-
#endif
8467
}
68+
8569
} // end anonymous namespace
8670

8771
Object InitExternal(Env env) {

test/movable_callbacks.cc

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,13 @@ using namespace Napi;
44

55
Value createExternal(const CallbackInfo& info) {
66
FunctionReference ref = Reference<Function>::New(info[0].As<Function>(), 1);
7-
8-
#ifdef NODE_API_EXPERIMENTAL_HAS_POST_FINALIZER
9-
auto env = info.Env();
10-
auto ret = External<char>::New(env, nullptr);
11-
12-
env.AddPostFinalizer(
13-
[ref = std::move(ref)](Napi::Env /*env*/) { ref.Call({}); });
14-
#else
157
auto ret = External<char>::New(
168
info.Env(),
179
nullptr,
1810
[ref = std::move(ref)](Napi::Env /*env*/, char* /*data*/) {
1911
ref.Call({});
2012
});
21-
#endif
13+
2214
return ret;
2315
}
2416

test/object/finalizer.cc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ static int dummy;
77
Value AddFinalizer(const CallbackInfo& info) {
88
ObjectReference* ref = new ObjectReference;
99
*ref = Persistent(Object::New(info.Env()));
10-
#ifdef NODE_API_EXPERIMENTAL_HAS_POST_FINALIZER
11-
info.Env().AddPostFinalizer(
12-
#else
1310
info[0].As<Object>().AddFinalizer(
14-
#endif
1511
[](Napi::Env /*env*/, ObjectReference* ref) {
1612
ref->Set("finalizerCalled", true);
1713
delete ref;
@@ -23,11 +19,7 @@ Value AddFinalizer(const CallbackInfo& info) {
2319
Value AddFinalizerWithHint(const CallbackInfo& info) {
2420
ObjectReference* ref = new ObjectReference;
2521
*ref = Persistent(Object::New(info.Env()));
26-
#ifdef NODE_API_EXPERIMENTAL_HAS_POST_FINALIZER
27-
info.Env().AddPostFinalizer(
28-
#else
2922
info[0].As<Object>().AddFinalizer(
30-
#endif
3123
[](Napi::Env /*env*/, ObjectReference* ref, int* dummy_p) {
3224
ref->Set("finalizerCalledWithCorrectHint", dummy_p == &dummy);
3325
delete ref;

test/objectwrap.cc

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,7 @@ class Test : public Napi::ObjectWrap<Test> {
3030
public:
3131
Test(const Napi::CallbackInfo& info) : Napi::ObjectWrap<Test>(info) {
3232
if (info.Length() > 0) {
33-
#ifdef NODE_API_EXPERIMENTAL_HAS_POST_FINALIZER
34-
info.Env().AddPostFinalizer(
35-
[](Napi::Env env, Napi::FunctionReference* finalizeCb) {
36-
if (finalizeCb->IsEmpty()) {
37-
return;
38-
}
39-
40-
finalizeCb->Call(env.Global(), {Napi::Boolean::New(env, true)});
41-
finalizeCb->Unref();
42-
delete finalizeCb;
43-
},
44-
new Napi::FunctionReference(
45-
Napi::Persistent(info[0].As<Napi::Function>())));
46-
#else
4733
finalizeCb_ = Napi::Persistent(info[0].As<Napi::Function>());
48-
#endif
4934
}
5035
// Create an own instance property.
5136
info.This().As<Napi::Object>().DefineProperty(
@@ -65,7 +50,7 @@ class Test : public Napi::ObjectWrap<Test> {
6550
Env(),
6651
static_cast<uint8_t*>(malloc(1)),
6752
1,
68-
[](Napi::NogcEnv, uint8_t* bufaddr) { free(bufaddr); }));
53+
[](Napi::Env, uint8_t* bufaddr) { free(bufaddr); }));
6954
}
7055

7156
static Napi::Value OwnPropertyGetter(const Napi::CallbackInfo& info) {
@@ -280,20 +265,14 @@ class Test : public Napi::ObjectWrap<Test> {
280265
}));
281266
}
282267

283-
#ifdef NODE_API_EXPERIMENTAL_HAS_POST_FINALIZER
284-
void Finalize(NODE_ADDON_API_NOGC_ENV_CLASS /*env*/) override {
285-
// Intentionally blank to ensure `override` works correctly.
286-
}
287-
#else
288-
void Finalize(NODE_ADDON_API_NOGC_ENV_CLASS env) override {
268+
void Finalize(Napi::Env env) {
289269
if (finalizeCb_.IsEmpty()) {
290270
return;
291271
}
292272

293273
finalizeCb_.Call(env.Global(), {Napi::Boolean::New(env, true)});
294274
finalizeCb_.Unref();
295275
}
296-
#endif
297276

298277
private:
299278
std::string value_;

0 commit comments

Comments
 (0)