Skip to content

Commit cbac3aa

Browse files
Deepak Rajamohanmhdawson
authored andcommitted
test: standardize unit test file names
- change all unit test file names to snake case this helps in parsing file names to tokens and infer metadata like export initializers - all other changes other than file names is due to linter errors PR-URL: #1056 Reviewed-By: Michael Dawson <[email protected] Reviewed-By: NickNaso <[email protected]>
1 parent da2e754 commit cbac3aa

20 files changed

+124
-108
lines changed

test/arraybuffer.cc renamed to test/array_buffer.cc

Lines changed: 54 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ Value CreateBuffer(const CallbackInfo& info) {
2727
ArrayBuffer buffer = ArrayBuffer::New(info.Env(), testLength);
2828

2929
if (buffer.ByteLength() != testLength) {
30-
Error::New(info.Env(), "Incorrect buffer length.").ThrowAsJavaScriptException();
30+
Error::New(info.Env(), "Incorrect buffer length.")
31+
.ThrowAsJavaScriptException();
3132
return Value();
3233
}
3334

@@ -41,12 +42,14 @@ Value CreateExternalBuffer(const CallbackInfo& info) {
4142
ArrayBuffer buffer = ArrayBuffer::New(info.Env(), testData, testLength);
4243

4344
if (buffer.ByteLength() != testLength) {
44-
Error::New(info.Env(), "Incorrect buffer length.").ThrowAsJavaScriptException();
45+
Error::New(info.Env(), "Incorrect buffer length.")
46+
.ThrowAsJavaScriptException();
4547
return Value();
4648
}
4749

4850
if (buffer.Data() != testData) {
49-
Error::New(info.Env(), "Incorrect buffer data.").ThrowAsJavaScriptException();
51+
Error::New(info.Env(), "Incorrect buffer data.")
52+
.ThrowAsJavaScriptException();
5053
return Value();
5154
}
5255

@@ -60,21 +63,20 @@ Value CreateExternalBufferWithFinalize(const CallbackInfo& info) {
6063
uint8_t* data = new uint8_t[testLength];
6164

6265
ArrayBuffer buffer = ArrayBuffer::New(
63-
info.Env(),
64-
data,
65-
testLength,
66-
[](Env /*env*/, void* finalizeData) {
67-
delete[] static_cast<uint8_t*>(finalizeData);
68-
finalizeCount++;
69-
});
66+
info.Env(), data, testLength, [](Env /*env*/, void* finalizeData) {
67+
delete[] static_cast<uint8_t*>(finalizeData);
68+
finalizeCount++;
69+
});
7070

7171
if (buffer.ByteLength() != testLength) {
72-
Error::New(info.Env(), "Incorrect buffer length.").ThrowAsJavaScriptException();
72+
Error::New(info.Env(), "Incorrect buffer length.")
73+
.ThrowAsJavaScriptException();
7374
return Value();
7475
}
7576

7677
if (buffer.Data() != data) {
77-
Error::New(info.Env(), "Incorrect buffer data.").ThrowAsJavaScriptException();
78+
Error::New(info.Env(), "Incorrect buffer data.")
79+
.ThrowAsJavaScriptException();
7880
return Value();
7981
}
8082

@@ -89,22 +91,24 @@ Value CreateExternalBufferWithFinalizeHint(const CallbackInfo& info) {
8991

9092
char* hint = nullptr;
9193
ArrayBuffer buffer = ArrayBuffer::New(
92-
info.Env(),
93-
data,
94-
testLength,
95-
[](Env /*env*/, void* finalizeData, char* /*finalizeHint*/) {
96-
delete[] static_cast<uint8_t*>(finalizeData);
97-
finalizeCount++;
98-
},
99-
hint);
94+
info.Env(),
95+
data,
96+
testLength,
97+
[](Env /*env*/, void* finalizeData, char* /*finalizeHint*/) {
98+
delete[] static_cast<uint8_t*>(finalizeData);
99+
finalizeCount++;
100+
},
101+
hint);
100102

101103
if (buffer.ByteLength() != testLength) {
102-
Error::New(info.Env(), "Incorrect buffer length.").ThrowAsJavaScriptException();
104+
Error::New(info.Env(), "Incorrect buffer length.")
105+
.ThrowAsJavaScriptException();
103106
return Value();
104107
}
105108

106109
if (buffer.Data() != data) {
107-
Error::New(info.Env(), "Incorrect buffer data.").ThrowAsJavaScriptException();
110+
Error::New(info.Env(), "Incorrect buffer data.")
111+
.ThrowAsJavaScriptException();
108112
return Value();
109113
}
110114

@@ -114,31 +118,35 @@ Value CreateExternalBufferWithFinalizeHint(const CallbackInfo& info) {
114118

115119
void CheckBuffer(const CallbackInfo& info) {
116120
if (!info[0].IsArrayBuffer()) {
117-
Error::New(info.Env(), "A buffer was expected.").ThrowAsJavaScriptException();
121+
Error::New(info.Env(), "A buffer was expected.")
122+
.ThrowAsJavaScriptException();
118123
return;
119124
}
120125

121126
ArrayBuffer buffer = info[0].As<ArrayBuffer>();
122127

123128
if (buffer.ByteLength() != testLength) {
124-
Error::New(info.Env(), "Incorrect buffer length.").ThrowAsJavaScriptException();
129+
Error::New(info.Env(), "Incorrect buffer length.")
130+
.ThrowAsJavaScriptException();
125131
return;
126132
}
127133

128134
if (!VerifyData(static_cast<uint8_t*>(buffer.Data()), testLength)) {
129-
Error::New(info.Env(), "Incorrect buffer data.").ThrowAsJavaScriptException();
135+
Error::New(info.Env(), "Incorrect buffer data.")
136+
.ThrowAsJavaScriptException();
130137
return;
131138
}
132139
}
133140

134141
Value GetFinalizeCount(const CallbackInfo& info) {
135-
return Number::New(info.Env(), finalizeCount);
142+
return Number::New(info.Env(), finalizeCount);
136143
}
137144

138145
Value CreateBufferWithConstructor(const CallbackInfo& info) {
139146
ArrayBuffer buffer = ArrayBuffer::New(info.Env(), testLength);
140147
if (buffer.ByteLength() != testLength) {
141-
Error::New(info.Env(), "Incorrect buffer length.").ThrowAsJavaScriptException();
148+
Error::New(info.Env(), "Incorrect buffer length.")
149+
.ThrowAsJavaScriptException();
142150
return Value();
143151
}
144152
InitData(static_cast<uint8_t*>(buffer.Data()), testLength);
@@ -153,7 +161,8 @@ Value CheckEmptyBuffer(const CallbackInfo& info) {
153161

154162
void CheckDetachUpdatesData(const CallbackInfo& info) {
155163
if (!info[0].IsArrayBuffer()) {
156-
Error::New(info.Env(), "A buffer was expected.").ThrowAsJavaScriptException();
164+
Error::New(info.Env(), "A buffer was expected.")
165+
.ThrowAsJavaScriptException();
157166
return;
158167
}
159168

@@ -165,15 +174,17 @@ void CheckDetachUpdatesData(const CallbackInfo& info) {
165174

166175
#if NAPI_VERSION >= 7
167176
if (buffer.IsDetached()) {
168-
Error::New(info.Env(), "Buffer should not be detached.").ThrowAsJavaScriptException();
177+
Error::New(info.Env(), "Buffer should not be detached.")
178+
.ThrowAsJavaScriptException();
169179
return;
170180
}
171181
#endif
172182

173183
if (info.Length() == 2) {
174184
// Detach externally (in JavaScript).
175185
if (!info[1].IsFunction()) {
176-
Error::New(info.Env(), "A function was expected.").ThrowAsJavaScriptException();
186+
Error::New(info.Env(), "A function was expected.")
187+
.ThrowAsJavaScriptException();
177188
return;
178189
}
179190

@@ -190,38 +201,43 @@ void CheckDetachUpdatesData(const CallbackInfo& info) {
190201

191202
#if NAPI_VERSION >= 7
192203
if (!buffer.IsDetached()) {
193-
Error::New(info.Env(), "Buffer should be detached.").ThrowAsJavaScriptException();
204+
Error::New(info.Env(), "Buffer should be detached.")
205+
.ThrowAsJavaScriptException();
194206
return;
195207
}
196208
#endif
197209

198210
if (buffer.Data() != nullptr) {
199-
Error::New(info.Env(), "Incorrect data pointer.").ThrowAsJavaScriptException();
211+
Error::New(info.Env(), "Incorrect data pointer.")
212+
.ThrowAsJavaScriptException();
200213
return;
201214
}
202215

203216
if (buffer.ByteLength() != 0) {
204-
Error::New(info.Env(), "Incorrect buffer length.").ThrowAsJavaScriptException();
217+
Error::New(info.Env(), "Incorrect buffer length.")
218+
.ThrowAsJavaScriptException();
205219
return;
206220
}
207221
}
208222

209-
} // end anonymous namespace
223+
} // end anonymous namespace
210224

211225
Object InitArrayBuffer(Env env) {
212226
Object exports = Object::New(env);
213227

214228
exports["createBuffer"] = Function::New(env, CreateBuffer);
215229
exports["createExternalBuffer"] = Function::New(env, CreateExternalBuffer);
216230
exports["createExternalBufferWithFinalize"] =
217-
Function::New(env, CreateExternalBufferWithFinalize);
231+
Function::New(env, CreateExternalBufferWithFinalize);
218232
exports["createExternalBufferWithFinalizeHint"] =
219-
Function::New(env, CreateExternalBufferWithFinalizeHint);
233+
Function::New(env, CreateExternalBufferWithFinalizeHint);
220234
exports["checkBuffer"] = Function::New(env, CheckBuffer);
221235
exports["getFinalizeCount"] = Function::New(env, GetFinalizeCount);
222-
exports["createBufferWithConstructor"] = Function::New(env, CreateBufferWithConstructor);
236+
exports["createBufferWithConstructor"] =
237+
Function::New(env, CreateBufferWithConstructor);
223238
exports["checkEmptyBuffer"] = Function::New(env, CheckEmptyBuffer);
224-
exports["checkDetachUpdatesData"] = Function::New(env, CheckDetachUpdatesData);
239+
exports["checkDetachUpdatesData"] =
240+
Function::New(env, CheckDetachUpdatesData);
225241

226242
return exports;
227243
}
File renamed without changes.

test/asynccontext.cc renamed to test/async_context.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ static void MakeCallback(const CallbackInfo& info) {
88
Function callback = info[0].As<Function>();
99
Object resource = info[1].As<Object>();
1010
AsyncContext context(info.Env(), "async_context_test", resource);
11-
callback.MakeCallback(Object::New(info.Env()),
12-
std::initializer_list<napi_value>{}, context);
11+
callback.MakeCallback(
12+
Object::New(info.Env()), std::initializer_list<napi_value>{}, context);
1313
}
1414

15-
} // end anonymous namespace
15+
} // end anonymous namespace
1616

1717
Object InitAsyncContext(Env env) {
1818
Object exports = Object::New(env);
File renamed without changes.

test/asyncprogressqueueworker.cc renamed to test/async_progress_queue_worker.cc

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,14 @@ struct ProgressData {
1616
};
1717

1818
class TestWorker : public AsyncProgressQueueWorker<ProgressData> {
19-
public:
19+
public:
2020
static Napi::Value CreateWork(const CallbackInfo& info) {
2121
int32_t times = info[0].As<Number>().Int32Value();
2222
Function cb = info[1].As<Function>();
2323
Function progress = info[2].As<Function>();
2424

25-
TestWorker* worker = new TestWorker(cb,
26-
progress,
27-
"TestResource",
28-
Object::New(info.Env()),
29-
times);
25+
TestWorker* worker = new TestWorker(
26+
cb, progress, "TestResource", Object::New(info.Env()), times);
3027

3128
return Napi::External<TestWorker>::New(info.Env(), worker);
3229
}
@@ -37,7 +34,7 @@ class TestWorker : public AsyncProgressQueueWorker<ProgressData> {
3734
worker->Queue();
3835
}
3936

40-
protected:
37+
protected:
4138
void Execute(const ExecutionProgress& progress) override {
4239
using namespace std::chrono_literals;
4340
std::this_thread::sleep_for(1s);
@@ -56,26 +53,25 @@ class TestWorker : public AsyncProgressQueueWorker<ProgressData> {
5653
Napi::Env env = Env();
5754
if (!_js_progress_cb.IsEmpty()) {
5855
Number progress = Number::New(env, data->progress);
59-
_js_progress_cb.Call(Receiver().Value(), { progress });
56+
_js_progress_cb.Call(Receiver().Value(), {progress});
6057
}
6158
}
6259

63-
private:
60+
private:
6461
TestWorker(Function cb,
6562
Function progress,
6663
const char* resource_name,
6764
const Object& resource,
6865
int32_t times)
69-
: AsyncProgressQueueWorker(cb, resource_name, resource),
70-
_times(times) {
66+
: AsyncProgressQueueWorker(cb, resource_name, resource), _times(times) {
7167
_js_progress_cb.Reset(progress, 1);
7268
}
7369

7470
int32_t _times;
7571
FunctionReference _js_progress_cb;
7672
};
7773

78-
} // namespace
74+
} // namespace
7975

8076
Object InitAsyncProgressQueueWorker(Env env) {
8177
Object exports = Object::New(env);

test/asyncprogressworker.cc renamed to test/async_progress_worker.cc

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,19 @@ struct ProgressData {
1616
};
1717

1818
class TestWorker : public AsyncProgressWorker<ProgressData> {
19-
public:
19+
public:
2020
static void DoWork(const CallbackInfo& info) {
2121
int32_t times = info[0].As<Number>().Int32Value();
2222
Function cb = info[1].As<Function>();
2323
Function progress = info[2].As<Function>();
2424

25-
TestWorker* worker = new TestWorker(cb, progress, "TestResource", Object::New(info.Env()));
25+
TestWorker* worker =
26+
new TestWorker(cb, progress, "TestResource", Object::New(info.Env()));
2627
worker->_times = times;
2728
worker->Queue();
2829
}
2930

30-
protected:
31+
protected:
3132
void Execute(const ExecutionProgress& progress) override {
3233
if (_times < 0) {
3334
SetError("test error");
@@ -45,13 +46,16 @@ class TestWorker : public AsyncProgressWorker<ProgressData> {
4546
Napi::Env env = Env();
4647
if (!_progress.IsEmpty()) {
4748
Number progress = Number::New(env, data->progress);
48-
_progress.MakeCallback(Receiver().Value(), { progress });
49+
_progress.MakeCallback(Receiver().Value(), {progress});
4950
}
5051
_cv.notify_one();
5152
}
5253

53-
private:
54-
TestWorker(Function cb, Function progress, const char* resource_name, const Object& resource)
54+
private:
55+
TestWorker(Function cb,
56+
Function progress,
57+
const char* resource_name,
58+
const Object& resource)
5559
: AsyncProgressWorker(cb, resource_name, resource) {
5660
_progress.Reset(progress, 1);
5761
}
@@ -118,7 +122,7 @@ class MalignWorker : public AsyncProgressWorker<ProgressData> {
118122
std::mutex _cvm;
119123
FunctionReference _progress;
120124
};
121-
}
125+
} // namespace
122126

123127
Object InitAsyncProgressWorker(Env env) {
124128
Object exports = Object::New(env);
File renamed without changes.

0 commit comments

Comments
 (0)