Skip to content

Commit e71a808

Browse files
committed
TEST: using just codecs instead of longer system/codecs
1 parent a3f69e2 commit e71a808

File tree

2 files changed

+39
-39
lines changed

2 files changed

+39
-39
lines changed

src/tests/units/codecs-test.r3

+37-37
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,27 @@ Rebol [
1212
--test-- "encoding?"
1313
--assert 'text = encoding? #{}
1414
--assert 'text = encoding? #{6162}
15-
--assert do-codec system/codecs/text/entry 'identify #{}
15+
--assert do-codec codecs/text/entry 'identify #{}
1616
if all [
17-
find system/codecs 'png
18-
select system/codecs/png 'entry ; original native codec
17+
find codecs 'png
18+
select codecs/png 'entry ; original native codec
1919
][
20-
--assert not do-codec system/codecs/png/entry 'identify #{01}
20+
--assert not do-codec codecs/png/entry 'identify #{01}
2121
]
2222
if all [
23-
find system/codecs 'jpeg
24-
select system/codecs/jpeg 'entry ; original native codec
23+
find codecs 'jpeg
24+
select codecs/jpeg 'entry ; original native codec
2525
][
26-
--assert not do-codec system/codecs/jpeg/entry 'identify #{01}
27-
--assert not do-codec system/codecs/jpeg/entry 'identify #{010203}
26+
--assert not do-codec codecs/jpeg/entry 'identify #{01}
27+
--assert not do-codec codecs/jpeg/entry 'identify #{010203}
2828
bin: insert/dup make binary! 126 #{00} 126
29-
--assert not do-codec system/codecs/jpeg/entry 'identify bin
29+
--assert not do-codec codecs/jpeg/entry 'identify bin
3030
]
3131
if all [
32-
find system/codecs 'gif
33-
select system/codecs/gif 'entry ; original native codec
32+
find codecs 'gif
33+
select codecs/gif 'entry ; original native codec
3434
][
35-
--assert not do-codec system/codecs/gif/entry 'identify #{01}
35+
--assert not do-codec codecs/gif/entry 'identify #{01}
3636
]
3737
===end-group===
3838

@@ -67,8 +67,8 @@ Rebol [
6767
--assert error? try [save %temp.jpg #{00}]
6868
===end-group===
6969

70-
if find system/codecs 'wav [
71-
system/codecs/wav/verbose: 3
70+
if find codecs 'wav [
71+
codecs/wav/verbose: 3
7272
===start-group=== "WAV codec"
7373

7474
--test-- "Load WAV file"
@@ -87,11 +87,11 @@ if find system/codecs 'wav [
8787
bin: none
8888

8989
===end-group===
90-
system/codecs/wav/verbose: 0
90+
codecs/wav/verbose: 0
9191
]
9292

93-
if find system/codecs 'der [
94-
system/codecs/der/verbose: 2
93+
if find codecs 'der [
94+
codecs/der/verbose: 2
9595
===start-group=== "DER codec"
9696

9797
--test-- "Load DER file"
@@ -102,11 +102,11 @@ if find system/codecs 'der [
102102
--assert block? d: decode 'DER c
103103

104104
===end-group===
105-
system/codecs/der/verbose: 0
105+
codecs/der/verbose: 0
106106
]
107107

108-
if find system/codecs 'crt [
109-
system/codecs/crt/verbose: 3
108+
if find codecs 'crt [
109+
codecs/crt/verbose: 3
110110
===start-group=== "CRT codec"
111111

112112
--test-- "Load CRT file"
@@ -115,11 +115,11 @@ if find system/codecs 'crt [
115115
--assert block? try [key: cert/public-key/rsaEncryption]
116116
--assert #{010001} = try [key/2]
117117
===end-group===
118-
system/codecs/crt/verbose: 0
118+
codecs/crt/verbose: 0
119119
]
120120

121-
if find system/codecs 'swf [
122-
system/codecs/swf/verbose: 1
121+
if find codecs 'swf [
122+
codecs/swf/verbose: 1
123123
===start-group=== "SWF codec"
124124

125125
--test-- "Load SWF file"
@@ -128,17 +128,17 @@ if find system/codecs 'swf [
128128
--assert swf1/tags = swf2/tags
129129
--assert swf1/header/frames = 25
130130

131-
system/codecs/swf/verbose: 3
131+
codecs/swf/verbose: 3
132132
--test-- "Load SWF file with decoding tags"
133133
--assert not error? try [swf1: load %units/files/test3.swf]
134134
--assert not error? try [swf2: load %units/files/test4-as2btn.swf]
135135

136136
===end-group===
137-
system/codecs/swf/verbose: 0
137+
codecs/swf/verbose: 0
138138
]
139139

140-
if find system/codecs 'zip [
141-
system/codecs/zip/verbose: 3
140+
if find codecs 'zip [
141+
codecs/zip/verbose: 3
142142
===start-group=== "ZIP codec"
143143

144144
--test-- "Load ZIP file"
@@ -147,36 +147,36 @@ if find system/codecs 'zip [
147147
--assert block? load %units/files/test-deflate.zip
148148

149149
--test-- "Decode ZIP using the codec directly"
150-
--assert block? data: system/codecs/zip/decode/only %units/files/test.aar [%classes.jar]
150+
--assert block? data: codecs/zip/decode/only %units/files/test.aar [%classes.jar]
151151
--assert data/2/2 = 646121705
152-
--assert block? system/codecs/zip/decode data/2/3
152+
--assert block? codecs/zip/decode data/2/3
153153

154154
===end-group===
155-
system/codecs/zip/verbose: 1
155+
codecs/zip/verbose: 1
156156
]
157157

158-
if find system/codecs 'tar [
159-
system/codecs/zip/verbose: 3
158+
if find codecs 'tar [
159+
codecs/zip/verbose: 3
160160
===start-group=== "TAR codec"
161161

162162
--test-- "Load TAR file"
163163
--assert block? load %units/files/test.tar
164164

165165
--test-- "Decode TAR using the codec directly"
166-
tar-decode: :system/codecs/tar/decode
166+
tar-decode: :codecs/tar/decode
167167
--assert block? data: tar-decode/only %units/files/test.tar %test.txt
168168
--assert data/2/1 = #{7465737474657374}
169169

170170
===end-group===
171-
system/codecs/tar/verbose: 1
171+
codecs/tar/verbose: 1
172172
]
173173

174-
if find system/codecs 'unixtime [
174+
if find codecs 'unixtime [
175175
===start-group=== "unixtime codec"
176176
date: 18-Sep-2019/8:52:31+2:00
177177
--test-- "encode 32bit unixtime"
178178
--assert 1568789551 = encode 'unixtime date
179-
--assert 1568789551 = system/codecs/unixtime/encode date
179+
--assert 1568789551 = codecs/unixtime/encode date
180180
--assert "5D81D42F" = encode/as 'unixtime date string!
181181
--assert #{5D81D42F} = encode/as 'unixtime date binary!
182182
--assert 1568789551 = encode/as 'unixtime date integer!
@@ -186,7 +186,7 @@ if find system/codecs 'unixtime [
186186
--assert date = decode 'unixtime 1568789551
187187
--assert date = decode 'unixtime "5D81D42F"
188188
--assert date = decode 'unixtime #{5D81D42F}
189-
--assert date = system/codecs/unixtime/decode 1568789551
189+
--assert date = codecs/unixtime/decode 1568789551
190190

191191
date: 1-1-2056/1:2:3
192192
--test-- "encode 64bit unixtime"

src/tests/units/image-test.r3

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,14 @@ Rebol [
114114
===end-group===
115115

116116
===start-group=== "Save/load image"
117-
if find words-of system/codecs 'png [
117+
if find codecs 'png [
118118
--test-- "save/load PNG"
119119
img1: make image! [2x2 255.0.0.10]
120120
save %units/files/test.png img1
121121
img2: load %units/files/test.png
122122
--assert #{FF00000AFF00000AFF00000AFF00000A} = to binary! img2
123123
]
124-
if find words-of system/codecs 'bmp [
124+
if find codecs 'bmp [
125125
--test-- "save/load BMP"
126126
img1: make image! [2x2 255.0.0.10]
127127
save %units/files/test.bmp img1

0 commit comments

Comments
 (0)