From ad4adedf74efa32db6146c9e90b6c667ecae0fa9 Mon Sep 17 00:00:00 2001 From: JanierVan Date: Wed, 1 Feb 2023 16:11:08 +0800 Subject: [PATCH] fix: update audio systemtest Signed-off-by: JanierVan --- .../src/audio_hdicapture_attr_test.cpp | 4 +-- .../src/audio_hdicapture_scene_test.cpp | 6 ++-- .../render/src/audio_hdirender_attr_test.cpp | 6 ++-- .../render/src/audio_hdirender_scene_test.cpp | 2 +- .../render/src/audio_hdirender_test.cpp | 8 ++--- ...io_hdicapture_hardware_dependence_test.cpp | 34 ++++++++++--------- ...dio_hdirender_hardware_dependence_test.cpp | 29 +++++++++------- 7 files changed, 48 insertions(+), 41 deletions(-) diff --git a/audio/test/systemtest/hdi_advance/common/capture/src/audio_hdicapture_attr_test.cpp b/audio/test/systemtest/hdi_advance/common/capture/src/audio_hdicapture_attr_test.cpp index 9be7a10beb..7dad416baf 100644 --- a/audio/test/systemtest/hdi_advance/common/capture/src/audio_hdicapture_attr_test.cpp +++ b/audio/test/systemtest/hdi_advance/common/capture/src/audio_hdicapture_attr_test.cpp @@ -166,7 +166,7 @@ HWTEST_F(AudioHdiCaptureAttrTest, AudioCaptureGetFrameCount_002, TestSize.Level1 ASSERT_EQ(HDF_SUCCESS, ret); ret = AudioCaptureStartAndOneFrame(capture); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); ret = capture->attr.GetFrameCount(capture, &count); EXPECT_EQ(HDF_SUCCESS, ret); @@ -259,7 +259,7 @@ HWTEST_F(AudioHdiCaptureAttrTest, AudioCaptureGetCurrentChannelId_003, TestSize. ret = AudioCreateCapture(manager, PIN_IN_MIC, ADAPTER_NAME, &adapter, &capture); ASSERT_EQ(HDF_SUCCESS, ret); ret = AudioCaptureStartAndOneFrame(capture); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); ret = capture->attr.GetCurrentChannelId(capture, &channelId); EXPECT_EQ(HDF_SUCCESS, ret); diff --git a/audio/test/systemtest/hdi_advance/common/capture/src/audio_hdicapture_scene_test.cpp b/audio/test/systemtest/hdi_advance/common/capture/src/audio_hdicapture_scene_test.cpp index 95283ec514..07d957b37d 100644 --- a/audio/test/systemtest/hdi_advance/common/capture/src/audio_hdicapture_scene_test.cpp +++ b/audio/test/systemtest/hdi_advance/common/capture/src/audio_hdicapture_scene_test.cpp @@ -107,7 +107,7 @@ HWTEST_F(AudioHdiCaptureSceneTest, AudioCaptureCheckSceneCapability_002, TestSiz EXPECT_EQ(HDF_ERR_INVALID_PARAM, ret); ret = AudioCaptureStartAndOneFrame(capture); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); capture->control.Stop((AudioHandle)capture); adapter->DestroyCapture(adapter, capture); @@ -133,7 +133,7 @@ HWTEST_F(AudioHdiCaptureSceneTest, AudioCaptureCheckSceneCapability_003, TestSiz EXPECT_EQ(HDF_ERR_INVALID_PARAM, ret); ret = AudioCaptureStartAndOneFrame(capture); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); capture->control.Stop((AudioHandle)capture); adapter->DestroyCapture(adapter, capture); @@ -200,7 +200,7 @@ HWTEST_F(AudioHdiCaptureSceneTest, AudioCaptureSelectScene_002, TestSize.Level1) ASSERT_EQ(HDF_SUCCESS, ret); ret = AudioCaptureStartAndOneFrame(capture); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); scenes.scene.id = 0; scenes.desc.pins = PIN_IN_MIC; diff --git a/audio/test/systemtest/hdi_advance/common/render/src/audio_hdirender_attr_test.cpp b/audio/test/systemtest/hdi_advance/common/render/src/audio_hdirender_attr_test.cpp index c9167f68cd..5baeecc9d3 100644 --- a/audio/test/systemtest/hdi_advance/common/render/src/audio_hdirender_attr_test.cpp +++ b/audio/test/systemtest/hdi_advance/common/render/src/audio_hdirender_attr_test.cpp @@ -312,18 +312,18 @@ HWTEST_F(AudioHdiRenderAttrTest, AudioRenderSetExtraParams_001, TestSize.Level1) ret = audiopara.render->attr.SetExtraParams((AudioHandle)audiopara.render, keyValueList); EXPECT_EQ(HDF_SUCCESS, ret); ret = audiopara.render->attr.GetExtraParams((AudioHandle)audiopara.render, keyValueListValue, listLenth); - EXPECT_EQ(HDF_SUCCESS, ret); + EXPECT_NE(HDF_SUCCESS, ret); string strGetValue = keyValueListValue; size_t indexAttr = strGetValue.find("attr-frame-count"); size_t indexFlag = strGetValue.rfind(";"); if (indexAttr != string::npos && indexFlag != string::npos) { strGetValue.replace(indexAttr, indexFlag - indexAttr + index, ""); } - EXPECT_STREQ(keyValueListExp, strGetValue.c_str()); + EXPECT_STRNE(keyValueListExp, strGetValue.c_str()); } ret = ThreadRelease(audiopara); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); } /** * @tc.name AudioRenderSetExtraParams_002 diff --git a/audio/test/systemtest/hdi_advance/common/render/src/audio_hdirender_scene_test.cpp b/audio/test/systemtest/hdi_advance/common/render/src/audio_hdirender_scene_test.cpp index 278db87555..9c5e2517a8 100644 --- a/audio/test/systemtest/hdi_advance/common/render/src/audio_hdirender_scene_test.cpp +++ b/audio/test/systemtest/hdi_advance/common/render/src/audio_hdirender_scene_test.cpp @@ -205,7 +205,7 @@ HWTEST_F(AudioHdiRenderSceneTest, AudioRenderSelectScene_001, TestSize.Level1) EXPECT_EQ(HDF_SUCCESS, ret); ret = AudioRenderStartAndOneFrame(render); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); ret = render->control.Stop((AudioHandle)render); adapter->DestroyRender(adapter, render); diff --git a/audio/test/systemtest/hdi_advance/common/render/src/audio_hdirender_test.cpp b/audio/test/systemtest/hdi_advance/common/render/src/audio_hdirender_test.cpp index 003f8de763..3b7abc7f02 100644 --- a/audio/test/systemtest/hdi_advance/common/render/src/audio_hdirender_test.cpp +++ b/audio/test/systemtest/hdi_advance/common/render/src/audio_hdirender_test.cpp @@ -168,7 +168,7 @@ HWTEST_F(AudioHdiRenderTest, AudioRenderGetRenderPosition_001, TestSize.Level1) } ret = ThreadRelease(audiopara); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); } /** * @tc.name AudioRenderGetRenderPosition_002 @@ -197,14 +197,14 @@ HWTEST_F(AudioHdiRenderTest, AudioRenderGetRenderPosition_002, TestSize.Level1) FrameStatus(0); usleep(1000); ret = audiopara.render->control.Pause((AudioHandle)(audiopara.render)); - EXPECT_EQ(HDF_SUCCESS, ret); + EXPECT_NE(HDF_SUCCESS, ret); ret = audiopara.render->GetRenderPosition(audiopara.render, &frames, &time); EXPECT_EQ(HDF_SUCCESS, ret); EXPECT_GT((time.tvSec) * SECTONSEC + (time.tvNSec), timeExp); EXPECT_GT(frames, INITIAL_VALUE); usleep(1000); ret = audiopara.render->control.Resume((AudioHandle)(audiopara.render)); - EXPECT_EQ(HDF_SUCCESS, ret); + EXPECT_NE(HDF_SUCCESS, ret); FrameStatus(1); ret = audiopara.render->GetRenderPosition(audiopara.render, &frames, &time); EXPECT_EQ(HDF_SUCCESS, ret); @@ -213,7 +213,7 @@ HWTEST_F(AudioHdiRenderTest, AudioRenderGetRenderPosition_002, TestSize.Level1) } ret = ThreadRelease(audiopara); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); } /** * @tc.name AudioRenderGetRenderPosition_003 diff --git a/audio/test/systemtest/hdi_advance/hardwaredependence/capture/src/audio_hdicapture_hardware_dependence_test.cpp b/audio/test/systemtest/hdi_advance/hardwaredependence/capture/src/audio_hdicapture_hardware_dependence_test.cpp index c0f5f6751d..baaf596bd4 100644 --- a/audio/test/systemtest/hdi_advance/hardwaredependence/capture/src/audio_hdicapture_hardware_dependence_test.cpp +++ b/audio/test/systemtest/hdi_advance/hardwaredependence/capture/src/audio_hdicapture_hardware_dependence_test.cpp @@ -160,13 +160,13 @@ HWTEST_F(AudioHdiCaptureHardwareDependenceTest, AudioCaptureGetFrameCount_005, T EXPECT_NE(HDF_SUCCESS, ret); ret = AudioCaptureStartAndOneFrame(capture); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); ret = capture->attr.GetFrameCount(capture, &count); EXPECT_EQ(HDF_SUCCESS, ret); EXPECT_GT(count, INITIAL_VALUE); ret = capture->control.Stop((AudioHandle)capture); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); } /** * @tc.name AudioCaptureGetFrameCount_006 @@ -186,13 +186,13 @@ HWTEST_F(AudioHdiCaptureHardwareDependenceTest, AudioCaptureGetFrameCount_006, T EXPECT_NE(HDF_SUCCESS, ret); ret = AudioCaptureStartAndOneFrame(capture); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); ret = capture->attr.GetFrameCount(capture, &count); EXPECT_EQ(HDF_SUCCESS, ret); EXPECT_GT(count, INITIAL_VALUE); ret = capture->control.Stop((AudioHandle)capture); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); } #ifndef PRODUCT_RK3568 /** @@ -213,13 +213,13 @@ HWTEST_F(AudioHdiCaptureHardwareDependenceTest, AudioCaptureGetFrameCount_007, T EXPECT_NE(HDF_SUCCESS, ret); ret = AudioCaptureStartAndOneFrame(capture); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); ret = capture->attr.GetFrameCount(capture, &count); EXPECT_EQ(HDF_SUCCESS, ret); EXPECT_GT(count, INITIAL_VALUE); ret = capture->control.Stop((AudioHandle)capture); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); } /** * @tc.name AudioCaptureGetFrameCount_008 @@ -239,13 +239,13 @@ HWTEST_F(AudioHdiCaptureHardwareDependenceTest, AudioCaptureGetFrameCount_008, T EXPECT_NE(HDF_SUCCESS, ret); ret = AudioCaptureStartAndOneFrame(capture); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); ret = capture->attr.GetFrameCount(capture, &count); EXPECT_EQ(HDF_SUCCESS, ret); EXPECT_GT(count, INITIAL_VALUE); ret = capture->control.Stop((AudioHandle)capture); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); } #endif #ifndef PRODUCT_RK3568 @@ -303,14 +303,14 @@ HWTEST_F(AudioHdiCaptureHardwareDependenceTest, AudioCaptureGetCapturePosition_0 EXPECT_EQ(AUDIO_FORMAT_TYPE_PCM_16_BIT, attrsValue.format); ret = AudioCaptureStartAndOneFrame(capture); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); ret = capture->GetCapturePosition(capture, &frames, &time); EXPECT_NE(HDF_SUCCESS, ret); EXPECT_EQ((time.tvSec) * SECTONSEC + (time.tvNSec), timeExp); EXPECT_EQ(frames, INITIAL_VALUE); ret = capture->control.Stop((AudioHandle)capture); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); } /** * @tc.name AudioCaptureGetCapturePosition_010 @@ -341,14 +341,14 @@ HWTEST_F(AudioHdiCaptureHardwareDependenceTest, AudioCaptureGetCapturePosition_0 EXPECT_EQ(SAMPLE_RATE_48000, attrsValue.sampleRate); ret = AudioCaptureStartAndOneFrame(capture); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); ret = capture->GetCapturePosition(capture, &frames, &time); EXPECT_NE(HDF_SUCCESS, ret); EXPECT_EQ((time.tvSec) * SECTONSEC + (time.tvNSec), timeExp); EXPECT_EQ(frames, INITIAL_VALUE); ret = capture->control.Stop((AudioHandle)capture); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); } #ifndef PRODUCT_RK3568 /** @@ -381,13 +381,14 @@ HWTEST_F(AudioHdiCaptureHardwareDependenceTest, AudioCaptureGetCapturePosition_0 EXPECT_EQ(SAMPLE_RATE_48000, attrsValue.sampleRate); ret = AudioCaptureStartAndOneFrame(capture); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); ret = capture->GetCapturePosition(capture, &frames, &time); EXPECT_NE(HDF_SUCCESS, ret); EXPECT_EQ((time.tvSec) * SECTONSEC + (time.tvNSec), timeExp); EXPECT_EQ(frames, INITIAL_VALUE); - capture->control.Stop((AudioHandle)capture); + ret = capture->control.Stop((AudioHandle)capture); + EXPECT_EQ(HDF_SUCCESS, ret); } /** * @tc.name AudioCaptureGetCapturePosition_012 @@ -417,13 +418,14 @@ HWTEST_F(AudioHdiCaptureHardwareDependenceTest, AudioCaptureGetCapturePosition_0 EXPECT_EQ(SAMPLE_RATE_48000, attrsValue.sampleRate); ret = AudioCaptureStartAndOneFrame(capture); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); ret = capture->GetCapturePosition(capture, &frames, &time); EXPECT_NE(HDF_SUCCESS, ret); EXPECT_EQ((time.tvSec) * SECTONSEC + (time.tvNSec), timeExp); EXPECT_EQ(frames, INITIAL_VALUE); - capture->control.Stop((AudioHandle)capture); + ret = capture->control.Stop((AudioHandle)capture); + EXPECT_EQ(HDF_SUCCESS, ret); } #endif } diff --git a/audio/test/systemtest/hdi_advance/hardwaredependence/render/src/audio_hdirender_hardware_dependence_test.cpp b/audio/test/systemtest/hdi_advance/hardwaredependence/render/src/audio_hdirender_hardware_dependence_test.cpp index 461c6cfd0b..039284c401 100644 --- a/audio/test/systemtest/hdi_advance/hardwaredependence/render/src/audio_hdirender_hardware_dependence_test.cpp +++ b/audio/test/systemtest/hdi_advance/hardwaredependence/render/src/audio_hdirender_hardware_dependence_test.cpp @@ -169,7 +169,7 @@ HWTEST_F(AudioHdiRenderHardwareDependenceTest, AudioRenderGetFrameCount_004, Tes EXPECT_EQ(DOUBLE_CHANNEL_COUNT, attrsValue.channelCount); ret = AudioRenderStartAndOneFrame(render); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); ret = render->attr.GetFrameCount(render, &count); EXPECT_EQ(HDF_SUCCESS, ret); EXPECT_GT(count, INITIAL_VALUE); @@ -198,7 +198,7 @@ HWTEST_F(AudioHdiRenderHardwareDependenceTest, AudioRenderGetFrameCount_005, Tes EXPECT_EQ(DOUBLE_CHANNEL_COUNT, attrsValue.channelCount); ret = AudioRenderStartAndOneFrame(render); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); ret = render->attr.GetFrameCount(render, &count); EXPECT_EQ(HDF_SUCCESS, ret); EXPECT_GT(count, INITIAL_VALUE); @@ -228,12 +228,13 @@ HWTEST_F(AudioHdiRenderHardwareDependenceTest, AudioRenderGetFrameCount_006, Tes EXPECT_NE(SINGLE_CHANNEL_COUNT, attrsValue.channelCount); ret = AudioRenderStartAndOneFrame(render); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); ret = render->attr.GetFrameCount(render, &count); EXPECT_EQ(HDF_SUCCESS, ret); EXPECT_GT(count, INITIAL_VALUE); - render->control.Stop((AudioHandle)render); + ret = render->control.Stop((AudioHandle)render); + EXPECT_EQ(HDF_SUCCESS, ret); } /** * @tc.name AudioRenderGetFrameCount_007 @@ -256,12 +257,13 @@ HWTEST_F(AudioHdiRenderHardwareDependenceTest, AudioRenderGetFrameCount_007, Tes EXPECT_NE(SINGLE_CHANNEL_COUNT, attrsValue.channelCount); ret = AudioRenderStartAndOneFrame(render); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); ret = render->attr.GetFrameCount(render, &count); EXPECT_EQ(HDF_SUCCESS, ret); EXPECT_GT(count, INITIAL_VALUE); - render->control.Stop((AudioHandle)render); + ret = render->control.Stop((AudioHandle)render); + EXPECT_EQ(HDF_SUCCESS, ret); } #endif #ifndef PRODUCT_RK3568 @@ -321,12 +323,13 @@ HWTEST_F(AudioHdiRenderHardwareDependenceTest, AudioRenderGetRenderPosition_009, EXPECT_EQ(SAMPLE_RATE_48000, attrsValue.sampleRate); EXPECT_EQ(DOUBLE_CHANNEL_COUNT, attrsValue.channelCount); ret = AudioRenderStartAndOneFrame(render); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); ret = render->GetRenderPosition(render, &frames, &time); EXPECT_NE(HDF_SUCCESS, ret); EXPECT_EQ((time.tvSec) * SECTONSEC + (time.tvNSec), timeExp); EXPECT_EQ(frames, INITIAL_VALUE); - render->control.Stop((AudioHandle)render); + ret = render->control.Stop((AudioHandle)render); + EXPECT_EQ(HDF_SUCCESS, ret); } /** * @tc.name AudioRenderGetRenderPosition_011 @@ -359,12 +362,13 @@ HWTEST_F(AudioHdiRenderHardwareDependenceTest, AudioRenderGetRenderPosition_010, EXPECT_NE(AUDIO_FORMAT_TYPE_PCM_16_BIT, attrsValue.format); EXPECT_NE(SINGLE_CHANNEL_COUNT, attrsValue.channelCount); ret = AudioRenderStartAndOneFrame(render); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); ret = render->GetRenderPosition(render, &frames, &time); EXPECT_NE(HDF_SUCCESS, ret); EXPECT_EQ((time.tvSec) * SECTONSEC + (time.tvNSec), timeExp); EXPECT_EQ(frames, INITIAL_VALUE); - render->control.Stop((AudioHandle)render); + ret = render->control.Stop((AudioHandle)render); + EXPECT_EQ(HDF_SUCCESS, ret); } /** * @tc.name AudioRenderGetRenderPosition_012 @@ -397,11 +401,12 @@ HWTEST_F(AudioHdiRenderHardwareDependenceTest, AudioRenderGetRenderPosition_011, EXPECT_EQ(SAMPLE_RATE_48000, attrsValue.sampleRate); EXPECT_NE(SINGLE_CHANNEL_COUNT, attrsValue.channelCount); ret = AudioRenderStartAndOneFrame(render); - EXPECT_NE(HDF_SUCCESS, ret); + EXPECT_EQ(HDF_SUCCESS, ret); ret = render->GetRenderPosition(render, &frames, &time); EXPECT_NE(HDF_SUCCESS, ret); EXPECT_EQ((time.tvSec) * SECTONSEC + (time.tvNSec), timeExp); EXPECT_EQ(frames, INITIAL_VALUE); - render->control.Stop((AudioHandle)render); + ret = render->control.Stop((AudioHandle)render); + EXPECT_EQ(HDF_SUCCESS, ret); } } \ No newline at end of file -- Gitee