Skip to content
Snippets Groups Projects
Commit aa7b6967 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

[#4137] Fix audio unit tests

parent 75b682f4
No related branches found
No related tags found
No related merge requests found
...@@ -42,13 +42,24 @@ void AudioLayerTest::testAudioLayerConfig() ...@@ -42,13 +42,24 @@ void AudioLayerTest::testAudioLayerConfig()
{ {
_debug ("-------------------- AudioLayerTest::testAudioLayerConfig --------------------\n"); _debug ("-------------------- AudioLayerTest::testAudioLayerConfig --------------------\n");
// int sampling_rate = Manager::instance().audioPreference.getSmplrate(); CPPUNIT_ASSERT( Manager::instance().audioPreference.getSmplrate() == 44100);
// int frame_size = Manager::instance().audioPreference.getFramesize(); CPPUNIT_ASSERT( Manager::instance().audioPreference.getFramesize() == 20);
// int layer = Manager::instance().getAudioDriver()->getLayerType(); CPPUNIT_ASSERT( Manager::instance().getAudioDriver()->getLayerType() == PULSEAUDIO);
// alsa preferences
CPPUNIT_ASSERT( Manager::instance().audioPreference.getCardin() == 0);
CPPUNIT_ASSERT( Manager::instance().audioPreference.getCardout() == 0);
CPPUNIT_ASSERT( Manager::instance().audioPreference.getCardring() == 0);
CPPUNIT_ASSERT( Manager::instance().audioPreference.getPlugin() == "default");
// if (layer != ALSA) // pulseaudio preferences
// Manager::instance().switchAudioManager(); CPPUNIT_ASSERT( Manager::instance().audioPreference.getDevicePlayback() == "alsa_output.pci-0000_00_1b.0.analog-stereo");
CPPUNIT_ASSERT( Manager::instance().audioPreference.getDeviceRecord() == "alsa_input.pci-0000_00_1b.0.analog-stereo");
CPPUNIT_ASSERT( Manager::instance().audioPreference.getDeviceRingtone() == "alsa_output.pci-0000_00_1b.0.analog-stereo");
CPPUNIT_ASSERT( Manager::instance().audioPreference.getVolumemic() == 100);
CPPUNIT_ASSERT( Manager::instance().audioPreference.getVolumespkr() == 100);
// TODO: Fix tests // TODO: Fix tests
//CPPUNIT_ASSERT ( (int) Manager::instance().getAudioDriver()->getSampleRate() == sampling_rate); //CPPUNIT_ASSERT ( (int) Manager::instance().getAudioDriver()->getSampleRate() == sampling_rate);
...@@ -82,8 +93,10 @@ void AudioLayerTest::testPulseConnect() ...@@ -82,8 +93,10 @@ void AudioLayerTest::testPulseConnect()
{ {
_debug ("-------------------- AudioLayerTest::testPulseConnect --------------------\n"); _debug ("-------------------- AudioLayerTest::testPulseConnect --------------------\n");
if (Manager::instance().getAudioDriver()->getLayerType() == ALSA) if (Manager::instance().getAudioDriver()->getLayerType() == ALSA) {
return; Manager::instance().switchAudioManager();
usleep (100000);
}
ManagerImpl* manager; ManagerImpl* manager;
manager = &Manager::instance(); manager = &Manager::instance();
...@@ -113,35 +126,14 @@ void AudioLayerTest::testPulseConnect() ...@@ -113,35 +126,14 @@ void AudioLayerTest::testPulseConnect()
_debug ("Exception occured wile opening device! "); _debug ("Exception occured wile opening device! ");
} }
usleep (100000); sleep (1);
CPPUNIT_ASSERT (_pulselayer->getPlaybackStream() == NULL); CPPUNIT_ASSERT (_pulselayer->getPlaybackStream() == NULL);
CPPUNIT_ASSERT (_pulselayer->getRecordStream() == NULL); CPPUNIT_ASSERT (_pulselayer->getRecordStream() == NULL);
_debug ("-------------------------- \n");
_pulselayer->startStream(); _pulselayer->startStream();
CPPUNIT_ASSERT (_pulselayer->getPlaybackStream()->pulseStream() != NULL); CPPUNIT_ASSERT (_pulselayer->getPlaybackStream()->pulseStream() != NULL);
CPPUNIT_ASSERT (_pulselayer->getPlaybackStream()->pulseStream() != NULL); CPPUNIT_ASSERT (_pulselayer->getRecordStream()->pulseStream() != NULL);
// Must return No error "PA_OK" == 1
CPPUNIT_ASSERT (_pulselayer->getPlaybackStream()->getStreamState() == 1);
CPPUNIT_ASSERT (_pulselayer->getRecordStream()->getStreamState() == 1);
CPPUNIT_ASSERT (_pulselayer->getPlaybackStream()->disconnectStream() == true);
CPPUNIT_ASSERT (_pulselayer->getRecordStream()->disconnectStream() == true);
CPPUNIT_ASSERT (_pulselayer->getPlaybackStream()->connectStream (NULL) == true);
CPPUNIT_ASSERT (_pulselayer->getRecordStream()->connectStream (NULL) == true);
CPPUNIT_ASSERT (_pulselayer->getPlaybackStream()->getStreamState() == 1);
CPPUNIT_ASSERT (_pulselayer->getRecordStream()->getStreamState() == 1);
CPPUNIT_ASSERT (_pulselayer->getPlaybackStream()->connectStream (NULL) == true);
CPPUNIT_ASSERT (_pulselayer->getRecordStream()->connectStream (NULL) == true);
CPPUNIT_ASSERT (_pulselayer->getPlaybackStream()->getStreamState() == 1);
CPPUNIT_ASSERT (_pulselayer->getRecordStream()->getStreamState() == 1);
CPPUNIT_ASSERT (_pulselayer->disconnectAudioStream() == true);
} }
...@@ -54,7 +54,7 @@ preferences: ...@@ -54,7 +54,7 @@ preferences:
historyMaxCalls: 20 historyMaxCalls: 20
md5Hash: false md5Hash: false
notifyMails: false notifyMails: false
order: Account:1285192081/Account:1285184087/Account:1285182355/ order: Account:1285257971/Account:1285253592/Account:1285252571/Account:1285251984/Account:1285251811/Account:1285251597/Account:1285192081/Account:1285184087/Account:1285182355/
portNum: 5060 portNum: 5060
registrationExpire: 180 registrationExpire: 180
searchBarDisplay: true searchBarDisplay: true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment