Skip to content

Commit 32c8a8c

Browse files
committed
[tests] Remove unnecessary Testworks 'define suite' forms
The need for these was removed a while back. Now tests register themselves and Testworks runs them all by default.
1 parent eea6750 commit 32c8a8c

2 files changed

Lines changed: 14 additions & 84 deletions

File tree

tests/binary-data-test.dylan

Lines changed: 14 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,17 @@ define test label-assign1 ()
272272
bv2.packet);
273273
end;
274274

275+
/* This test was commented out of the suites before I deleted them. --cgay
276+
It was failing like this:
277+
label-assign2 failed
278+
Frame-field has length failed [120 and 128 are not =.]
279+
Frame-field has end failed [128 and 136 are not =.]
280+
Frame-field has start failed [128 and 136 are not =.]
281+
Frame-field has end failed [136 and 144 are not =.]
282+
bv2 has correct size failed [17 and 18 are not =.]
283+
label assign2 failed [{<simple-byte-vector> sequence 66, 35, 2, 16, 17, 35, 3, 4, 5, 6, 35, 4, 7, 8, 9, 16, 35} and {<stretchy-byte-vector-subsequence> sequence 66, 35, 2, 16, 17, 35, 3, 4, 5, 6, 35, 4, 7, 8, 9, 16, 16, 35} are not =. sizes differ (17 and 18), element 16 is the first non-matching element]
284+
285+
275286
define test label-assign2 ()
276287
let frames = as(<stretchy-vector>,
277288
list(make(<frag>, data: parse-frame(<raw-frame>, as(<byte-vector>, #(#x1, #x2, #x3)))),
@@ -290,6 +301,7 @@ define test label-assign2 ()
290301
as(<byte-vector>, #(#x42, #x23, #x2, #x10, #x11, #x23, #x3, #x4, #x5, #x6, #x23, #x4, #x7, #x8, #x9, #x10, #x23)),
291302
bv2.packet);
292303
end;
304+
*/
293305

294306
define test label-assign3 ()
295307
let fr = parse-frame(<labe>, as(<byte-vector>, #(#x42, #x23, #x2, #x10, #x11, #x23, #x3, #x4, #x5, #x6, #x23, #x4, #x7, #x8, #x9, #x10, #x23, #x00, #x23)));
@@ -715,69 +727,6 @@ define test null-test ()
715727
check-equal("data is false", #f, nothing.data);
716728
end;
717729

718-
define suite binary-data-suite ()
719-
test binary-data-parser;
720-
test binary-data-dynamic-parser;
721-
test static-start-test;
722-
test repeated-test;
723-
test repeated-and-dynamic-test;
724-
test repeated-and-dynamic-test2;
725-
test count-repeated-test;
726-
test label-test;
727-
test inheritance-test;
728-
test inheritance-dynamic-length;
729-
test dyn-length;
730-
test dynamic-length;
731-
test bits-parsing;
732-
test half-byte-parsing;
733-
test dns-foo-parsing;
734-
test dynlength;
735-
test dyn-length-client;
736-
test dyn-length-client2;
737-
test enum-parse-test;
738-
test abstract-parse-test;
739-
test abstract-user-parse-test;
740-
end;
741-
742-
define suite binary-data-assemble-suite ()
743-
test binary-data-assemble;
744-
test binary-data-modify;
745-
test binary-data-dynamic-assemble;
746-
test static-start-assemble;
747-
test repeated-assemble;
748-
test repeated-and-dynamic-assemble;
749-
test count-repeated-assemble;
750-
test label-assemble;
751-
test label-assign1;
752-
//test label-assign2;
753-
test label-assign3;
754-
test inheritance-assemble;
755-
test inheritance-dynamic-length-assemble;
756-
test half-byte-assembling;
757-
test half-byte-modify;
758-
test half-bytes-assembling;
759-
test bits-assemble;
760-
test dns-foo-assemble;
761-
test dynlength-assemble;
762-
test enum-assemble-test;
763-
test abstract-assemble-test;
764-
test abstract-user-assemble-test;
765-
end;
766-
767-
define suite binary-data-leaf-frames-suite ()
768-
test unsigned-bit-leaf-test;
769-
test boolean-bit-leaf-test;
770-
test null-test;
771-
test null-test-0;
772-
end;
773-
774-
define suite binary-data-complete-suite ()
775-
suite stretchy-byte-vector-suite;
776-
suite binary-data-suite;
777-
suite binary-data-assemble-suite;
778-
suite binary-data-leaf-frames-suite;
779-
end;
780-
781730
begin
782-
run-test-application(binary-data-complete-suite);
783-
end;
731+
run-test-application();
732+
end

tests/stretchy-byte-vector-test.dylan

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -256,22 +256,3 @@ define test decode-and-encode-test ()
256256
end;
257257
end;
258258
end;
259-
260-
define suite stretchy-byte-vector-suite ()
261-
test byte-vector-subsequence-read;
262-
test byte-vector-subsequence-modify;
263-
test byte-vector-subsequence-iteration;
264-
test byte-vector-subsequence-iteration-modify;
265-
test byte-vector-subsequence-error-test;
266-
test byte-vector-subsequence-stretchy-test;
267-
test byte-vector-subsequence-nested-test;
268-
test byte-vector-subsequence-with-offset-read;
269-
test byte-vector-subsequence-with-offset-advanced;
270-
test byte-vector-subsequence-with-offset-iteration;
271-
test byte-vector-subsequence-with-offset-modify;
272-
test encode-integer-test;
273-
test encode-integer-test2;
274-
test decode-integer-test;
275-
test decode-and-encode-test;
276-
end;
277-

0 commit comments

Comments
 (0)