diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-22 20:38:19 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-22 20:38:19 +0000 |
commit | 8a170133814860557a76829294571820935f848d (patch) | |
tree | 2ace4ffbc43611ed5cd69207d8180890c44d0d6f | |
parent | d983085943adad68e808c2265a9aa32fb2bbef75 (diff) | |
parent | b0b4fa9c10a57c4db4e5968d1f686b7bf8059d14 (diff) | |
download | Connectivity-8a170133814860557a76829294571820935f848d.tar.gz |
Snap for 9094360 from b0b4fa9c10a57c4db4e5968d1f686b7bf8059d14 to android13-tests-release
Change-Id: I3ec42468aa2c6c91a33c457d6bc5c8d1c3892eac
5 files changed, 4 insertions, 31 deletions
diff --git a/nearby/tests/cts/fastpair/src/android/nearby/cts/DataElementTest.java b/nearby/tests/cts/fastpair/src/android/nearby/cts/DataElementTest.java index ec6e89ae94..3654d0db53 100644 --- a/nearby/tests/cts/fastpair/src/android/nearby/cts/DataElementTest.java +++ b/nearby/tests/cts/fastpair/src/android/nearby/cts/DataElementTest.java @@ -36,7 +36,7 @@ import java.util.Arrays; @RequiresApi(Build.VERSION_CODES.TIRAMISU) public class DataElementTest { - private static final int KEY = 1234; + private static final int KEY = 1; private static final byte[] VALUE = new byte[]{1, 1, 1, 1}; @Test diff --git a/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyDeviceParcelableTest.java b/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyDeviceParcelableTest.java index dd9cbb073a..654b8526aa 100644 --- a/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyDeviceParcelableTest.java +++ b/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyDeviceParcelableTest.java @@ -22,7 +22,6 @@ import static com.google.common.truth.Truth.assertThat; import android.nearby.NearbyDevice; import android.nearby.NearbyDeviceParcelable; -import android.nearby.PublicCredential; import android.os.Build; import android.os.Parcel; @@ -60,32 +59,6 @@ public class NearbyDeviceParcelableTest { .setData(SCAN_DATA); } - /** Verify toString returns expected string. */ - @Test - @SdkSuppress(minSdkVersion = 33, codeName = "T") - public void testToString() { - PublicCredential publicCredential = - new PublicCredential.Builder( - new byte[] {1}, - new byte[] {2}, - new byte[] {3}, - new byte[] {4}, - new byte[] {5}) - .build(); - NearbyDeviceParcelable nearbyDeviceParcelable = - mBuilder.setFastPairModelId(null) - .setData(null) - .setPublicCredential(publicCredential) - .build(); - - assertThat(nearbyDeviceParcelable.toString()) - .isEqualTo( - "NearbyDeviceParcelable[scanType=2, name=testDevice, medium=BLE, " - + "txPower=0, rssi=-60, action=0, bluetoothAddress=" - + BLUETOOTH_ADDRESS - + ", fastPairModelId=null, data=null, salt=null]"); - } - @Test @SdkSuppress(minSdkVersion = 33, codeName = "T") public void test_defaultNullFields() { diff --git a/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceBroadcastRequestTest.java b/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceBroadcastRequestTest.java index 1daa41080b..eaa5ca14ff 100644 --- a/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceBroadcastRequestTest.java +++ b/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceBroadcastRequestTest.java @@ -54,7 +54,7 @@ public class PresenceBroadcastRequestTest { private static final byte[] SECRETE_ID = new byte[]{1, 2, 3, 4}; private static final byte[] AUTHENTICITY_KEY = new byte[]{0, 1, 1, 1}; private static final byte[] METADATA_ENCRYPTION_KEY = new byte[]{1, 1, 3, 4, 5}; - private static final int KEY = 1234; + private static final int KEY = 3; private static final byte[] VALUE = new byte[]{1, 1, 1, 1}; private static final String DEVICE_NAME = "test_device"; diff --git a/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceDeviceTest.java b/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceDeviceTest.java index 5fefc6843b..94f8fe7b75 100644 --- a/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceDeviceTest.java +++ b/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceDeviceTest.java @@ -45,7 +45,7 @@ public class PresenceDeviceTest { private static final int RSSI = -40; private static final int MEDIUM = NearbyDevice.Medium.BLE; private static final String DEVICE_NAME = "testDevice"; - private static final int KEY = 1234; + private static final int KEY = 3; private static final byte[] VALUE = new byte[]{1, 1, 1, 1}; private static final byte[] SALT = new byte[]{2, 3}; private static final byte[] SECRET_ID = new byte[]{11, 13}; diff --git a/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceScanFilterTest.java b/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceScanFilterTest.java index b7fe40adfe..cecdfd2881 100644 --- a/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceScanFilterTest.java +++ b/nearby/tests/cts/fastpair/src/android/nearby/cts/PresenceScanFilterTest.java @@ -48,7 +48,7 @@ public class PresenceScanFilterTest { private static final byte[] PUBLIC_KEY = new byte[]{1, 1, 2, 2}; private static final byte[] ENCRYPTED_METADATA = new byte[]{1, 2, 3, 4, 5}; private static final byte[] METADATA_ENCRYPTION_KEY_TAG = new byte[]{1, 1, 3, 4, 5}; - private static final int KEY = 1234; + private static final int KEY = 3; private static final byte[] VALUE = new byte[]{1, 1, 1, 1}; |