diff --git a/multimedia/audio/audio_js_standard/AudioRendererEnhance/src/main/ets/test/GetCurrentOutputDevices.test.ets b/multimedia/audio/audio_js_standard/AudioRendererEnhance/src/main/ets/test/GetCurrentOutputDevices.test.ets index bb5cddfb9c727c1bcd1df9fcaad658a13e84ab83..680046d3b4c6935f65df16e45d3761bc8a897995 100644 --- a/multimedia/audio/audio_js_standard/AudioRendererEnhance/src/main/ets/test/GetCurrentOutputDevices.test.ets +++ b/multimedia/audio/audio_js_standard/AudioRendererEnhance/src/main/ets/test/GetCurrentOutputDevices.test.ets @@ -137,10 +137,11 @@ export default function audioRendererTest() { it('SUB_MULTIMEDIA_AUDIO_RENDERER_GETCURRENTOUTPUTDEVICES_PROMISE_0100', 0, async function (done) { try { await audioRen.getCurrentOutputDevices().then((data) => { - console.info(`${TagFrmwkRender}: deviceRole:${data.deviceRole}, deviceType:${data.deviceType}, id:${data.id}, name:${data.name}, address:${data.address}, sampleRates:${data.sampleRates}, channelCounts:${data.channelCounts}, channelMasks:${data.channelMasks}`); - expect(data.deviceRole).assertEqual(audio.DeviceRole.OUTPUT_DEVICE); - expect(data.deviceType).assertEqual(audio.DeviceType.SPEAKER); - expect(data.id).assertEqual(env.OUTPUT_NUMBER_1); + console.info(`${TagFrmwkRender}: deviceRole:${data[0].deviceRole}, deviceType:${data[0].deviceType}, id:${data[0].id}, name:${data[0].name}, + address:${data[0].address}, sampleRates:${data[0].sampleRates}, channelCounts:${data[0].channelCounts}, channelMasks:${data[0].channelMasks}`); + expect(data[0].deviceRole).assertEqual(audio.DeviceRole.OUTPUT_DEVICE); + expect(data[0].deviceType).assertEqual(audio.DeviceType.SPEAKER); + expect(data[0].id).assertEqual(env.OUTPUT_NUMBER_1); done(); }).catch((error) => { console.log("${TagFrmwkRender}: getCurrentOutputDevices error = " + error); @@ -166,10 +167,11 @@ export default function audioRendererTest() { try { await renderPlay(); await audioRen.getCurrentOutputDevices().then((data) => { - console.info(`${TagFrmwkRender}: deviceRole:${data.deviceRole}, deviceType:${data.deviceType}, id:${data.id}, address:${data.address}, sampleRates:${data.sampleRates}, channelCounts:${data.channelCounts}, channelMasks:${data.channelMasks}`); - expect(data.deviceRole).assertEqual(audio.DeviceRole.OUTPUT_DEVICE); - expect(data.deviceType).assertEqual(audio.DeviceType.SPEAKER); - expect(data.id).assertEqual(env.OUTPUT_NUMBER_1); + console.info(`${TagFrmwkRender}: deviceRole:${data[0].deviceRole}, deviceType:${data[0].deviceType}, id:${data[0].id}, + address:${data[0].address}, sampleRates:${data[0].sampleRates}, channelCounts:${data[0].channelCounts}, channelMasks:${data[0].channelMasks}`); + expect(data[0].deviceRole).assertEqual(audio.DeviceRole.OUTPUT_DEVICE); + expect(data[0].deviceType).assertEqual(audio.DeviceType.SPEAKER); + expect(data[0].id).assertEqual(env.OUTPUT_NUMBER_1); console.info(`${TagFrmwkRender}: Renderer get current output device SUCCESS, now stop audiorender`); audioRen.drain().then(() => { console.info(`${TagFrmwkRender}: Renderer drain : SUCCESS, stop audiorender`); @@ -207,10 +209,11 @@ export default function audioRendererTest() { console.info(`${TagFrmwkRender}: getCurrentOutputDevices ERROR ! code: ${err.code}, mesage: ${err.message}`); expect(false).assertTrue(); } else { - console.info(`${TagFrmwkRender}: deviceRole:${data.deviceRole}, deviceType:${data.deviceType}, id:${data.id}, address:${data.address}, sampleRates:${data.sampleRates}, channelCounts:${data.channelCounts}, channelMasks:${data.channelMasks}`); - expect(data.deviceRole).assertEqual(audio.DeviceRole.OUTPUT_DEVICE); - expect(data.deviceType).assertEqual(audio.DeviceType.SPEAKER); - expect(data.id).assertEqual(env.OUTPUT_NUMBER_1); + console.info(`${TagFrmwkRender}: deviceRole:${data[0].deviceRole}, deviceType:${data[0].deviceType}, id:${data[0].id}, + address:${data[0].address}, sampleRates:${data[0].sampleRates}, channelCounts:${data[0].channelCounts}, channelMasks:${data[0].channelMasks}`); + expect(data[0].deviceRole).assertEqual(audio.DeviceRole.OUTPUT_DEVICE); + expect(data[0].deviceType).assertEqual(audio.DeviceType.SPEAKER); + expect(data[0].id).assertEqual(env.OUTPUT_NUMBER_1); done(); } }); @@ -232,10 +235,11 @@ export default function audioRendererTest() { expect(false).assertTrue(); done(); } else { - console.info(`${TagFrmwkRender}: getCurrentOutputDevices :deviceRole:${data.deviceRole}, deviceType:${data.deviceType}, id:${data.id}, address:${data.address}, sampleRates:${data.sampleRates}, channelCounts:${data.channelCounts}, channelMasks:${data.channelMasks}`); - expect(data.deviceRole).assertEqual(audio.DeviceRole.OUTPUT_DEVICE); - expect(data.deviceType).assertEqual(audio.DeviceType.SPEAKER); - expect(data.id).assertEqual(env.OUTPUT_NUMBER_1); + console.info(`${TagFrmwkRender}: getCurrentOutputDevices :deviceRole:${data[0].deviceRole}, deviceType:${data[0].deviceType}, id:${data[0].id}, + address:${data[0].address}, sampleRates:${data[0].sampleRates}, channelCounts:${data[0].channelCounts}, channelMasks:${data[0].channelMasks}`); + expect(data[0].deviceRole).assertEqual(audio.DeviceRole.OUTPUT_DEVICE); + expect(data[0].deviceType).assertEqual(audio.DeviceType.SPEAKER); + expect(data[0].id).assertEqual(env.OUTPUT_NUMBER_1); console.info(`${TagFrmwkRender}: Renderer getCurrentOutputDevices SUCCESS! now stop the audiorenderer`); audioRen.drain().then(() => { console.info(`${TagFrmwkRender}: Renderer drain, stop the audiorenderer`); diff --git a/multimedia/audio/audio_js_standard/AudioRendererEnhance/src/main/ets/test/GetUnderflowCount.test.ets b/multimedia/audio/audio_js_standard/AudioRendererEnhance/src/main/ets/test/GetUnderflowCount.test.ets index be15e3716c690f94bfa9763515ca9917606c90c0..82b333d8c5459f4f18c9a0eca1b206fd7d5f1402 100644 --- a/multimedia/audio/audio_js_standard/AudioRendererEnhance/src/main/ets/test/GetUnderflowCount.test.ets +++ b/multimedia/audio/audio_js_standard/AudioRendererEnhance/src/main/ets/test/GetUnderflowCount.test.ets @@ -173,7 +173,7 @@ export default function audioRendererTest() { await renderPlay(); await audioRen.getUnderflowCount().then((data) => { console.log(`getUnderflowCount :SUCCESS ${data}`); - expect(data).assertEqual(env.OUTPUT_NUMBER_2); + expect(data).assertLargerOrEqual(env.OUTPUT_NUMBER_1); audioRen.drain().then(() => { audioRen.stop().then(() => { done(); @@ -294,7 +294,7 @@ export default function audioRendererTest() { done(); } else { console.log(`getUnderflowCount :SUCCESS ${data}`); - expect(data).assertEqual(env.OUTPUT_NUMBER_2); + expect(data).assertLargerOrEqual(env.OUTPUT_NUMBER_1); audioRen.drain().then(() => { audioRen.stop().then(() => { done();