Skip to content

Commit 94d7357

Browse files
DmitryAstafyevDmitryAstafyev
committed
Rebase to master (update jasmine runners)
1 parent 6f6f78e commit 94d7357

File tree

1 file changed

+50
-66
lines changed

1 file changed

+50
-66
lines changed

‎application/apps/rustcore/ts-bindings/spec/session.protocol.spec.ts

+50-66
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
import { initLogger } from './logger';
77
initLogger();
88

9-
import { finish, runner } from './common';
9+
import { finish } from './common';
1010
import { readConfigurationFile } from './config';
11-
import { Session } from '../src/api/session';
1211

1312
import * as proto from 'protocol';
1413
import * as $ from 'platform/types/observe';
1514
import * as Types from '../src/protocol';
15+
import * as runners from './runners';
1616

1717
const config = readConfigurationFile().get().tests.protocol;
1818

1919
describe('Protocol', function () {
2020
it(config.regular.list[1], function () {
21-
return runner(config.regular, 1, async (logger, done, collector) => {
21+
return runners.noSession(config.regular, 1, async (logger, done) => {
2222
{
2323
let origin = Types.toObserveOptions({
2424
origin: { File: ['somefile', $.Types.File.FileType.Text, 'path_to_file'] },
@@ -54,69 +54,53 @@ describe('Protocol', function () {
5454
});
5555
});
5656
it(config.regular.list[2], function () {
57-
return runner(config.regular, 2, async (logger, done, collector) => {
58-
Session.create()
59-
.then((session: Session) => {
60-
// Set provider into debug mode
61-
session.debug(true);
62-
const MESSAGES_COUNT = 1000;
63-
{
64-
const meausere: { json: number; proto: number } = { json: 0, proto: 0 };
65-
meausere.json = Date.now();
66-
for (let i = MESSAGES_COUNT; i >= 0; i -= 1) {
67-
const msg = session.getNativeSession().testGrabElsAsJson(false);
68-
expect(msg instanceof Array).toBe(true);
69-
}
70-
meausere.json = Date.now() - meausere.json;
71-
meausere.proto = Date.now();
72-
for (let i = MESSAGES_COUNT; i >= 0; i -= 1) {
73-
const msg = session.getNativeSession().testGrabElsAsProto(false);
74-
expect(msg instanceof Array).toBe(true);
75-
}
76-
meausere.proto = Date.now() - meausere.proto;
77-
console.log(
78-
`Receiving messages (no decoding) count: ${MESSAGES_COUNT}\nJSON: ${
79-
meausere.json
80-
}ms (per msg ${(meausere.json / MESSAGES_COUNT).toFixed(2)});\nPROTO: ${
81-
meausere.proto
82-
}ms (per msg ${(meausere.proto / MESSAGES_COUNT).toFixed(2)})`,
83-
);
84-
}
85-
{
86-
const meausere: { json: number; proto: number } = { json: 0, proto: 0 };
87-
meausere.json = Date.now();
88-
for (let i = MESSAGES_COUNT; i >= 0; i -= 1) {
89-
const msg = session.getNativeSession().testGrabElsAsJson();
90-
expect(msg instanceof Array).toBe(true);
91-
}
92-
meausere.json = Date.now() - meausere.json;
93-
meausere.proto = Date.now();
94-
for (let i = MESSAGES_COUNT; i >= 0; i -= 1) {
95-
const msg = session.getNativeSession().testGrabElsAsProto();
96-
expect(msg instanceof Array).toBe(true);
97-
}
98-
meausere.proto = Date.now() - meausere.proto;
99-
console.log(
100-
`Grabbing messages (with decoding) count: ${MESSAGES_COUNT}\nJSON: ${
101-
meausere.json
102-
}ms (per msg ${(meausere.json / MESSAGES_COUNT).toFixed(2)});\nPROTO: ${
103-
meausere.proto
104-
}ms (per msg ${(meausere.proto / MESSAGES_COUNT).toFixed(2)})`,
105-
);
106-
}
107-
finish(session, done);
108-
})
109-
.catch((err: Error) => {
110-
finish(
111-
undefined,
112-
done,
113-
new Error(
114-
`Fail to create session due error: ${
115-
err instanceof Error ? err.message : err
116-
}`,
117-
),
118-
);
119-
});
57+
return runners.withSession(config.regular, 2, async (logger, done, comps) => {
58+
const MESSAGES_COUNT = 1000;
59+
{
60+
const meausere: { json: number; proto: number } = { json: 0, proto: 0 };
61+
meausere.json = Date.now();
62+
for (let i = MESSAGES_COUNT; i >= 0; i -= 1) {
63+
const msg = comps.session.getNativeSession().testGrabElsAsJson(false);
64+
expect(msg instanceof Array).toBe(true);
65+
}
66+
meausere.json = Date.now() - meausere.json;
67+
meausere.proto = Date.now();
68+
for (let i = MESSAGES_COUNT; i >= 0; i -= 1) {
69+
const msg = comps.session.getNativeSession().testGrabElsAsProto(false);
70+
expect(msg instanceof Array).toBe(true);
71+
}
72+
meausere.proto = Date.now() - meausere.proto;
73+
console.log(
74+
`Receiving messages (no decoding) count: ${MESSAGES_COUNT}\nJSON: ${
75+
meausere.json
76+
}ms (per msg ${(meausere.json / MESSAGES_COUNT).toFixed(2)});\nPROTO: ${
77+
meausere.proto
78+
}ms (per msg ${(meausere.proto / MESSAGES_COUNT).toFixed(2)})`,
79+
);
80+
}
81+
{
82+
const meausere: { json: number; proto: number } = { json: 0, proto: 0 };
83+
meausere.json = Date.now();
84+
for (let i = MESSAGES_COUNT; i >= 0; i -= 1) {
85+
const msg = comps.session.getNativeSession().testGrabElsAsJson();
86+
expect(msg instanceof Array).toBe(true);
87+
}
88+
meausere.json = Date.now() - meausere.json;
89+
meausere.proto = Date.now();
90+
for (let i = MESSAGES_COUNT; i >= 0; i -= 1) {
91+
const msg = comps.session.getNativeSession().testGrabElsAsProto();
92+
expect(msg instanceof Array).toBe(true);
93+
}
94+
meausere.proto = Date.now() - meausere.proto;
95+
console.log(
96+
`Grabbing messages (with decoding) count: ${MESSAGES_COUNT}\nJSON: ${
97+
meausere.json
98+
}ms (per msg ${(meausere.json / MESSAGES_COUNT).toFixed(2)});\nPROTO: ${
99+
meausere.proto
100+
}ms (per msg ${(meausere.proto / MESSAGES_COUNT).toFixed(2)})`,
101+
);
102+
}
103+
finish(comps.session, done);
120104
});
121105
});
122106
});

0 commit comments

Comments
 (0)