[ci] fix uuid and bytes buffer extension tests

Author: fangq

jdataencode.m

@@ -121,11 +121,13 @@
 
 %% -------------------------------------------------------------------------
 function newitem = obj2jd(item, opt)
-
+newitem = item;
 if (iscell(item))
     newitem = cell2jd(item, opt);
 elseif (isa(item, 'jdict'))
-    newitem = obj2jd(item(), opt);
+    if (isempty(item{'kind'}))
+        newitem = obj2jd(item(), opt);
+    end
 elseif (isstruct(item))
     newitem = struct2jd(item, opt);
 elseif (isnumeric(item) || islogical(item) || isa(item, 'timeseries'))
@@ -144,11 +146,9 @@
     newitem = graph2jd(item, opt);
 elseif (isobject(item))
     newitem = matlabobject2jd(item, opt);
-else
-    newitem = item;
 end
 
-if (isa(item, 'jdict'))  % apply attribute
+if (isa(item, 'jdict') && isempty(item{'kind'}))  % apply attribute
     attrpath = item.getattr();
     if (isempty(attrpath))
         return

savebj.m

@@ -249,7 +249,7 @@
 end
 
 if (~skippreencode && jsonopt('PreEncode', 1, opt))
-    obj = jdataencode(obj, 'Base64', 0, 'UseArrayZipSize', opt.messagepack, 'DateTime', 0, opt);
+    obj = jdataencode(obj, 'Base64', 0, 'UseArrayZipSize', opt.messagepack, 'DateTime', (opt.formatversion < 4), opt);
 end
 
 dozip = opt.compression;
@@ -325,8 +325,12 @@
     txt = ext2ubjson(name, item, 'datetime', opt);
 elseif (isa(item, 'duration'))
     txt = ext2ubjson(name, item, 'duration', opt);
-elseif (isa(item, 'jdict') && ~isempty(item{'kind'}))
-    txt = jdict2ubjson(name, item, level, opt);
+elseif (isa(item, 'jdict'))
+    if (~isempty(item{'kind'}))
+        txt = jdict2ubjson(name, item, level, opt);
+    else
+        txt = obj2ubjson(name, item(), level, opt);
+    end
 elseif (ischar(item))
     if (numel(item) >= opt.compressstringsize)
         txt = mat2ubjson(name, item, level, opt);
@@ -1855,11 +1859,15 @@
         return
     end
     d = item.v();
-    shifts = uint64([24 16 8 0 8 0 8 0 8 0 40 32 24 16 8 0]);
-    vals = uint64([d.time_low d.time_low d.time_low d.time_low ...
-                   d.time_mid d.time_mid d.time_high d.time_high ...
-                   d.clock_seq d.clock_seq d.node d.node d.node d.node d.node d.node]);
-    payload = uint8(bitand(bitshift(vals, -shifts), 255));
+    payload = uint8([ ...
+                     bitshift(d.time_low, -24), bitand(bitshift(d.time_low, -16), 255), ...
+                     bitand(bitshift(d.time_low, -8), 255), bitand(d.time_low, 255), ...
+                     bitshift(d.time_mid, -8), bitand(d.time_mid, 255), ...
+                     bitshift(d.time_high, -8), bitand(d.time_high, 255), ...
+                     bitshift(d.clock_seq, -8), bitand(d.clock_seq, 255), ...
+                     bitshift(d.node, -40), bitand(bitshift(d.node, -32), 255), ...
+                     bitand(bitshift(d.node, -24), 255), bitand(bitshift(d.node, -16), 255), ...
+                     bitand(bitshift(d.node, -8), 255), bitand(d.node, 255)]);
     txt = ['E' I_(uint8(10), opt) I_(uint8(16), opt) char(payload)];
     if ~isempty(name)
         txt = [N_(decodevarname(name, opt.unpackhex), opt) txt];
@@ -1868,8 +1876,9 @@
     % Raw extension bytes
     payload = uint8(item.v());
     typeid = uint32(0);
-    if isfield(s, 'exttype')
-        typeid = uint32(s.exttype);
+    exttype = item{'exttype'};
+    if ~isempty(exttype)
+        typeid = uint32(exttype);
     end
     txt = ['E' I_(typeid, opt) I_(uint32(length(payload)), opt) char(payload)];
     if ~isempty(name)

test/run_jsonlab_test.m

@@ -265,7 +265,7 @@ function run_jsonlab_test(tests)
     test_jsonlab('heterogeneous cell', @savebj, {{1, {2, 3}}, {4, 5}, {6}; {7}, {8, 9}, {10}}, ...
                  '[[[U<1>[U<2>U<3>]][U<4>U<5>][U<6>]][[U<7>][U<8>U<9>][U<10>]]]', 'debug', 1);
     test_jsonlab('struct array', @savebj, repmat(struct('i', 1.1, 'd', 'str'), [1, 2]), ...
-                 '[{U<1>iD<1.1>U<1>dSU<3>str}{U<1>iD<1.1>U<1>dSU<3>str}]', 'debug', 1);
+                 '[{U<1>iD<1.1>U<1>dSU<3>str}{U<1>iD<1.1>U<1>dSU<3>str}]', 'debug', 1, 'formatversion', 2);
     test_jsonlab('encoded fieldnames', @savebj, struct(encodevarname('_i'), 1, encodevarname('i_'), 'str'), ...
                  '{U<2>_iU<1>U<2>i_SU<3>str}', 'debug', 1);
     test_jsonlab('optimized 2D row-major array', @savebj, loadbj(['[$i#[$U#U' char([2 2 3 61 62 65 66 67 68])]), '[$U#[$U#U<2><2><3><61><62><65><66><67><68>', 'debug', 1);
@@ -1270,16 +1270,18 @@ function run_jsonlab_test(tests)
                  '{U<11>_ArrayType_SU<6>singleU<11>_ArraySize_[$U#U<2><1><2>U<16>_ArrayIsComplex_TU<11>_ArrayData_[$U#[$U#U<2><2><2><1><3><2><4>}', 'debug', 1);
 
     % uuid (type 10): 16 bytes Big-Endian
-    test_jsonlab('uuid', @savebj, jdict(struct('time_low', uint64(1427098624), ...
-                                               'time_mid', uint64(58011), ...
-                                               'time_high', uint64(16852), ...
-                                               'clock_seq', uint64(42774), ...
-                                               'node', uint64(75124066492416)), 'kind', 'uuid'), ...
+    test_jsonlab('uuid', @savebj, jdict(struct('time_low', uint64(hex2dec('550e8400')), ...
+                                               'time_mid', uint64(hex2dec('e29b')), ...
+                                               'time_high', uint64(hex2dec('41d4')), ...
+                                               'clock_seq', uint64(hex2dec('a716')), ...
+                                               'node', uint64(hex2dec('446655440000'))), 'kind', 'uuid'), ...
                  ['EU<10>U<16>' char([85 14 132 0 226 155 65 212 167 22 68 102 85 68 0 0])], 'debug', 1);
 
     % unknown extension round-trip (type 200)
-    test_jsonlab('raw extension', @savebj, struct('x0x5F_ByteData_', uint8([1, 2, 3, 4]), 'x0x5F_ExtType_', int32(200)), ...
-                 ['Em' char([200 0 0 0]) 'm' char([4 0 0 0 1 2 3 4])], 'debug', 1);
+    raw = jdict(uint8([1, 2, 3, 4]), 'kind', 'bytes');
+    raw{'exttype'} = int32(200);
+    test_jsonlab('raw extension', @savebj, raw, ...
+                 ['EU<200>U<4>' char([1 2 3 4])], 'debug', 1);
 
     if exist('datetime', 'class')
         % datetime - epoch_s (type 1): uint32 seconds since epoch