merge audio and video tests in a single file for adaptive algorithm

src/voip/qosanalyzer.h

@@ -60,9 +60,9 @@ extern "C" {
 	} rtcpstatspoint_t;
 
 	typedef enum _MSStatefulQosAnalyserBurstState{
-		MSStatefulQosAnalyserBurstEnable,
-		MSStatefulQosAnalyserBurstInProgress,
 		MSStatefulQosAnalyserBurstDisable,
+		MSStatefulQosAnalyserBurstInProgress,
+		MSStatefulQosAnalyserBurstEnable,
 	}MSStatefulQosAnalyserBurstState;
 
 	typedef struct _MSStatefulQosAnalyser{

tester/Makefile.am

@@ -13,8 +13,7 @@ mediastreamer2_tester_SOURCES=	\
 								mediastreamer2_tester_private.c mediastreamer2_tester_private.h \
 								mediastreamer2_basic_audio_tester.c \
 								mediastreamer2_sound_card_tester.c \
-								mediastreamer2_audio_stream_tester.c \
-								mediastreamer2_video_stream_tester.c \
+								mediastreamer2_adaptive_tester.c \
 								mediastreamer2_framework_tester.c
 
 

tester/mediastreamer2_tester.c

@@ -149,8 +149,7 @@ const char * mediastreamer2_tester_test_name(const char *suite_name, int test_in
 void mediastreamer2_tester_init(void) {
 	add_test_suite(&basic_audio_test_suite);
 	add_test_suite(&sound_card_test_suite);
-	add_test_suite(&audio_stream_test_suite);
-	add_test_suite(&video_stream_test_suite);
+	add_test_suite(&adaptive_test_suite);
 	add_test_suite(&framework_test_suite);
 }
 

tester/mediastreamer2_tester.h

@@ -49,10 +49,13 @@ extern "C" {
 
 extern test_suite_t basic_audio_test_suite;
 extern test_suite_t sound_card_test_suite;
-extern test_suite_t audio_stream_test_suite;
-extern test_suite_t video_stream_test_suite;
+extern test_suite_t adaptive_test_suite;
 extern test_suite_t framework_test_suite;
 
+#define CU_ASSERT_IN_RANGE(value, inf, sup) \
+		printf(#value ": %f <= ? %f <= ? %f\n", (double)inf, (double)value, (double)sup); \
+		CU_ASSERT_TRUE(value >= inf); \
+		CU_ASSERT_TRUE(value <= sup);
 
 
 bool_t wait_for_list(MSList* mss,int* counter,int value,int timeout_ms);