Merge "Revert "Temporary disable tests failing tests for O""
This commit is contained in:
commit
b88602af08
1 changed files with 15 additions and 13 deletions
|
@ -743,15 +743,11 @@ TEST_IO_STREAM(
|
|||
"Check that the stream frame count == the one it was opened with",
|
||||
ASSERT_EQ(audioConfig.frameCount, extract(stream->getFrameCount())))
|
||||
|
||||
TEST_IO_STREAM(
|
||||
GetSampleRate,
|
||||
"Check that the stream sample rate == the one it was opened with",
|
||||
stream->getSampleRate())
|
||||
TEST_IO_STREAM(GetSampleRate, "Check that the stream sample rate == the one it was opened with",
|
||||
ASSERT_EQ(audioConfig.sampleRateHz, extract(stream->getSampleRate())))
|
||||
|
||||
TEST_IO_STREAM(
|
||||
GetChannelMask,
|
||||
"Check that the stream channel mask == the one it was opened with",
|
||||
stream->getChannelMask())
|
||||
TEST_IO_STREAM(GetChannelMask, "Check that the stream channel mask == the one it was opened with",
|
||||
ASSERT_EQ(audioConfig.channelMask, extract(stream->getChannelMask())))
|
||||
|
||||
TEST_IO_STREAM(GetFormat,
|
||||
"Check that the stream format == the one it was opened with",
|
||||
|
@ -853,17 +849,23 @@ TEST_IO_STREAM(
|
|||
areAudioPatchesSupported() ? doc::partialTest("Audio patches are supported")
|
||||
: testSetDevice(stream.get(), address))
|
||||
|
||||
static void testGetAudioProperties(IStream* stream) {
|
||||
static void testGetAudioProperties(IStream* stream, AudioConfig expectedConfig) {
|
||||
uint32_t sampleRateHz;
|
||||
AudioChannelMask mask;
|
||||
AudioFormat format;
|
||||
|
||||
stream->getAudioProperties(returnIn(sampleRateHz, mask, format));
|
||||
|
||||
// FIXME: the qcom hal it does not currently negotiate the sampleRate &
|
||||
// channel mask
|
||||
EXPECT_EQ(expectedConfig.sampleRateHz, sampleRateHz);
|
||||
EXPECT_EQ(expectedConfig.channelMask, mask);
|
||||
EXPECT_EQ(expectedConfig.format, format);
|
||||
}
|
||||
|
||||
TEST_IO_STREAM(
|
||||
GetAudioProperties,
|
||||
"Check that the stream audio properties == the ones it was opened with",
|
||||
testGetAudioProperties(stream.get()))
|
||||
TEST_IO_STREAM(GetAudioProperties,
|
||||
"Check that the stream audio properties == the ones it was opened with",
|
||||
testGetAudioProperties(stream.get(), audioConfig))
|
||||
|
||||
static void testConnectedState(IStream* stream) {
|
||||
DeviceAddress address = {};
|
||||
|
|
Loading…
Reference in a new issue