Skip to content

Commit 8f921ac

Browse files
committed
fix broken tests
1 parent 6cb5f12 commit 8f921ac

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

savejson.m

+4-4
Original file line numberDiff line numberDiff line change
@@ -248,13 +248,13 @@
248248
json = sprintf('%s(%s);%s', jsonp, json, nl);
249249
end
250250

251-
if(jsonopt('UTF8', 1, opt) && exist('unicode2native'))
252-
json= unicode2native(json);
253-
end
254-
255251
% save to a file if FileName is set, suggested by Patrick Rapin
256252
filename = jsonopt('FileName', '', opt);
257253
if (~isempty(filename))
254+
if(jsonopt('UTF8', 1, opt) && exist('unicode2native'))
255+
json= unicode2native(json);
256+
end
257+
258258
encoding = jsonopt('Encoding', '', opt);
259259
endian = jsonopt('Endian', 'n', opt);
260260
mode = 'w';

test/run_jsonlab_test.m

+3-3
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@ function run_jsonlab_test(tests)
133133
a=uint8(eye(5));
134134
a(20,1)=1;
135135
test_jsonlab('zlib/zip compression (level 6)',@savejson,a,...
136-
sprintf('{"_ArrayType_":"uint8","_ArraySize_":[20,5],"_ArrayZipSize_":[1,100],"_ArrayZipType_":"zlib","_ArrayZipData_":"eJxjZAABRhwkxQBsDAACIQAH\n"}'),...
136+
sprintf('{"_ArrayType_":"uint8","_ArraySize_":[20,5],"_ArrayZipSize_":[1,100],"_ArrayZipType_":"zlib","_ArrayZipData_":"eJxjZAABRhwkxQBsDAACIQAH"}'),...
137137
'compact',1, 'Compression','zlib','CompressArraySize',0) % nestarray for 4-D or above is not working
138138
test_jsonlab('gzip compression (level 6)',@savejson,a,...
139-
sprintf('{"_ArrayType_":"uint8","_ArraySize_":[20,5],"_ArrayZipSize_":[1,100],"_ArrayZipType_":"gzip","_ArrayZipData_":"H4sIAAAAAAAAA2NkAAFGHCTFAGwMAF9Xq6VkAAAA\n"}'),...
139+
sprintf('{"_ArrayType_":"uint8","_ArraySize_":[20,5],"_ArrayZipSize_":[1,100],"_ArrayZipType_":"gzip","_ArrayZipData_":"H4sIAAAAAAAAA2NkAAFGHCTFAGwMAF9Xq6VkAAAA"}'),...
140140
'compact',1, 'Compression','gzip','CompressArraySize',0) % nestarray for 4-D or above is not working
141141
test_jsonlab('lzma compression (level 5)',@savejson,a,...
142-
sprintf('{"_ArrayType_":"uint8","_ArraySize_":[20,5],"_ArrayZipSize_":[1,100],"_ArrayZipType_":"lzma","_ArrayZipData_":"XQAAEABkAAAAAAAAAAAAgD1IirvlZSEY7DH///taoAA=\n"}'),...
142+
sprintf('{"_ArrayType_":"uint8","_ArraySize_":[20,5],"_ArrayZipSize_":[1,100],"_ArrayZipType_":"lzma","_ArrayZipData_":"XQAAEABkAAAAAAAAAAAAgD1IirvlZSEY7DH///taoAA="}'),...
143143
'compact',1, 'Compression','lzma','CompressArraySize',0) % nestarray for 4-D or above is not working
144144
catch
145145
end

0 commit comments

Comments
 (0)