commit 47217364f541165b96344749fc18ccbb7bd8fb7c
author Peter Hanspers <peterhanspers@webrtc.org> Thu Oct 05 11:39:15 2017 +0200
committer Commit Bot <commit-bot@chromium.org> Mon Oct 23 12:33:17 2017 +0000
tree 8980b71ab01633f31c83c0f23d002b0a59b0f354
parent bd92d8dd2a593dd96d5289b4f9cfed08fabf611f

Adding a KVO context to avoid issues with future super/sub-classing.

Bug: webrtc:8342
Change-Id: I457858056ffc7f33bbfb261153301ea2ccd71a51
Reviewed-on: https://webrtc-review.googlesource.com/6440
Commit-Queue: Peter Hanspers <peterhanspers@webrtc.org>
Reviewed-by: Anders Carlsson <andersc@webrtc.org>
Reviewed-by: Daniela Jovanoska Petrenko <denicija@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20389}

sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm

diff --git a/sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm b/sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm
index d94c635..951b5ea 100644
--- a/sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm
+++ b/sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm
@@ -18,6 +18,22 @@
 #import "WebRTC/RTCAudioSession.h"
 #import "WebRTC/RTCAudioSessionConfiguration.h"
 
+@interface RTCAudioSession (UnitTesting)
+
+- (instancetype)initWithAudioSession:(id)audioSession;
+
+@end
+
+@interface MockAVAudioSession : NSObject
+
+@property (nonatomic, readwrite, assign) float outputVolume;
+
+@end
+
+@implementation MockAVAudioSession
+@synthesize outputVolume = _outputVolume;
+@end
+
 @interface RTCAudioSessionTestDelegate : NSObject <RTCAudioSessionDelegate>
 
 @property (nonatomic, readonly) float outputVolume;
@@ -265,20 +281,16 @@
 }
 
 - (void)testAudioVolumeDidNotify {
-  RTCAudioSession *session = [RTCAudioSession sharedInstance];
+  MockAVAudioSession *mockAVAudioSession = [[MockAVAudioSession alloc] init];
+  RTCAudioSession *session = [[RTCAudioSession alloc] initWithAudioSession:mockAVAudioSession];
   RTCAudioSessionTestDelegate *delegate =
       [[RTCAudioSessionTestDelegate alloc] init];
   [session addDelegate:delegate];
 
-  [session observeValueForKeyPath:@"outputVolume"
-                         ofObject:[AVAudioSession sharedInstance]
-                           change:
-        @{NSKeyValueChangeNewKey :
-            @([AVAudioSession sharedInstance].outputVolume) }
-                          context:nil];
+  float expectedVolume = 0.75;
+  mockAVAudioSession.outputVolume = expectedVolume;
 
-  EXPECT_NE(delegate.outputVolume, -1);
-  EXPECT_EQ([AVAudioSession sharedInstance].outputVolume, delegate.outputVolume);
+  EXPECT_EQ(expectedVolume, delegate.outputVolume);
 }
 
 @end