Skip to content

Commit 692fabd

Browse files
cjbjcjbj
committed
Refactor tests
1 parent 6db9e8a commit 692fabd

File tree

9 files changed

+1675
-3419
lines changed

9 files changed

+1675
-3419
lines changed

‎test/aq1.js

Lines changed: 73 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
'use strict';
2727

2828
const oracledb = require('oracledb');
29-
const should = require('should');
29+
const assert = require('assert');
3030
const dbconfig = require('./dbconfig.js');
3131
const testsUtil = require('./testsUtil.js');
3232

@@ -49,17 +49,15 @@ describe('217. aq1.js', function() {
4949
this.skip();
5050
return;
5151
} else {
52-
try {
53-
await testsUtil.createAQtestUser(AQ_USER, AQ_USER_PWD);
54-
55-
let credential = {
56-
user: AQ_USER,
57-
password: AQ_USER_PWD,
58-
connectString: dbconfig.connectString
59-
};
60-
conn = await oracledb.getConnection(credential);
52+
await testsUtil.createAQtestUser(AQ_USER, AQ_USER_PWD);
53+
let credential = {
54+
user: AQ_USER,
55+
password: AQ_USER_PWD,
56+
connectString: dbconfig.connectString
57+
};
58+
conn = await oracledb.getConnection(credential);
6159

62-
let plsql = `
60+
let plsql = `
6361
BEGIN
6462
DBMS_AQADM.CREATE_QUEUE_TABLE(
6563
QUEUE_TABLE => '${AQ_USER}.${RAW_TABLE}',
@@ -74,11 +72,7 @@ describe('217. aq1.js', function() {
7472
);
7573
END;
7674
`;
77-
await conn.execute(plsql);
78-
79-
} catch (err) {
80-
should.not.exist(err);
81-
}
75+
await conn.execute(plsql);
8276
}
8377

8478
}); // before()
@@ -87,103 +81,86 @@ describe('217. aq1.js', function() {
8781
if (!isRunnable) {
8882
return;
8983
} else {
90-
try {
91-
await conn.close();
92-
await testsUtil.dropAQtestUser(AQ_USER);
93-
} catch (err) {
94-
should.not.exist(err);
95-
}
84+
await conn.close();
85+
await testsUtil.dropAQtestUser(AQ_USER);
9686
}
9787
}); // after()
9888

9989
it('217.1 examples/aqraw.js', async () => {
10090

101-
try {
102-
// Enqueue
103-
const queue1 = await conn.getQueue(rawQueueName);
104-
const messageString = 'This is my message';
105-
await queue1.enqOne(messageString);
106-
await conn.commit();
107-
108-
// Dequeue
109-
const queue2 = await conn.getQueue(rawQueueName);
110-
const msg = await queue2.deqOne();
111-
await conn.commit();
91+
// Enqueue
92+
const queue1 = await conn.getQueue(rawQueueName);
93+
const messageString = 'This is my message';
94+
await queue1.enqOne(messageString);
95+
await conn.commit();
11296

113-
should.exist(msg);
114-
should.strictEqual(msg.payload.toString(), messageString);
97+
// Dequeue
98+
const queue2 = await conn.getQueue(rawQueueName);
99+
const msg = await queue2.deqOne();
100+
await conn.commit();
115101

116-
} catch (err) {
117-
should.not.exist(err);
118-
}
102+
assert(msg);
103+
assert.strictEqual(msg.payload.toString(), messageString);
119104

120105
}); // 217.1
121106

122107
it('217.2 examples/aqoptions.js', async () => {
123-
try {
124-
/* Enqueue */
125-
let queue1 = await conn.getQueue(rawQueueName);
126-
127-
// Send a message immediately without requiring a commit
128-
queue1.enqOptions.visibility = oracledb.AQ_VISIBILITY_IMMEDIATE;
129-
130-
const messageString = 'This is my other message';
131-
const message = {
132-
payload: messageString, // the message itself
133-
expiration: 10 // seconds the message will remain in the queue if not dequeued
134-
};
135-
await queue1.enqOne(message);
136-
137-
/* Dequeue */
138-
let queue2 = await conn.getQueue(rawQueueName);
139-
Object.assign(
140-
queue2.deqOptions,
141-
{
142-
visibility: oracledb.AQ_VISIBILITY_IMMEDIATE, // Change the visibility so no explicit commit is required
143-
wait: 25 // seconds it will wait if there are no messages
144-
}
145-
);
146-
const msg = await queue2.deqOne();
147-
if (msg) {
148-
should.strictEqual(msg.payload.toString(), messageString);
108+
/* Enqueue */
109+
let queue1 = await conn.getQueue(rawQueueName);
110+
111+
// Send a message immediately without requiring a commit
112+
queue1.enqOptions.visibility = oracledb.AQ_VISIBILITY_IMMEDIATE;
113+
114+
const messageString = 'This is my other message';
115+
const message = {
116+
payload: messageString, // the message itself
117+
expiration: 10 // seconds the message will remain in the queue if not dequeued
118+
};
119+
await queue1.enqOne(message);
120+
121+
/* Dequeue */
122+
let queue2 = await conn.getQueue(rawQueueName);
123+
Object.assign(
124+
queue2.deqOptions,
125+
{
126+
visibility: oracledb.AQ_VISIBILITY_IMMEDIATE, // Change the visibility so no explicit commit is required
127+
wait: 25 // seconds it will wait if there are no messages
149128
}
150-
151-
} catch (err) {
152-
should.not.exist(err);
129+
);
130+
const msg = await queue2.deqOne();
131+
if (msg) {
132+
assert.strictEqual(msg.payload.toString(), messageString);
153133
}
134+
154135
}); // 217.2
155136

156137
it('217.3 examples/aqmulti.js', async () => {
157-
try {
158-
/* Enqueue */
159-
let queue1 = await conn.getQueue(rawQueueName);
160-
queue1.enqOptions.visibility = oracledb.AQ_VISIBILITY_IMMEDIATE;
161-
162-
const messages1 = [
163-
"Message 1",
164-
"Message 2",
165-
{
166-
expiration: 10,
167-
payload: "Message 3"
168-
},
169-
"Message 4"
170-
];
171-
await queue1.enqMany(messages1);
172-
173-
/* Dequeue */
174-
const queue2 = await conn.getQueue(rawQueueName);
175-
queue2.enqOptions.visibility = oracledb.AQ_VISIBILITY_IMMEDIATE;
176-
177-
const messages2 = await queue2.deqMany(5); // get at most 5 messages
178-
if (messages2) {
179-
should.strictEqual(messages2.length, messages1.length);
180-
should.strictEqual(messages2[0].payload.toString(), messages1[0]);
181-
should.strictEqual(messages2[3].payload.toString(), messages1[3]);
182-
should.strictEqual(messages2[2].expiration, 10);
183-
}
184138

185-
} catch (err) {
186-
should.not.exist(err);
139+
/* Enqueue */
140+
let queue1 = await conn.getQueue(rawQueueName);
141+
queue1.enqOptions.visibility = oracledb.AQ_VISIBILITY_IMMEDIATE;
142+
143+
const messages1 = [
144+
"Message 1",
145+
"Message 2",
146+
{
147+
expiration: 10,
148+
payload: "Message 3"
149+
},
150+
"Message 4"
151+
];
152+
await queue1.enqMany(messages1);
153+
154+
/* Dequeue */
155+
const queue2 = await conn.getQueue(rawQueueName);
156+
queue2.enqOptions.visibility = oracledb.AQ_VISIBILITY_IMMEDIATE;
157+
158+
const messages2 = await queue2.deqMany(5); // get at most 5 messages
159+
if (messages2) {
160+
assert.strictEqual(messages2.length, messages1.length);
161+
assert.strictEqual(messages2[0].payload.toString(), messages1[0]);
162+
assert.strictEqual(messages2[3].payload.toString(), messages1[3]);
163+
assert.strictEqual(messages2[2].expiration, 10);
187164
}
188165
}); // 217.3
189166
});

0 commit comments

Comments
 (0)