Skip to content

Commit d442d7c

Browse files
DAndrewBoxDAndrewBox
authored
Merge pull request #9 from DAndrewBox/develop
Release v1.1.1
2 parents d88dc8c + 57bd6e5 commit d442d7c

File tree

15 files changed

+289
-198
lines changed

15 files changed

+289
-198
lines changed

‎GM-Testing-Library/objects/o_gmtl_demo_draw/Step_0.gml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
if (gmtl_has_finished && !gmtl_internal.initializing && log == "") {
1+
if (gmtl_has_finished && !gmtl_is_initializing && log == "") {
22
log = string_replace_all(gmtl_log, "\t", " ");
33
log_lines = string_split(log, "\n", false);
44

‎GM-Testing-Library/objects/o_gmtl_demo_timer/Step_0.gml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ if (_mouse_inside && mouse_check_button(mb_middle)) {
4040

4141
if (!mouse_check_button(mb_middle)) {
4242
timer_click_hold = 0;
43-
}
43+
}

‎GM-Testing-Library/scripts/GMTL_core_TestCase/GMTL_core_TestCase.gml‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// @func TestCase(value)
2-
/// @param {any} value
3-
/// @param {array} args
2+
/// @param {Any} value
3+
/// @param {Array} args
44
function TestCase(_val, _args) constructor {
55
__internal_value = _val;
66
__internal_args = _args;
@@ -18,7 +18,7 @@ function TestCase(_val, _args) constructor {
1818
}
1919

2020
/// @func toBe(expected_result)
21-
/// @param {any} expected_result
21+
/// @param {Any} expected_result
2222
function toBe(_expectedResult) {
2323
var _isValid;
2424
if (is_array(__internal_value) && is_array(_expectedResult)) {
@@ -42,7 +42,7 @@ function TestCase(_val, _args) constructor {
4242
}
4343

4444
/// @func toBeEqual(expected_result)
45-
/// @param {any} expected_result
45+
/// @param {Any} expected_result
4646
function toBeEqual(_expectedResult) {
4747
var _typeOf = typeof(__internal_value);
4848
var _isValid = false;
@@ -97,7 +97,7 @@ function TestCase(_val, _args) constructor {
9797
if (!_isValid) {
9898
__gmtl_internal_fn_stacktrace();
9999
array_push(gmtl_test_log, $"> expect({__internal_value}){__not_str_method}.toHaveReturned():");
100-
array_push(gmtl_test_log, $"- Expected Result: {__not_str_expected == "" ? true : $"{__not_str_expected} {true}"}");
100+
array_push(gmtl_test_log, $"- Expected Result: {__not_str_expected == "" ? "true" : $"{__not_str_expected} true"}");
101101
array_push(gmtl_test_log, $"- Received Result: {__internal_value}");
102102
gmtl_test_status = __gmtl_test_status.FAILED;
103103
gmtl_suite_continue = false;
@@ -107,7 +107,7 @@ function TestCase(_val, _args) constructor {
107107
}
108108

109109
/// @func toHaveReturnedWith(expected_result)
110-
/// @param {any} expected_result
110+
/// @param {Any} expected_result
111111
function toHaveReturnedWith(_expectedResult) {
112112
var _isValid = !is_undefined(__internal_value) && is_callable(__internal_value);
113113

@@ -139,7 +139,7 @@ function TestCase(_val, _args) constructor {
139139
}
140140

141141
/// @func toHaveLength(number)
142-
/// @param {real} number
142+
/// @param {Real} number
143143
function toHaveLength(_n) {
144144
var _typeOf = typeof(__internal_value);
145145
var _isValid = false;
@@ -167,7 +167,7 @@ function TestCase(_val, _args) constructor {
167167
var _type_of_msg = $"<Invalid Type: {_typeOf}>";
168168
_type_of_msg = (_typeInvalid ? _type_of_msg : string(_len));
169169
array_push(gmtl_test_log, $">expect({__internal_value}){__not_str_method}.toHaveLength({_n}):");
170-
array_push(gmtl_test_log, $"- Expected Result: {__not_str_expected == "" ? _n : $"{__not_str_expected} {_n}"}");
170+
array_push(gmtl_test_log, $"- Expected Result: {__not_str_expected == "" ? string(_n) : $"{__not_str_expected} {_n}"}");
171171
array_push(gmtl_test_log, $"- Received Result: {_type_of_msg}");
172172
gmtl_test_status = __gmtl_test_status.FAILED;
173173
gmtl_suite_continue = false;
@@ -177,8 +177,8 @@ function TestCase(_val, _args) constructor {
177177
}
178178

179179
/// @func toHaveProperty(key, value)
180-
/// @param {string} key
181-
/// @param {any} value
180+
/// @param {String} key
181+
/// @param {Any} value
182182
function toHaveProperty(_key, _value = undefined) {
183183
var _typeOf = typeof(__internal_value);
184184
var _isValid = false;
@@ -238,7 +238,7 @@ function TestCase(_val, _args) constructor {
238238
}
239239

240240
/// @func toBeGreaterThan(number)
241-
/// @param {real} number
241+
/// @param {Real} number
242242
function toBeGreaterThan(_n) {
243243
var _typeOf = typeof(__internal_value);
244244
var _isValid = false;
@@ -273,7 +273,7 @@ function TestCase(_val, _args) constructor {
273273
}
274274

275275
/// @func toBeGreaterThanOrEqual(number)
276-
/// @param {real} number
276+
/// @param {Real} number
277277
function toBeGreaterThanOrEqual(_n) {
278278
var _typeOf = typeof(__internal_value);
279279
var _isValid = false;
@@ -306,7 +306,7 @@ function TestCase(_val, _args) constructor {
306306
}
307307

308308
/// @func toBeLessThan(number)
309-
/// @param {real} number
309+
/// @param {Real} number
310310
function toBeLessThan(_n) {
311311
var _typeOf = typeof(__internal_value);
312312
var _isValid = false;
@@ -339,7 +339,7 @@ function TestCase(_val, _args) constructor {
339339
}
340340

341341
/// @func toBeLessThanOrEqual(number)
342-
/// @param {real} number
342+
/// @param {Real} number
343343
function toBeLessThanOrEqual(_n) {
344344
var _typeOf = typeof(__internal_value);
345345
var _isValid = false;
@@ -392,8 +392,8 @@ function TestCase(_val, _args) constructor {
392392
__gmtl_internal_fn_stacktrace();
393393

394394
array_push(gmtl_test_log, $"> expect({__internal_value}){__not_str_method}.toBeFalsy():");
395-
array_push(gmtl_test_log, $"- Expected Result: {__not_str_expected == "" ? false : $"{__not_str_expected} {false}"}");
396-
array_push(gmtl_test_log, $"- Received Result: {true}");
395+
array_push(gmtl_test_log, $"- Expected Result: {__not_str_expected == "" ? "false" : $"{__not_str_expected} false"}");
396+
array_push(gmtl_test_log, $"- Received Result: true");
397397
gmtl_test_status = __gmtl_test_status.FAILED;
398398
gmtl_suite_continue = false;
399399
} else {
@@ -432,16 +432,17 @@ function TestCase(_val, _args) constructor {
432432
}
433433

434434
/// @func toContain(value)
435-
/// @param {any} value
435+
/// @param {Any} value
436436
function toContain(_value) {
437437
var _typeOf = typeof(__internal_value);
438438
var _isValid = false;
439439
var _typeInvalid = false;
440440
var _onPos = -1;
441+
var _arr_len = 0;
441442

442443
switch (_typeOf) {
443444
case "array":
444-
var _arr_len = array_length(__internal_value);
445+
_arr_len = array_length(__internal_value);
445446
_onPos = -1;
446447

447448
for (var i = 0; i < _arr_len; i++) {
@@ -454,7 +455,7 @@ function TestCase(_val, _args) constructor {
454455
break;
455456
case "struct":
456457
var _keys = struct_get_names(__internal_value);
457-
var _arr_len = array_length(_keys);
458+
_arr_len = array_length(_keys);
458459
_onPos = "";
459460

460461
for (var i = 0; i < _arr_len; i++) {

‎GM-Testing-Library/scripts/GMTL_core_TimeSource/GMTL_core_TimeSource.gml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/// @func GMTL_TimeSource(parent, period, units, callback, args, repetitions, expiryType)
2-
/// @param {GMTimeSourceParent} parent
3-
/// @param {real} period
4-
/// @param {GMTimeSourceUnit} units
5-
/// @param {GMFunction} callback
6-
/// @param {array} args
7-
/// @param {real} reps
8-
/// @param {GMTimeSourceExpiry} expiryType
2+
/// @param {Any} parent
3+
/// @param {Real} period
4+
/// @param {Constant.TimeSourceUnits} units
5+
/// @param {Function} callback
6+
/// @param {Array} args
7+
/// @param {Real} reps
8+
/// @param {Constant.TimeSourceExpiryType} expiryType
99
function GMTL_TimeSource(_parent, _period, _units, _callback, _args = [], _reps = 1, _expiry = undefined) constructor {
1010
__internal_id = current_time;
1111
/* Time to execute the callback */
@@ -31,7 +31,7 @@ function GMTL_TimeSource(_parent, _period, _units, _callback, _args = [], _reps
3131
}
3232

3333
/// @func startLater(frames)
34-
/// @param {real} frames
34+
/// @param {Real} frames
3535
/// @desc Starts the frame check after a defined set of frames. Adds a delay to the start()
3636
/// @ignore
3737
function startLater(_frames) {

‎GM-Testing-Library/scripts/GMTL_core_test_events/GMTL_core_test_events.gml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
/// @func expect(value, args)
2-
/// @param {any} value
3-
/// @param {array} args
2+
/// @param {Any} value
3+
/// @param {Array} args
44
function expect(_val, _args = []) {
55
if (gmtl_suite_continue) {
66
return new TestCase(_val, _args);
77
}
88
}
99

1010
/// @func create(x, y, object_index, params)
11-
/// @param {real} x
12-
/// @param {real} y
13-
/// @param {ref} object_index
14-
/// @param {struct} params
11+
/// @param {Real} x
12+
/// @param {Real} y
13+
/// @param {Asset.GMObject} object_index
14+
/// @param {Struct} params
1515
function create(_x, _y, _obj, _params = {}) {
1616
if (gmtl_suite_continue) {
1717
static _layer_name = "__GMTL_LAYER_TESTING";
@@ -26,28 +26,28 @@ function create(_x, _y, _obj, _params = {}) {
2626
}
2727

2828
/// @func beforeAll(fn)
29-
/// @param {GMFunction} fn
29+
/// @param {Function | Asset.GMScript} fn
3030
function beforeAll(_fn) {
3131
_fn = __gmtl_internal_fn_get_fn_index(_fn);
3232
gmtl_test_before_all = _fn;
3333
}
3434

3535
/// @func afterAll(fn)
36-
/// @param {GMFunction} fn
36+
/// @param {Function | Asset.GMScript} fn
3737
function afterAll(_fn) {
3838
_fn = __gmtl_internal_fn_get_fn_index(_fn);
3939
gmtl_test_after_all = _fn;
4040
}
4141

4242
/// @func beforeEach(fn)
43-
/// @param {GMFunction} fn
43+
/// @param {Function | Asset.GMScript} fn
4444
function beforeEach(_fn) {
4545
_fn = __gmtl_internal_fn_get_fn_index(_fn);
4646
gmtl_test_before_each = _fn;
4747
}
4848

4949
/// @func afterEach(fn)
50-
/// @param {GMFunction} fn
50+
/// @param {Function | Asset.GMScript} fn
5151
function afterEach(_fn) {
5252
_fn = __gmtl_internal_fn_get_fn_index(_fn);
5353
gmtl_test_after_each = _fn;

‎GM-Testing-Library/scripts/GMTL_core_test_setup/GMTL_core_test_setup.gml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/// @func suite(fn)
2-
/// @param {GMFunction} fn
2+
/// @param {Function} fn
33
function suite(_suite) {
44
__gmtl_internal_fn_suite_add_to_queue(_suite);
55
}
66

77
/// @func describe(name, fn)
8-
/// @param {string} name
9-
/// @param {GMFunction} fn
8+
/// @param {String} name
9+
/// @param {Function} fn
1010
function describe(_name, _fn) {
1111
gmtl_indent_offset++;
1212
gmtl_suite_continue = true;
@@ -46,9 +46,9 @@ function describe(_name, _fn) {
4646
}
4747

4848
/// @func it(name, fn, args)
49-
/// @param {string} name
50-
/// @param {GMFunction} fn
51-
/// @param {array} args
49+
/// @param {String} name
50+
/// @param {Function} fn
51+
/// @param {Array} args
5252
function it(_name, _fn, _args = []) {
5353
gmtl_test_status = __gmtl_test_status.RUN;
5454
gmtl_indent = 1;
@@ -130,24 +130,24 @@ function it(_name, _fn, _args = []) {
130130
}
131131

132132
/// @func section(name, fn)
133-
/// @param {string} name
134-
/// @param {GMFunction} fn
133+
/// @param {String} name
134+
/// @param {Function} fn
135135
function section(_name, _fn) {
136136
describe(_name, _fn);
137137
}
138138

139139
/// @func test(name, fn, args)
140-
/// @param {string} name
141-
/// @param {GMFunction} fn
142-
/// @param {array} args
140+
/// @param {String} name
141+
/// @param {Function} fn
142+
/// @param {Array} args
143143
function test(_name, _fn, _args = []) {
144144
it(_name, _fn, _args);
145145
}
146146

147147
/// @func skip(name, fn, args)
148-
/// @param {string} name
149-
/// @param {GMFunction} fn
150-
/// @param {array} args
148+
/// @param {String} name
149+
/// @param {Function} fn
150+
/// @param {Array} args
151151
function skip(_name, _fn, _args = []) {
152152
gmtl_test_status = __gmtl_test_status.SKIP;
153153
gmtl_indent = 1;
@@ -160,9 +160,9 @@ function skip(_name, _fn, _args = []) {
160160
}
161161

162162
/// @func each(name, fn, cases)
163-
/// @param {string} name
164-
/// @param {GMFunction} fn
165-
/// @param {array} cases
163+
/// @param {String} name
164+
/// @param {Function} fn
165+
/// @param {Array} cases
166166
function each(_name, _fn, _cases) {
167167
var _cases_len = array_length(_cases);
168168
var _name_with_params;

0 commit comments

Comments
 (0)