Enable more unittests on iOS, and disable those that fail on simulator

webrtc/media/engine/apm_helpers_unittest.cc

 /*
  *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 92 matching lines @@
             actual_config.digitalCompressionGaindB);
   EXPECT_EQ(agc_config.limiterEnable,
             actual_config.limiterEnable);
   EXPECT_EQ(agc_config.targetLeveldBOv,
             actual_config.targetLeveldBOv);
 }
 
 TEST(ApmHelpersTest, AgcStatus_DefaultMode) {
   TestHelper helper;
   GainControl* gc = helper.apm()->gain_control();
-#if defined(WEBRTC_IOS) || defined(WEBRTC_ANDROID)
+#if defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR

[kthelgason, 2017/06/22 08:16:32]

I don't think there is any reason to check both, just #if
TARGET_IPHONE_SIMULATOR should be enough.

[oprypin_webrtc, 2017/06/22 08:20:46]

This macro is defined only on Mac, and using it directly elsewhere causes a
compilation error. See Patch Set 7 and fix in 8

[oprypin_webrtc, 2017/06/22 08:23:19]

Oh, and patch set 8 is not correct either, checking whether it's defined is
basically equivalent to "are we on Mac?", as it turns out.

+  EXPECT_FALSE(gc->is_enabled());
+  EXPECT_EQ(GainControl::kAdaptiveDigital, gc->mode());
+#elif defined(WEBRTC_IOS) || defined(WEBRTC_ANDROID)
   EXPECT_FALSE(gc->is_enabled());
   EXPECT_EQ(GainControl::kFixedDigital, gc->mode());
 #else
   EXPECT_TRUE(gc->is_enabled());
   EXPECT_EQ(GainControl::kAdaptiveAnalog, gc->mode());
 #endif
 }
 
 TEST(ApmHelpersTest, AgcStatus_EnableDisable) {
   TestHelper helper;
@@ skipping 118 matching lines @@
   EXPECT_EQ(NoiseSuppression::kHigh, ns->level());
   EXPECT_FALSE(ns->is_enabled());
 }
 
 TEST(ApmHelpersTest, TypingDetectionStatus_DefaultMode) {
   TestHelper helper;
   VoiceDetection* vd = helper.apm()->voice_detection();
   EXPECT_FALSE(vd->is_enabled());
 }
 
-TEST(ApmHelpersTest, TypingDetectionStatus_EnableDisable) {
+// TODO(kthelgason): Reenable this test on simulator.
+// See bugs.webrtc.org/5569
+#if defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR

[kthelgason, 2017/06/22 08:16:32]

ditto

+#define MAYBE_TypingDetectionStatus_EnableDisable DISABLED_TypingDetectionStatus_EnableDisable
+#else
+#define MAYBE_TypingDetectionStatus_EnableDisable TypingDetectionStatus_EnableDisable
+#endif
+TEST(ApmHelpersTest, MAYBE_TypingDetectionStatus_EnableDisable) {
   TestHelper helper;
   VoiceDetection* vd = helper.apm()->voice_detection();
   apm_helpers::SetTypingDetectionStatus(helper.apm(), true);
   EXPECT_TRUE(vd->is_enabled());
   apm_helpers::SetTypingDetectionStatus(helper.apm(), false);
   EXPECT_FALSE(vd->is_enabled());
 }
 
 // TODO(solenberg): Move this test to a better place - added here for the sake
 // of duplicating all relevant tests from audio_processing_test.cc.
@@ skipping 12 matching lines @@
 // TODO(solenberg): Move this test to a better place - added here for the sake
 // of duplicating all relevant tests from audio_processing_test.cc.
 TEST(ApmHelpersTest, StereoSwapping_EnableDisable) {
   TestHelper helper;
   helper.transmit_mixer()->EnableStereoChannelSwapping(true);
   EXPECT_TRUE(helper.transmit_mixer()->IsStereoChannelSwappingEnabled());
   helper.transmit_mixer()->EnableStereoChannelSwapping(false);
   EXPECT_FALSE(helper.transmit_mixer()->IsStereoChannelSwappingEnabled());
 }
 }  // namespace webrtc