| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 2927 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2938 << "; got: " << MediaContentDirectionToString(acd->direction()); | 2938 << "; got: " << MediaContentDirectionToString(acd->direction()); |
| 2939 } else { | 2939 } else { |
| 2940 EXPECT_EQ(offer_direction, cricket::MD_INACTIVE) | 2940 EXPECT_EQ(offer_direction, cricket::MD_INACTIVE) |
| 2941 << "Only inactive offers are allowed to not generate any audio content"; | 2941 << "Only inactive offers are allowed to not generate any audio content"; |
| 2942 } | 2942 } |
| 2943 } | 2943 } |
| 2944 | 2944 |
| 2945 } // namespace | 2945 } // namespace |
| 2946 | 2946 |
| 2947 class AudioCodecsOfferTest | 2947 class AudioCodecsOfferTest |
| 2948 : public ::testing::TestWithParam<std::tr1::tuple<MediaContentDirection, | 2948 : public ::testing::TestWithParam<::testing::tuple<MediaContentDirection, |
| 2949 bool>> { | 2949 bool>> { |
| 2950 }; | 2950 }; |
| 2951 | 2951 |
| 2952 TEST_P(AudioCodecsOfferTest, TestCodecsInOffer) { | 2952 TEST_P(AudioCodecsOfferTest, TestCodecsInOffer) { |
| 2953 TestAudioCodecsOffer(std::tr1::get<0>(GetParam()), | 2953 TestAudioCodecsOffer(::testing::get<0>(GetParam()), |
| 2954 std::tr1::get<1>(GetParam())); | 2954 ::testing::get<1>(GetParam())); |
| 2955 } | 2955 } |
| 2956 | 2956 |
| 2957 INSTANTIATE_TEST_CASE_P(MediaSessionDescriptionFactoryTest, | 2957 INSTANTIATE_TEST_CASE_P(MediaSessionDescriptionFactoryTest, |
| 2958 AudioCodecsOfferTest, | 2958 AudioCodecsOfferTest, |
| 2959 ::testing::Combine( | 2959 ::testing::Combine( |
| 2960 ::testing::Values(cricket::MD_SENDONLY, | 2960 ::testing::Values(cricket::MD_SENDONLY, |
| 2961 cricket::MD_RECVONLY, | 2961 cricket::MD_RECVONLY, |
| 2962 cricket::MD_SENDRECV, | 2962 cricket::MD_SENDRECV, |
| 2963 cricket::MD_INACTIVE), | 2963 cricket::MD_INACTIVE), |
| 2964 ::testing::Bool())); | 2964 ::testing::Bool())); |
| 2965 | 2965 |
| 2966 class AudioCodecsAnswerTest | 2966 class AudioCodecsAnswerTest |
| 2967 : public ::testing::TestWithParam<std::tr1::tuple<MediaContentDirection, | 2967 : public ::testing::TestWithParam<::testing::tuple<MediaContentDirection, |
| 2968 MediaContentDirection, | 2968 MediaContentDirection, |
| 2969 bool>> { | 2969 bool>> { |
| 2970 }; | 2970 }; |
| 2971 | 2971 |
| 2972 TEST_P(AudioCodecsAnswerTest, TestCodecsInAnswer) { | 2972 TEST_P(AudioCodecsAnswerTest, TestCodecsInAnswer) { |
| 2973 TestAudioCodecsAnswer(std::tr1::get<0>(GetParam()), | 2973 TestAudioCodecsAnswer(::testing::get<0>(GetParam()), |
| 2974 std::tr1::get<1>(GetParam()), | 2974 ::testing::get<1>(GetParam()), |
| 2975 std::tr1::get<2>(GetParam())); | 2975 ::testing::get<2>(GetParam())); |
| 2976 } | 2976 } |
| 2977 | 2977 |
| 2978 INSTANTIATE_TEST_CASE_P(MediaSessionDescriptionFactoryTest, | 2978 INSTANTIATE_TEST_CASE_P(MediaSessionDescriptionFactoryTest, |
| 2979 AudioCodecsAnswerTest, | 2979 AudioCodecsAnswerTest, |
| 2980 ::testing::Combine( | 2980 ::testing::Combine( |
| 2981 ::testing::Values(cricket::MD_SENDONLY, | 2981 ::testing::Values(cricket::MD_SENDONLY, |
| 2982 cricket::MD_RECVONLY, | 2982 cricket::MD_RECVONLY, |
| 2983 cricket::MD_SENDRECV, | 2983 cricket::MD_SENDRECV, |
| 2984 cricket::MD_INACTIVE), | 2984 cricket::MD_INACTIVE), |
| 2985 ::testing::Values(cricket::MD_SENDONLY, | 2985 ::testing::Values(cricket::MD_SENDONLY, |
| 2986 cricket::MD_RECVONLY, | 2986 cricket::MD_RECVONLY, |
| 2987 cricket::MD_SENDRECV, | 2987 cricket::MD_SENDRECV, |
| 2988 cricket::MD_INACTIVE), | 2988 cricket::MD_INACTIVE), |
| 2989 ::testing::Bool())); | 2989 ::testing::Bool())); |
| OLD | NEW |