Skip to content

Commit

Permalink
JavaScript Ice/ami test cleanup (#3075)
Browse files Browse the repository at this point in the history
  • Loading branch information
@pepone
pepone authored Nov 6, 2024
1 parent 0a98be2 commit 4bf5007
Showing 1 changed file with 31 additions and 55 deletions.
86 changes: 31 additions & 55 deletions js/test/Ice/ami/Client.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,11 @@ export class Client extends TestHelper {
const communicator = this.communicator();
const out = this.getWriter();

let sref = "test:" + this.getTestEndpoint();
let obj = communicator.stringToProxy(sref);
test(obj !== null);
const p = Test.TestIntfPrx.uncheckedCast(obj);

sref = "testController:" + this.getTestEndpoint(1);
obj = communicator.stringToProxy(sref);
test(obj !== null);
const testController = Test.TestIntfControllerPrx.uncheckedCast(obj);
const p = new Test.TestIntfPrx(communicator, `test:${this.getTestEndpoint()}`);
const testController = new Test.TestIntfControllerPrx(
communicator,
`testController:${this.getTestEndpoint(1)}`,
);

out.write("testing batch requests with proxy... ");
{
Expand Down Expand Up @@ -49,7 +45,7 @@ export class Client extends TestHelper {
test(await p.waitForBatch(2));
}

if ((await p.ice_getConnection()) !== null) {
{
test((await p.opBatchCount()) == 0);
let connection = await p.ice_getConnection();
const b1 = new Test.TestIntfPrx(connection.createProxy(p.ice_getIdentity()).ice_batchOneway());
Expand All @@ -68,13 +64,10 @@ export class Client extends TestHelper {

out.write("testing batch requests with communicator... ");
{
//
// Async task - 1 connection.
//
test((await p.opBatchCount()) === 0);
const b1 = Test.TestIntfPrx.uncheckedCast(
await p.ice_getConnection().then((c) => c.createProxy(p.ice_getIdentity()).ice_batchOneway()),
);
const connection = await p.ice_getConnection();
const b1 = new Test.TestIntfPrx(connection.createProxy(p.ice_getIdentity()).ice_batchOneway());
await b1.opBatch();
await b1.opBatch();

Expand All @@ -83,34 +76,25 @@ export class Client extends TestHelper {
}

{
//
// Async task exception - 1 connection.
//
test((await p.opBatchCount()) === 0);
const b1 = Test.TestIntfPrx.uncheckedCast(
await p.ice_getConnection().then((c) => c.createProxy(p.ice_getIdentity()).ice_batchOneway()),
);
const connection = await p.ice_getConnection();
const b1 = new Test.TestIntfPrx(connection.createProxy(p.ice_getIdentity()).ice_batchOneway());
await b1.opBatch();
await b1.ice_getConnection().then((c) => c.close());
await connection.close();

await communicator.flushBatchRequests();
test((await p.opBatchCount()) == 0);
}

{
//
// Async task - 2 connections.
//
test((await p.opBatchCount()) === 0);
const b1 = Test.TestIntfPrx.uncheckedCast(
await p.ice_getConnection().then((c) => c.createProxy(p.ice_getIdentity()).ice_batchOneway()),
);
const b2 = Test.TestIntfPrx.uncheckedCast(
await p
.ice_connectionId("2")
.ice_getConnection()
.then((c) => c.createProxy(p.ice_getIdentity()).ice_batchOneway()),
);
const connection1 = await p.ice_getConnection();
const b1 = new Test.TestIntfPrx(connection1.createProxy(p.ice_getIdentity()).ice_batchOneway());

const connection2 = await p.ice_connectionId("2").ice_getConnection();
const b2 = new Test.TestIntfPrx(connection2.createProxy(p.ice_getIdentity()).ice_batchOneway());

await b2.ice_getConnection(); // Ensure connection is established.
await b1.opBatch();
Expand All @@ -123,26 +107,21 @@ export class Client extends TestHelper {
}

{
//
// AsyncResult exception - 2 connections - 1 failure.
//
// All connections should be flushed even if there are failures on some connections.
// Exceptions should not be reported.
//
test((await p.opBatchCount()) === 0);
const b1 = Test.TestIntfPrx.uncheckedCast(
await p.ice_getConnection().then((c) => c.createProxy(p.ice_getIdentity()).ice_batchOneway()),
);
const b2 = Test.TestIntfPrx.uncheckedCast(
await p
.ice_connectionId("2")
.ice_getConnection()
.then((c) => c.createProxy(p.ice_getIdentity()).ice_batchOneway()),
);
const connection1 = await p.ice_getConnection();
const b1 = new Test.TestIntfPrx(connection1.createProxy(p.ice_getIdentity()).ice_batchOneway());

const connection2 = await p.ice_connectionId("2").ice_getConnection();
const b2 = new Test.TestIntfPrx(connection2.createProxy(p.ice_getIdentity()).ice_batchOneway());

await b2.ice_getConnection(); // Ensure connection is established.
await b1.opBatch();
await b2.opBatch();
await b1.ice_getConnection().then((c) => c.close());
await connection1.close();

await communicator.flushBatchRequests();
test(await p.waitForBatch(1));
Expand All @@ -155,20 +134,17 @@ export class Client extends TestHelper {
// The sent callback should be invoked even if all connections fail.
//
test((await p.opBatchCount()) == 0);
const b1 = Test.TestIntfPrx.uncheckedCast(
await p.ice_getConnection().then((c) => c.createProxy(p.ice_getIdentity()).ice_batchOneway()),
);
const b2 = Test.TestIntfPrx.uncheckedCast(
await p
.ice_connectionId("2")
.ice_getConnection()
.then((c) => c.createProxy(p.ice_getIdentity()).ice_batchOneway()),
);
const connection1 = await p.ice_getConnection();
const b1 = new Test.TestIntfPrx(connection1.createProxy(p.ice_getIdentity()).ice_batchOneway());

const connection2 = await p.ice_connectionId("2").ice_getConnection();
const b2 = new Test.TestIntfPrx(connection2.createProxy(p.ice_getIdentity()).ice_batchOneway());

await b2.ice_getConnection(); // Ensure connection is established.
await b1.opBatch();
await b2.opBatch();
await b1.ice_getConnection().then((c) => c.close());
await b2.ice_getConnection().then((c) => c.close());
await connection1.close();
await connection2.close();

await communicator.flushBatchRequests();
test((await p.opBatchCount()) === 0);
Expand Down

0 comments on commit 4bf5007

Please sign in to comment.