LiblinphoneTester: remove old code

ringmail · Jun 15, 2016 · 5a03a6b · 5a03a6b
1 parent 13a798f
commit 5a03a6b
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 94 deletions.
diff --git a/LiblinphoneTester/DetailTableView.m b/LiblinphoneTester/DetailTableView.m
@@ -8,7 +8,6 @@
 
 #import "DetailTableView.h"
 #import "MasterView.h"
-#import "LogsView.h"
 #include "linphone/liblinphone_tester.h"
 #import "Log.h"
 

diff --git a/LiblinphoneTester/LogsView.h b/LiblinphoneTester/LogsView.h
diff --git a/LiblinphoneTester/LogsView.m b/LiblinphoneTester/LogsView.m
diff --git a/LiblinphoneTester/MasterView.h b/LiblinphoneTester/MasterView.h
@@ -8,9 +8,6 @@
 
 #import <UIKit/UIKit.h>
 
-extern NSMutableArray *lastLogs;
-extern NSString *const kLogsUpdateNotification;
-
 @class DetailTableView;
 
 @interface MasterView : UITableViewController

diff --git a/LiblinphoneTester/MasterView.m b/LiblinphoneTester/MasterView.m
@@ -7,7 +7,6 @@
 //
 
 #import "MasterView.h"
-#import "LogsView.h"
 #import "DetailTableView.h"
 
 #include "linphone/liblinphone_tester.h"
@@ -31,16 +30,8 @@ - (void)awakeFromNib {
 	[super awakeFromNib];
 }
 
-NSMutableArray *lastLogs = nil;
-NSMutableArray *logsBuffer = nil;
-static int const kLastLogsCapacity = 5000;
-static int const kLogsBufferCapacity = 10;
-NSString *const kLogsUpdateNotification = @"kLogsUpdateNotification";
-
 - (void)setupLogging {
-	lastLogs = [[NSMutableArray alloc] initWithCapacity:kLastLogsCapacity];
-	logsBuffer = [NSMutableArray arrayWithCapacity:kLogsBufferCapacity];
-	[Log enableLogs:ORTP_DEBUG];
+	[Log enableLogs:0];
 	linphone_core_enable_log_collection(NO);
 }
 

diff --git a/TestsLiblinphone/LinphoneTester_Tests.m b/TestsLiblinphone/LinphoneTester_Tests.m
@@ -14,16 +14,10 @@
 #import "Log.h"
 
 @interface LinphoneTester_Tests : XCTestCase
-@property(retain, nonatomic) NSString *bundlePath;
-@property(retain, nonatomic) NSString *documentPath;
 @end
 
 @implementation LinphoneTester_Tests
 
-+ (NSArray *)skippedSuites {
-	return @[ @"Flexisip" ];
-}
-
 + (NSString *)safetyTestString:(NSString *)testString {
 	NSCharacterSet *charactersToRemove = [[NSCharacterSet alphanumericCharacterSet] invertedSet];
 	return [[testString componentsSeparatedByCharactersInSet:charactersToRemove] componentsJoinedByString:@"_"];
@@ -40,8 +34,6 @@ + (void)initialize {
 			NSString *sSuite = [NSString stringWithUTF8String:suite];
 			NSString *sTest = [NSString stringWithUTF8String:test];
 
-			if ([[LinphoneTester_Tests skippedSuites] containsObject:sSuite])
-				continue;
 			// prepend "test_" so that it gets found by introspection
 			NSString *safesTest = [self safetyTestString:sTest];
 			NSString *safesSuite = [self safetyTestString:sSuite];

diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
@@ -51,7 +51,6 @@
 		63058A281B4E821E00EFAE36 /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 63058A151B4E821E00EFAE36 /* Main_iPad.storyboard */; };
 		63058A291B4E821E00EFAE36 /* Main_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 63058A171B4E821E00EFAE36 /* Main_iPhone.storyboard */; };
 		63058A2A1B4E821E00EFAE36 /* DetailTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63058A1A1B4E821E00EFAE36 /* DetailTableView.m */; };
-		63058A2C1B4E821E00EFAE36 /* LogsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63058A1F1B4E821E00EFAE36 /* LogsView.m */; };
 		63058A2D1B4E821E00EFAE36 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 63058A201B4E821E00EFAE36 /* main.m */; };
 		63058A2E1B4E821E00EFAE36 /* MasterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63058A221B4E821E00EFAE36 /* MasterView.m */; };
 		63058A2F1B4E821E00EFAE36 /* TesterImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 63058A231B4E821E00EFAE36 /* TesterImages.xcassets */; };
@@ -951,8 +950,6 @@
 		63058A1B1B4E821E00EFAE36 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		63058A1C1B4E821E00EFAE36 /* LinphoneTester-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "LinphoneTester-Info.plist"; sourceTree = "<group>"; };
 		63058A1D1B4E821E00EFAE36 /* LinphoneTester-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "LinphoneTester-Prefix.pch"; sourceTree = "<group>"; };
-		63058A1E1B4E821E00EFAE36 /* LogsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogsView.h; sourceTree = "<group>"; };
-		63058A1F1B4E821E00EFAE36 /* LogsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogsView.m; sourceTree = "<group>"; };
 		63058A201B4E821E00EFAE36 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		63058A211B4E821E00EFAE36 /* MasterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MasterView.h; sourceTree = "<group>"; };
 		63058A221B4E821E00EFAE36 /* MasterView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MasterView.m; sourceTree = "<group>"; };
@@ -2302,8 +2299,6 @@
 				63058A1A1B4E821E00EFAE36 /* DetailTableView.m */,
 				63058A1C1B4E821E00EFAE36 /* LinphoneTester-Info.plist */,
 				63058A1D1B4E821E00EFAE36 /* LinphoneTester-Prefix.pch */,
-				63058A1E1B4E821E00EFAE36 /* LogsView.h */,
-				63058A1F1B4E821E00EFAE36 /* LogsView.m */,
 				63058A201B4E821E00EFAE36 /* main.m */,
 				63058A211B4E821E00EFAE36 /* MasterView.h */,
 				63058A221B4E821E00EFAE36 /* MasterView.m */,
@@ -3894,7 +3889,6 @@
 				63058A241B4E821E00EFAE36 /* AppDelegate.m in Sources */,
 				63058A2A1B4E821E00EFAE36 /* DetailTableView.m in Sources */,
 				63058A2E1B4E821E00EFAE36 /* MasterView.m in Sources */,
-				63058A2C1B4E821E00EFAE36 /* LogsView.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/submodules/linphone b/submodules/linphone