Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55ae2902 authored by William Escande's avatar William Escande
Browse files

cpplint: fix and enable readability/check 

Bug: 364967694
Test: m .
Flag: Exempt refactor
Change-Id: I8175344d43f29c8d518000e2dd73aefb030ee1b8
parent 0c2d0cd5

CPPLINT.cfg

+0 −2
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ linelength=100 
# CPPLint enforces +1, but our rule is no indentation.

filter=-whitespace/indent



# TODO: b/364967694 re-enable the warning

filter=-readability/check

# TODO: b/364967694 re-enable the warning

filter=-runtime/int

# TODO: b/364967694 re-enable the warning

system/audio_hearing_aid_hw/test/audio_hearing_aid_hw_test.cc

+3 −3
Original line number Diff line number Diff line
@@ -111,13 +111,13 @@ TEST_F(AudioA2dpHwTest, test_compute_buffer_size) { 
        }



        uint32_t sample_rate = codec_sample_rate2value(codec_sample_rate);

        EXPECT_TRUE(sample_rate != 0);

        EXPECT_NE(0u, sample_rate);



        uint32_t bits_per_sample = codec_bits_per_sample2value(codec_bits_per_sample);

        EXPECT_TRUE(bits_per_sample != 0);

        EXPECT_NE(0u, bits_per_sample);



        uint32_t number_of_channels = codec_channel_mode2value(codec_channel_mode);

        EXPECT_TRUE(number_of_channels != 0);

        EXPECT_NE(0u, number_of_channels);



        const uint64_t time_period_ms = 20;  // TODO: Must be a parameter

        size_t expected_buffer_size = (time_period_ms * AUDIO_STREAM_OUTPUT_BUFFER_PERIODS *

system/bta/csis/csis_client_test.cc

+1 −2
Original line number Diff line number Diff line
@@ -841,8 +841,7 @@ TEST_F(CsisClientTest, test_get_group_id) { 
  EXPECT_CALL(*callbacks, OnDeviceAvailable(test_address, _, _, _, _));

  InjectConnectedEvent(test_address, 1);

  GetSearchCompleteEvent(1);

  int group_id = CsisClient::Get()->GetGroupId(test_address);

  ASSERT_TRUE(group_id == 1);

  ASSERT_EQ(1, CsisClient::Get()->GetGroupId(test_address));

  TestAppUnregister();

}

system/bta/has/has_client_test.cc

+14 −14
Original line number Diff line number Diff line
@@ -1544,7 +1544,7 @@ TEST_F(HasClientTest, test_discovery_basic_has_no_opt_ntf) { 


  /* Verify presets */

  uint16_t conn_id = GetTestConnId(test_address);

  ASSERT_NE(preset_details.size(), 0u);

  ASSERT_NE(0u, preset_details.size());

  ASSERT_EQ(current_peer_presets_.at(conn_id).size(), preset_details.size());



  for (auto const& preset : current_peer_presets_.at(conn_id)) {
@@ -1736,7 +1736,7 @@ TEST_F(HasClientTest, test_duplicate_presets) { 
  TestConnect(test_address);



  /* Verify presets - expect 1, no duplicates */

  ASSERT_EQ(preset_details.size(), 1u);

  ASSERT_EQ(1u, preset_details.size());

  auto preset = std::find_if(preset_details.begin(), preset_details.end(),

                             [](auto const& preset_info) { return preset_info.preset_index == 5; });

  ASSERT_TRUE(preset != preset_details.end());
@@ -1873,7 +1873,7 @@ TEST_F(HasClientTest, test_preset_group_set_name) { 
          .Times(1);



  HasClient::Get()->SetPresetName(not_synced_group, 55, "new preset name");

  ASSERT_EQ(preset_details.size(), 1u);

  ASSERT_EQ(1u, preset_details.size());

  ASSERT_EQ(preset_details[0].preset_name, "new preset name");

  ASSERT_EQ(preset_details[0].preset_index, 55);

}
@@ -2198,7 +2198,7 @@ TEST_F(HasClientTest, test_select_preset_valid) { 
  EXPECT_CALL(*callbacks, OnActivePresetSelected(_, _)).WillOnce(SaveArg<1>(&active_preset_index));

  TestConnect(test_address);



  ASSERT_TRUE(preset_details.size() > 1);

  ASSERT_GT(preset_details.size(), 1u);

  ASSERT_EQ(preset_details.front().preset_index, active_preset_index);



  uint8_t new_active_preset_index = 0;
@@ -2268,7 +2268,7 @@ TEST_F(HasClientTest, test_select_preset_not_available) { 
  EXPECT_CALL(*callbacks, OnActivePresetSelected(_, _)).WillOnce(SaveArg<1>(&active_preset_index));

  TestConnect(test_address);



  ASSERT_TRUE(preset_details.size() > 1);

  ASSERT_GT(preset_details.size(), 1u);

  ASSERT_EQ(preset_details.front().preset_index, active_preset_index);



  EXPECT_CALL(*callbacks, OnActivePresetSelectError(std::variant<RawAddress, int>(test_address),
@@ -2344,8 +2344,8 @@ TEST_F(HasClientTest, test_select_group_preset_not_available) { 
  ON_CALL(mock_csis_client_module_, GetDeviceList(group_id))

          .WillByDefault(Return(std::vector<RawAddress>({{test_address1, test_address2}})));



  ASSERT_TRUE(preset_details1.size() > 1);

  ASSERT_TRUE(preset_details2.size() > 1);

  ASSERT_GT(preset_details1.size(), 1u);

  ASSERT_GT(preset_details2.size(), 1u);

  ASSERT_EQ(preset_details1.front().preset_index, active_preset_index1);

  ASSERT_EQ(preset_details2.front().preset_index, active_preset_index2);
@@ -2430,8 +2430,8 @@ TEST_F(HasClientTest, test_select_group_preset_not_available_binaural) { 
  ON_CALL(mock_csis_client_module_, GetDeviceList(group_id))

          .WillByDefault(Return(std::vector<RawAddress>({{test_address1, test_address2}})));



  ASSERT_TRUE(preset_details1.size() > 1);

  ASSERT_TRUE(preset_details2.size() > 1);

  ASSERT_GT(preset_details1.size(), 1u);

  ASSERT_GT(preset_details2.size(), 1u);

  ASSERT_EQ(preset_details1.front().preset_index, active_preset_index1);

  ASSERT_EQ(preset_details2.front().preset_index, active_preset_index2);
@@ -2518,8 +2518,8 @@ TEST_F(HasClientTest, test_select_group_preset_not_available_binaural_independen 
  ON_CALL(mock_csis_client_module_, GetDeviceList(group_id))

          .WillByDefault(Return(std::vector<RawAddress>({{test_address1, test_address2}})));



  ASSERT_TRUE(preset_details1.size() > 1);

  ASSERT_TRUE(preset_details2.size() > 1);

  ASSERT_GT(preset_details1.size(), 1u);

  ASSERT_GT(preset_details2.size(), 1u);

  ASSERT_EQ(preset_details1.front().preset_index, active_preset_index1);

  ASSERT_EQ(preset_details2.front().preset_index, active_preset_index2);
@@ -2654,7 +2654,7 @@ TEST_F(HasClientTest, test_select_preset_invalid) { 
  EXPECT_CALL(*callbacks, OnActivePresetSelected(_, _)).WillOnce(SaveArg<1>(&active_preset_index));

  TestConnect(test_address);



  ASSERT_TRUE(preset_details.size() > 1);

  ASSERT_GT(preset_details.size(), 1u);

  ASSERT_EQ(preset_details.front().preset_index, active_preset_index);



  /* Inject preset deletion of index 2 */
@@ -2694,7 +2694,7 @@ TEST_F(HasClientTest, test_select_preset_next) { 
  EXPECT_CALL(*callbacks, OnActivePresetSelected(_, _)).WillOnce(SaveArg<1>(&active_preset_index));

  TestConnect(test_address);



  ASSERT_TRUE(preset_details.size() > 1);

  ASSERT_GT(preset_details.size(), 1u);

  ASSERT_EQ(1, active_preset_index);



  /* Verify active preset change */
@@ -2827,7 +2827,7 @@ TEST_F(HasClientTest, test_select_preset_prev) { 
  TestConnect(test_address);



  HasClient::Get()->SelectActivePreset(test_address, 2);

  ASSERT_TRUE(preset_details.size() > 1);

  ASSERT_GT(preset_details.size(), 1u);

  ASSERT_EQ(2, active_preset_index);



  /* Verify active preset change */

system/bta/le_audio/devices_test.cc

+2 −2
Original line number Diff line number Diff line
@@ -1080,9 +1080,9 @@ protected: 
    }



    if (success_expected) {

      ASSERT_TRUE(num_of_matching_configurations > 0);

      ASSERT_GT(num_of_matching_configurations, 0);

    } else {

      ASSERT_TRUE(num_of_matching_configurations == 0);

      ASSERT_EQ(0, num_of_matching_configurations);

    }

  }