Skip to content

Commit e5325f7

Browse files
pirropirropirropirro
committed
Fix tests
1 parent 2a9b541 commit e5325f7

File tree

4 files changed

+246
-248
lines changed

4 files changed

+246
-248
lines changed

‎src/cbor/index.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,18 @@ function toCloudProtocolV2(cborValue: CBORValue): CBORValue {
5353
}
5454

5555
function parse(value: CloudMessageValue, name: string, timestamp: number, deviceId: string): CBORValue {
56-
const parsed: CBORValue = { n: name };
56+
const parsed: CBORValue = {};
5757
if (timestamp !== -1) parsed.bt = timestamp || new Date().getTime()
58-
59-
if (Utils.isNumber(value)) parsed.v = value;
60-
if (Utils.isString(value)) parsed.vs = value;
61-
if (Utils.isBoolean(value)) parsed.vb = value;
58+
parsed.n = name;
6259

6360
if (deviceId) {
6461
parsed.bn = `urn:uuid:${deviceId}`;
6562
}
6663

64+
if (Utils.isNumber(value)) parsed.v = value;
65+
if (Utils.isString(value)) parsed.vs = value;
66+
if (Utils.isBoolean(value)) parsed.vb = value;
67+
6768
return parsed;
6869
}
6970

@@ -72,7 +73,7 @@ function getSenML(name: string, value: CloudMessageValue, timestamp: number, use
7273
if (name === undefined || typeof name !== 'string') throw new Error('Name must be a valid string');
7374

7475
if (Utils.isObject(value)) return Object.keys(value)
75-
.map((key, i) => parse(value[key], `${name}:${key}`, i === 0 ? timestamp : -1, deviceId))
76+
.map((key, i) => parse(value[key], `${name}:${key}`, i === 0 ? timestamp : -1, i === 0 ? deviceId : undefined))
7677
.map((cborValue) => useCloudProtocolV2 ? toCloudProtocolV2(cborValue) : cborValue);
7778

7879
let cborValue = parse(value, name, timestamp, deviceId);

‎test/arduino-cloud.test.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
const ArduinoCloud = require('../dist/index.js').default;
2121
const { CBOR } = require('../dist/index.js');
2222

23-
const clientId = "t6GbPJHC6nyCnBBxgOncCribTbRwVLNY";
24-
const clientSecret = "RBB3CRk7vxsba8lcVWls6u2JWxoGfnHYwEJkGBSQNmMbWOlXjhSllwDLSssCbEYU";
25-
2623
const deviceId = '1f4ced70-53ad-4b29-b221-1b0abbdfc757';
2724
const thingId = '2cea8542-d472-4464-859c-4ef4dfc7d1d3';
2825
const propertyIntName = 'integer';
@@ -41,7 +38,7 @@ describe('Test the library basic functionalities', () => {
4138
it('ArduinoCloud connection', (done) => {
4239
/* global token */
4340
ArduinoCloud.connect({
44-
clientId, clientSecret,
41+
token,
4542
onDisconnect: (message) => {
4643
if (message.errorCode !== 0) {
4744
throw Error(message);
@@ -57,7 +54,7 @@ describe('Test the library basic functionalities', () => {
5754

5855
describe("when connected", () => {
5956
beforeEach((done) => {
60-
ArduinoCloud.connect({ clientId, clientSecret }).then(() => done());
57+
ArduinoCloud.connect({ token }).then(() => done());
6158
})
6259

6360
it('Property name must be a string in sendProperty', (done) => {

‎test/cbor-cloudprotocolv2.test.js

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -39,136 +39,136 @@ describe('Test CBOR encoding using CloudProtocol v2', () => {
3939
it('[CloudProtocol v2] Generate a valid cbor for a senml string property with basename', () => {
4040
const output = '0x81,0xA4,0x61,0x30,0x6B,0x74,0x65,0x73,0x74,0x5F,0x73,0x74,0x72,0x69,0x6E,0x67,0x61,0x33,0x71,0x74,0x65,0x73,0x74,0x5F,0x73,0x74,0x72,0x69,0x6E,0x67,0x20,0x76,0x61,0x6C,0x75,0x65,0x62,0x2D,0x33,0x1A,0x5B,0x98,0xD7,0x80,0x62,0x2D,0x32,0x78,0x2D,0x75,0x72,0x6E,0x3A,0x75,0x75,0x69,0x64,0x3A,0x31,0x66,0x34,0x63,0x65,0x64,0x37,0x30,0x2D,0x35,0x33,0x61,0x64,0x2D,0x34,0x62,0x32,0x39,0x2D,0x62,0x32,0x32,0x31,0x2D,0x31,0x62,0x30,0x61,0x62,0x62,0x64,0x66,0x63,0x37,0x35,0x37,';
4141
const senMl = CBOR.getSenML('test_string', 'test_string value', timestamp, true, deviceId);
42-
console.log([senMl]);
42+
// console.log([senMl]);
4343
const cborbase64 = CBOR.toString([senMl]);
44-
console.log(cborbase64);
44+
// console.log(cborbase64);
4545
const cborHex = base64toHEX(cborbase64);
46-
console.log(cborHex);
46+
// console.log(cborHex);
4747
expect(cborHex).toStrictEqual(output);
4848
});
4949

5050
it('[CloudProtocol v2] Generate a valid cbor for a senml string property without basename', () => {
5151
const output = '0x81,0xA3,0x61,0x30,0x6B,0x74,0x65,0x73,0x74,0x5F,0x73,0x74,0x72,0x69,0x6E,0x67,0x61,0x33,0x71,0x74,0x65,0x73,0x74,0x5F,0x73,0x74,0x72,0x69,0x6E,0x67,0x20,0x76,0x61,0x6C,0x75,0x65,0x62,0x2D,0x33,0x1A,0x5B,0x98,0xD7,0x80,';
5252
const senMl = CBOR.getSenML('test_string', 'test_string value', timestamp, true);
53-
console.log([senMl]);
53+
// console.log([senMl]);
5454
const cborbase64 = CBOR.toString([senMl]);
55-
console.log(cborbase64);
55+
// console.log(cborbase64);
5656
const cborHex = base64toHEX(cborbase64);
57-
console.log(cborHex);
57+
// console.log(cborHex);
5858
expect(cborHex).toStrictEqual(output);
5959
});
6060

6161

6262
it('[CloudProtocol v2] Generate a valid cbor for a senml unsigned int property with basename', () => {
6363
const output = '0x81,0xA4,0x61,0x30,0x69,0x74,0x65,0x73,0x74,0x5F,0x75,0x69,0x6E,0x74,0x61,0x32,0x03,0x62,0x2D,0x33,0x1A,0x5B,0x98,0xD7,0x80,0x62,0x2D,0x32,0x78,0x2D,0x75,0x72,0x6E,0x3A,0x75,0x75,0x69,0x64,0x3A,0x31,0x66,0x34,0x63,0x65,0x64,0x37,0x30,0x2D,0x35,0x33,0x61,0x64,0x2D,0x34,0x62,0x32,0x39,0x2D,0x62,0x32,0x32,0x31,0x2D,0x31,0x62,0x30,0x61,0x62,0x62,0x64,0x66,0x63,0x37,0x35,0x37,';
6464
const senMl = CBOR.getSenML('test_uint', 3, timestamp, true, deviceId);
65-
console.log([senMl]);
65+
// console.log([senMl]);
6666
const cborbase64 = CBOR.toString([senMl]);
67-
console.log(cborbase64);
67+
// console.log(cborbase64);
6868
const cborHex = base64toHEX(cborbase64);
69-
console.log(cborHex);
69+
// console.log(cborHex);
7070
expect(cborHex).toStrictEqual(output);
7171
});
7272

7373

7474
it('[CloudProtocol v2] Generate a valid cbor for a senml unsigned int property without basename', () => {
7575
const output = '0x81,0xA3,0x61,0x30,0x69,0x74,0x65,0x73,0x74,0x5F,0x75,0x69,0x6E,0x74,0x61,0x32,0x03,0x62,0x2D,0x33,0x1A,0x5B,0x98,0xD7,0x80,';
7676
const senMl = CBOR.getSenML('test_uint', 3, timestamp, true);
77-
console.log([senMl]);
77+
// console.log([senMl]);
7878
const cborbase64 = CBOR.toString([senMl]);
79-
console.log(cborbase64);
79+
// console.log(cborbase64);
8080
const cborHex = base64toHEX(cborbase64);
81-
console.log(cborHex);
81+
// console.log(cborHex);
8282
expect(cborHex).toStrictEqual(output);
8383
});
8484

8585
it('[CloudProtocol v2] Generate a valid cbor for a senml signed int property with basename', () => {
8686
const output = '0x81,0xA4,0x61,0x30,0x69,0x74,0x65,0x73,0x74,0x5F,0x73,0x69,0x6E,0x74,0x61,0x32,0x22,0x62,0x2D,0x33,0x1A,0x5B,0x98,0xD7,0x80,0x62,0x2D,0x32,0x78,0x2D,0x75,0x72,0x6E,0x3A,0x75,0x75,0x69,0x64,0x3A,0x31,0x66,0x34,0x63,0x65,0x64,0x37,0x30,0x2D,0x35,0x33,0x61,0x64,0x2D,0x34,0x62,0x32,0x39,0x2D,0x62,0x32,0x32,0x31,0x2D,0x31,0x62,0x30,0x61,0x62,0x62,0x64,0x66,0x63,0x37,0x35,0x37,';
8787
const senMl = CBOR.getSenML('test_sint', -3, timestamp, true, deviceId);
88-
console.log([senMl]);
88+
// console.log([senMl]);
8989
const cborbase64 = CBOR.toString([senMl]);
90-
console.log(cborbase64);
90+
// console.log(cborbase64);
9191
const cborHex = base64toHEX(cborbase64);
92-
console.log(cborHex);
92+
// console.log(cborHex);
9393
expect(cborHex).toStrictEqual(output);
9494
});
9595

9696
it('[CloudProtocol v2] Generate a valid cbor for a senml signed int property without basename', () => {
9797
const output = '0x81,0xA3,0x61,0x30,0x69,0x74,0x65,0x73,0x74,0x5F,0x73,0x69,0x6E,0x74,0x61,0x32,0x22,0x62,0x2D,0x33,0x1A,0x5B,0x98,0xD7,0x80,';
9898
const senMl = CBOR.getSenML('test_sint', -3, timestamp, true);
99-
console.log([senMl]);
99+
// console.log([senMl]);
100100
const cborbase64 = CBOR.toString([senMl]);
101-
console.log(cborbase64);
101+
// console.log(cborbase64);
102102
const cborHex = base64toHEX(cborbase64);
103-
console.log(cborHex);
103+
// console.log(cborHex);
104104
expect(cborHex).toStrictEqual(output);
105105
});
106106

107107

108108
it('[CloudProtocol v2] Generate a valid cbor for a senml float property with basename', () => {
109109
const output = '0x81,0xA4,0x61,0x30,0x6A,0x74,0x65,0x73,0x74,0x5F,0x66,0x6C,0x6F,0x61,0x74,0x61,0x32,0xFB,0x40,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x62,0x2D,0x33,0x1A,0x5B,0x98,0xD7,0x80,0x62,0x2D,0x32,0x78,0x2D,0x75,0x72,0x6E,0x3A,0x75,0x75,0x69,0x64,0x3A,0x31,0x66,0x34,0x63,0x65,0x64,0x37,0x30,0x2D,0x35,0x33,0x61,0x64,0x2D,0x34,0x62,0x32,0x39,0x2D,0x62,0x32,0x32,0x31,0x2D,0x31,0x62,0x30,0x61,0x62,0x62,0x64,0x66,0x63,0x37,0x35,0x37,';
110110
const senMl = CBOR.getSenML('test_float', 3.5, timestamp, true, deviceId);
111-
console.log([senMl]);
111+
// console.log([senMl]);
112112
const cborbase64 = CBOR.toString([senMl]);
113-
console.log(cborbase64);
113+
// console.log(cborbase64);
114114
const cborHex = base64toHEX(cborbase64);
115-
console.log(cborHex);
115+
// console.log(cborHex);
116116
expect(cborHex).toStrictEqual(output);
117117
});
118118

119119
it('[CloudProtocol v2] Generate a valid cbor for a senml float property without basename', () => {
120120
const output = '0x81,0xA3,0x61,0x30,0x6A,0x74,0x65,0x73,0x74,0x5F,0x66,0x6C,0x6F,0x61,0x74,0x61,0x32,0xFB,0x40,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x62,0x2D,0x33,0x1A,0x5B,0x98,0xD7,0x80,';
121121
const senMl = CBOR.getSenML('test_float', 3.5, timestamp, true);
122-
console.log([senMl]);
122+
// console.log([senMl]);
123123
const cborbase64 = CBOR.toString([senMl]);
124-
console.log(cborbase64);
124+
// console.log(cborbase64);
125125
const cborHex = base64toHEX(cborbase64);
126-
console.log(cborHex);
126+
// console.log(cborHex);
127127
expect(cborHex).toStrictEqual(output);
128128
});
129129

130130

131131
it('[CloudProtocol v2] Generate a valid cbor for a senml double property with basename', () => {
132132
const output = '0x81,0xA4,0x61,0x30,0x6B,0x74,0x65,0x73,0x74,0x5F,0x64,0x6F,0x75,0x62,0x6C,0x65,0x61,0x32,0xFB,0x40,0x08,0xFC,0xD6,0xE9,0xBA,0x37,0xB3,0x62,0x2D,0x33,0x1A,0x5B,0x98,0xD7,0x80,0x62,0x2D,0x32,0x78,0x2D,0x75,0x72,0x6E,0x3A,0x75,0x75,0x69,0x64,0x3A,0x31,0x66,0x34,0x63,0x65,0x64,0x37,0x30,0x2D,0x35,0x33,0x61,0x64,0x2D,0x34,0x62,0x32,0x39,0x2D,0x62,0x32,0x32,0x31,0x2D,0x31,0x62,0x30,0x61,0x62,0x62,0x64,0x66,0x63,0x37,0x35,0x37,';
133133
const senMl = CBOR.getSenML('test_double', 3.1234567890123456, timestamp, true, deviceId);
134-
console.log([senMl]);
134+
// console.log([senMl]);
135135
const cborbase64 = CBOR.toString([senMl]);
136-
console.log(cborbase64);
136+
// console.log(cborbase64);
137137
const cborHex = base64toHEX(cborbase64);
138-
console.log(cborHex);
138+
// console.log(cborHex);
139139
expect(cborHex).toStrictEqual(output);
140140
});
141141

142142
it('[CloudProtocol v2] Generate a valid cbor for a senml double property without basename', () => {
143143
const output = '0x81,0xA3,0x61,0x30,0x6B,0x74,0x65,0x73,0x74,0x5F,0x64,0x6F,0x75,0x62,0x6C,0x65,0x61,0x32,0xFB,0x40,0x08,0xFC,0xD6,0xE9,0xBA,0x37,0xB3,0x62,0x2D,0x33,0x1A,0x5B,0x98,0xD7,0x80,';
144144
const senMl = CBOR.getSenML('test_double', 3.1234567890123456, timestamp, true);
145-
console.log([senMl]);
145+
// console.log([senMl]);
146146
const cborbase64 = CBOR.toString([senMl]);
147-
console.log(cborbase64);
147+
// console.log(cborbase64);
148148
const cborHex = base64toHEX(cborbase64);
149-
console.log(cborHex);
149+
// console.log(cborHex);
150150
expect(cborHex).toStrictEqual(output);
151151
});
152152

153153
it('[CloudProtocol v2] Generate a valid cbor for a senml boolean property with basename', () => {
154154
const output = '0x81,0xA4,0x61,0x30,0x69,0x74,0x65,0x73,0x74,0x5F,0x62,0x6F,0x6F,0x6C,0x61,0x34,0xF5,0x62,0x2D,0x33,0x1A,0x5B,0x98,0xD7,0x80,0x62,0x2D,0x32,0x78,0x2D,0x75,0x72,0x6E,0x3A,0x75,0x75,0x69,0x64,0x3A,0x31,0x66,0x34,0x63,0x65,0x64,0x37,0x30,0x2D,0x35,0x33,0x61,0x64,0x2D,0x34,0x62,0x32,0x39,0x2D,0x62,0x32,0x32,0x31,0x2D,0x31,0x62,0x30,0x61,0x62,0x62,0x64,0x66,0x63,0x37,0x35,0x37,';
155155
const senMl = CBOR.getSenML('test_bool', true, timestamp, true, deviceId);
156-
console.log([senMl]);
156+
// console.log([senMl]);
157157
const cborbase64 = CBOR.toString([senMl]);
158-
console.log(cborbase64);
158+
// console.log(cborbase64);
159159
const cborHex = base64toHEX(cborbase64);
160-
console.log(cborHex);
160+
// console.log(cborHex);
161161
expect(cborHex).toStrictEqual(output);
162162
});
163163

164164
it('[CloudProtocol v2] Generate a valid cbor for a senml boolean property without basename', () => {
165165
const output = '0x81,0xA3,0x61,0x30,0x69,0x74,0x65,0x73,0x74,0x5F,0x62,0x6F,0x6F,0x6C,0x61,0x34,0xF5,0x62,0x2D,0x33,0x1A,0x5B,0x98,0xD7,0x80,';
166166
const senMl = CBOR.getSenML('test_bool', true, timestamp, true);
167-
console.log([senMl]);
167+
// console.log([senMl]);
168168
const cborbase64 = CBOR.toString([senMl]);
169-
console.log(cborbase64);
169+
// console.log(cborbase64);
170170
const cborHex = base64toHEX(cborbase64);
171-
console.log(cborHex);
171+
// console.log(cborHex);
172172
expect(cborHex).toStrictEqual(output);
173173
});
174174

@@ -182,11 +182,11 @@ describe('Test CBOR encoding using CloudProtocol v2', () => {
182182
const senMlBool = CBOR.getSenML('test_bool', true, timestamp, true, deviceId);
183183
const senMlDouble = CBOR.getSenML('test_double', 1.79769e+308, timestamp, true, deviceId);
184184
const senMl = [senMlUInt, senMlSInt, senMlFloat, senMlString, senMlBool, senMlDouble];
185-
console.log(senMl);
185+
// console.log(senMl);
186186
const cborbase64 = CBOR.toString(senMl);
187-
console.log(cborbase64);
187+
// console.log(cborbase64);
188188
const cborHex = base64toHEX(cborbase64);
189-
console.log(cborHex);
189+
// console.log(cborHex);
190190
expect(cborHex).toStrictEqual(output);
191191
});
192192

@@ -200,11 +200,11 @@ describe('Test CBOR encoding using CloudProtocol v2', () => {
200200
const senMlBool = CBOR.getSenML('test_bool', true, timestamp, true);
201201
const senMlDouble = CBOR.getSenML('test_double', 1.79769e+308, timestamp, true);
202202
const senMl = [senMlUInt, senMlSInt, senMlFloat, senMlString, senMlBool, senMlDouble];
203-
console.log(senMl);
203+
// console.log(senMl);
204204
const cborbase64 = CBOR.toString(senMl);
205-
console.log(cborbase64);
205+
// console.log(cborbase64);
206206
const cborHex = base64toHEX(cborbase64);
207-
console.log(cborHex);
207+
// console.log(cborHex);
208208
expect(cborHex).toStrictEqual(output);
209209
});
210210
});

0 commit comments

Comments
 (0)