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

Commit 5434951e authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Gerrit Code Review
Browse files

Merge "Rename tTypedAddressTransport to tAclLinkSpec" into main

parents 327af4e8 abbcef84

system/types/ble_address_with_type.h

+4 −6
Original line number Diff line number Diff line
@@ -151,11 +151,11 @@ struct std::hash<tBLE_BD_ADDR> { 
  }

};



struct tTypedAddressTransport {

struct tAclLinkSpec {

  tBLE_BD_ADDR addrt;

  tBT_TRANSPORT transport;



  bool operator==(const tTypedAddressTransport rhs) const {

  bool operator==(const tAclLinkSpec rhs) const {

    if (rhs.addrt != addrt) return false;



    if (rhs.transport == BT_TRANSPORT_AUTO || transport == BT_TRANSPORT_AUTO) {
@@ -165,11 +165,9 @@ struct tTypedAddressTransport { 
    return rhs.transport == transport;

  }



  bool operator!=(const tTypedAddressTransport rhs) const {

    return !(*this == rhs);

  }

  bool operator!=(const tAclLinkSpec rhs) const { return !(*this == rhs); }



  bool StrictlyEquals(const tTypedAddressTransport rhs) const {

  bool StrictlyEquals(const tAclLinkSpec rhs) const {

    return rhs.addrt == addrt && rhs.transport == transport;

  }

system/types/test/ble_address_with_type_unittest.cc

+12 −12
Original line number Diff line number Diff line
@@ -100,20 +100,20 @@ TEST(BleAddressWithTypeTest, STREAM_TO_BLE_ADDR_TYPE) { 
}



TEST(BleAddressWithTypeTest, TYPED_ADDRESS_TRANSPORT) {

  tTypedAddressTransport typedAddressTransportA = {

      {BLE_ADDR_PUBLIC, RAW_ADDRESS_TEST1}, BT_TRANSPORT_AUTO};

  tTypedAddressTransport typedAddressTransportB = {

      {BLE_ADDR_PUBLIC, RAW_ADDRESS_TEST1}, BT_TRANSPORT_BR_EDR};

  tTypedAddressTransport typedAddressTransportC = {

      {BLE_ADDR_PUBLIC, RAW_ADDRESS_TEST1}, BT_TRANSPORT_LE};

  tAclLinkSpec linkSpecA = {{BLE_ADDR_PUBLIC, RAW_ADDRESS_TEST1},

                            BT_TRANSPORT_AUTO};

  tAclLinkSpec linkSpecB = {{BLE_ADDR_PUBLIC, RAW_ADDRESS_TEST1},

                            BT_TRANSPORT_BR_EDR};

  tAclLinkSpec linkSpecC = {{BLE_ADDR_PUBLIC, RAW_ADDRESS_TEST1},

                            BT_TRANSPORT_LE};



  ASSERT_EQ(typedAddressTransportA, typedAddressTransportB);

  ASSERT_EQ(typedAddressTransportA, typedAddressTransportC);

  ASSERT_NE(typedAddressTransportB, typedAddressTransportC);

  ASSERT_EQ(linkSpecA, linkSpecB);

  ASSERT_EQ(linkSpecA, linkSpecC);

  ASSERT_NE(linkSpecB, linkSpecC);



  ASSERT_FALSE(typedAddressTransportA.StrictlyEquals(typedAddressTransportB));

  ASSERT_FALSE(typedAddressTransportA.StrictlyEquals(typedAddressTransportC));

  ASSERT_FALSE(typedAddressTransportB.StrictlyEquals(typedAddressTransportC));

  ASSERT_FALSE(linkSpecA.StrictlyEquals(linkSpecB));

  ASSERT_FALSE(linkSpecA.StrictlyEquals(linkSpecC));

  ASSERT_FALSE(linkSpecB.StrictlyEquals(linkSpecC));

}



TEST(BleAddressWithTypeTest, BLE_ADDR_TYPE_TO_STREAM) {