From 90bf38853ba1616ebbe2b527a3dcfd833763562f Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 23 Jun 2015 11:15:15 +0200
Subject: [PATCH] LinphoneTester: add "All" suite to launch... all tests :-)

---
 LinphoneTester/DetailViewController.m | 69 +++++++++++++++++----------
 LinphoneTester/MasterViewController.m | 12 ++---
 submodules/belle-sip                  |  2 +-
 3 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/LinphoneTester/DetailViewController.m b/LinphoneTester/DetailViewController.m
index 3b18339e7..c2aaf1eaa 100644
--- a/LinphoneTester/DetailViewController.m
+++ b/LinphoneTester/DetailViewController.m
@@ -62,21 +62,34 @@ static NSString* const kAllTestsName = @"Run All tests";
     }        
 }
 
+- (void)addTestsFromSuite:(NSString *)suite {
+	int count = bc_tester_nb_tests([suite UTF8String]);
+
+	for (int i = 0; i < count; i++) {
+		const char *test_name = bc_tester_test_name([suite UTF8String], i);
+		NSString *testName = [NSString stringWithUTF8String:test_name];
+		TestItem *item = [[TestItem alloc] initWithName:testName fromSuite:suite];
+		[_tests addObject:item];
+	}
+}
+
 - (void)configureView
 {
-    const char* suite = [self.detailItem UTF8String];
-    if( suite == NULL ) return;
-    NSString* nssuite = [NSString stringWithUTF8String:suite];
-    int count = bc_tester_nb_tests(suite);
-    _tests = [[NSMutableArray alloc] initWithCapacity:count];
-    
-    [_tests addObject:[TestItem testWithName:kAllTestsName fromSuite:nssuite]];
-    
-    for (int i=0; i<count; i++) {
-        const char* test_name = bc_tester_test_name(suite, i);
-        TestItem* item = [[TestItem alloc] initWithName:[NSString stringWithUTF8String:test_name] fromSuite:nssuite];
-        [_tests addObject:item];
-    }
+	_tests = [[NSMutableArray alloc] initWithCapacity:0];
+	if (self.detailItem == nil) {
+		return;
+	}
+
+	[_tests
+		addObject:[TestItem testWithName:kAllTestsName fromSuite:self.detailItem]]; // suite name not used for this one
+
+	if ([self.detailItem isEqualToString:@"All"]) {
+		for (int i = 0; i < bc_tester_nb_suites(); i++) {
+			[self addTestsFromSuite:[NSString stringWithUTF8String:bc_tester_suite_name(i)]];
+		}
+	} else {
+		[self addTestsFromSuite:self.detailItem];
+	}
 }
 
 - (void)viewDidLoad
@@ -108,17 +121,25 @@ static NSString* const kAllTestsName = @"Run All tests";
     UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"testCellIdentifier" forIndexPath:indexPath];
 
     TestItem *test = _tests[indexPath.row];
-    cell.textLabel.text = test.name;
-    NSString* image = nil;
-    switch( test.state ){
-        case TestStateIdle: image = nil; break;
-        case TestStatePassed: image = @"test_passed"; break;
-        case TestStateInProgress: image = @"test_inprogress"; break;
-        case TestStateFailed: image = @"test_failed"; break;
-    }
-    if(image){
-        image = [[NSBundle mainBundle] pathForResource:image ofType:@"png"];
-        cell.imageView.image = [UIImage imageWithContentsOfFile:image];
+	cell.textLabel.text = [NSString stringWithFormat:@"%@/%@", test.suite, test.name];
+	NSString *image = nil;
+	switch (test.state) {
+	case TestStateIdle:
+		image = nil;
+		break;
+	case TestStatePassed:
+		image = @"test_passed";
+		break;
+	case TestStateInProgress:
+		image = @"test_inprogress";
+		break;
+	case TestStateFailed:
+		image = @"test_failed";
+		break;
+	}
+	if (image) {
+		image = [[NSBundle mainBundle] pathForResource:image ofType:@"png"];
+		cell.imageView.image = [UIImage imageWithContentsOfFile:image];
 	} else {
 		[cell.imageView setImage:nil];
 	}
diff --git a/LinphoneTester/MasterViewController.m b/LinphoneTester/MasterViewController.m
index e106b6292..0bae72436 100644
--- a/LinphoneTester/MasterViewController.m
+++ b/LinphoneTester/MasterViewController.m
@@ -79,12 +79,12 @@ static void linphone_log_function(OrtpLogLevel lev, const char *fmt, va_list arg
     LSLog(@"Document path: %@", documentPath);
 
     int count = bc_tester_nb_suites();
-    _objects = [[NSMutableArray alloc] initWithCapacity:count];
-    for (int i=0; i<count; i++) {
-        const char* suite = bc_tester_suite_name(i);
-        [_objects addObject:[NSString stringWithUTF8String:suite]];
-    }
-
+	_objects = [[NSMutableArray alloc] initWithCapacity:count + 1];
+	[_objects addObject:@"All"];
+	for (int i = 0; i < count; i++) {
+		const char *suite = bc_tester_suite_name(i);
+		[_objects addObject:[NSString stringWithUTF8String:suite]];
+	}
 }
 
 - (void)displayLogs {
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 7780031ed..dd2d1ca8b 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 7780031ed6742e6653c3718ed506c851d129f86f
+Subproject commit dd2d1ca8b3f56044f9ff85f0647184204ae382b2