Skip to content

Commit 55282e1

Browse files
authored
Merge pull request #32 from nomennescio/prepare-release
Prepare release 2.0.0
2 parents e74df55 + 14736b5 commit 55282e1

File tree

3 files changed

+24
-21
lines changed

3 files changed

+24
-21
lines changed

test/test-custom.expected

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,46 +7,50 @@
77

88
<PASSED::>Just passed
99

10-
<COMPLETEDIN::>0.129834 ms
10+
<COMPLETEDIN::>0.140822 ms
1111

1212
<IT::>failing compares
1313

1414
<FAILED::>Just failed
1515

1616
<FAILED::>Just failed
1717

18-
<COMPLETEDIN::>0.076824 ms
18+
<COMPLETEDIN::>0.068695 ms
1919

2020
<IT::>short strings
2121

2222
<PASSED::>Test passed
2323

2424
<PASSED::>Test passed
2525

26-
<COMPLETEDIN::>0.025016 ms
26+
<COMPLETEDIN::>0.026218 ms
2727

2828
<IT::>failing compares
2929

30-
<FAILED::>Actually expected :<:LF:>"Hello Worlds!"<:LF:>but instead got :<:LF:>"Hello World!"
30+
<FAILED::>Actually expected :{ "Hello Worlds!" }<:LF:><:LF:>but instead got :{ "Hello World!" }
3131

32-
<FAILED::>Actually expected :<:LF:>"Hello Worlds! "<:LF:>but instead got :<:LF:>"Hello Worlds!"
3332

34-
<COMPLETEDIN::>0.162660 ms
33+
<FAILED::>Actually expected :{ "Hello Worlds! " }<:LF:><:LF:>but instead got :{ "Hello Worlds!" }
34+
35+
36+
<COMPLETEDIN::>0.336267 ms
3537

3638
<IT::>short strings
3739

3840
<PASSED::>Test Passed
3941

4042
<PASSED::>Test Passed
4143

42-
<COMPLETEDIN::>0.026153 ms
44+
<COMPLETEDIN::>0.047432 ms
4345

4446
<IT::>failing compares
4547

46-
<FAILED::>Test Failed : Actually expected :<:LF:>"Hello Worlds!"<:LF:>but instead got :<:LF:>"Hello World!"
48+
<FAILED::>Test Failed : Actually expected :{ "Hello Worlds!" }<:LF:><:LF:>but instead got :{ "Hello World!" }
49+
50+
51+
<FAILED::>Test Failed : Actually expected :{ "Hello Worlds! " }<:LF:><:LF:>but instead got :{ "Hello Worlds!" }
4752

48-
<FAILED::>Test Failed : Actually expected :<:LF:>"Hello Worlds! "<:LF:>but instead got :<:LF:>"Hello Worlds!"
4953

50-
<COMPLETEDIN::>0.055392 ms
54+
<COMPLETEDIN::>0.086214 ms
5155

52-
<COMPLETEDIN::>0.726864 ms
56+
<COMPLETEDIN::>0.922141 ms

test/test-custom.factor

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
! Copyright 2019 nomennescio
1+
! Copyright 2019-2022 nomennescio
22

3-
USING: accessors debugger io kernel namespaces sequences tools.testest ;
3+
USING: accessors debugger io kernel namespaces prettyprint sequences tools.testest ;
44
IN: tests
55

66
M: assert-sequence error.
7-
[ "Actually expected :" write expected>> seq. ]
8-
[ lf "but instead got :" write got>> seq. ] bi
7+
[ "Actually expected :" write expected>> ... ]
8+
[ lf "but instead got :" write got>> ... ] bi
99
;
1010

1111
: run-test ( -- )

tools/testest/testest.factor

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,11 @@ SYNTAX: <{ \ -> parse-until >quotation suffix! \ }> parse-until >quotation suffi
4747

4848
! customized printing
4949

50-
! line internal unformatted linefeed, to be used in single-line test result messages
51-
50+
! deprecated
5251
: lf ( -- ) "<:LF:>" write ;
5352

53+
<PRIVATE
54+
5455
: pprint-unlimited ( obj -- ) [ pprint ] without-limits ;
5556

5657
: seq. ( seq -- )
@@ -61,18 +62,16 @@ SYNTAX: <{ \ -> parse-until >quotation suffix! \ }> parse-until >quotation suffi
6162
] each
6263
;
6364

64-
<PRIVATE
65-
6665
SYMBOL: ERROR:{
6766
: pprint-error ( error-tuple -- ) [ ERROR:{ ] dip [ class-of ] [ tuple>assoc ] bi \ } (pprint-tuple) ;
6867

6968
! print errors differently from tuples
7069
M: tuple pprint* dup class-of error-class? [ pprint-error ] [ pprint-tuple ] if ;
7170
M: tuple error. dup class-of error-class? [ pprint-short ] [ describe ] if ;
7271

73-
PRIVATE>
74-
7572
M: assert-sequence error.
7673
[ "Expected :" write expected>> seq. ]
7774
[ nl "but got :" write got>> seq. ] bi
7875
;
76+
77+
PRIVATE>

0 commit comments

Comments
 (0)