From eb7d0090056bbca86ffd9023390efd748db1c61f Mon Sep 17 00:00:00 2001 From: Nick Brook Date: Mon, 27 Jul 2020 15:56:35 +0100 Subject: [PATCH] Create and use mock scan result class --- .../mockrxandroidble/RxBleClientMock.java | 6 +++--- .../mockrxandroidble/RxBleScanResultMock.java | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 mockrxandroidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleScanResultMock.java diff --git a/mockrxandroidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleClientMock.java b/mockrxandroidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleClientMock.java index ec7158929..60daca382 100644 --- a/mockrxandroidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleClientMock.java +++ b/mockrxandroidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleClientMock.java @@ -415,13 +415,13 @@ public boolean test(ScanResult scanResult) { } @NonNull - private ScanResult createScanResult(RxBleDeviceMock rxBleDeviceMock) { + private RxBleScanResultMock createScanResult(RxBleDeviceMock rxBleDeviceMock) { return convertToPublicScanResult(rxBleDeviceMock, rxBleDeviceMock.getRssi(), rxBleDeviceMock.getScanRecord()); } @NonNull - private static ScanResult convertToPublicScanResult(RxBleDevice bleDevice, Integer rssi, ScanRecord scanRecord) { - return new ScanResult( + private static RxBleScanResultMock convertToPublicScanResult(RxBleDevice bleDevice, Integer rssi, ScanRecord scanRecord) { + return new RxBleScanResultMock ( bleDevice, rssi, System.currentTimeMillis() * 1000000, diff --git a/mockrxandroidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleScanResultMock.java b/mockrxandroidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleScanResultMock.java new file mode 100644 index 000000000..e1a8c6c88 --- /dev/null +++ b/mockrxandroidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleScanResultMock.java @@ -0,0 +1,12 @@ +package com.polidea.rxandroidble2.mockrxandroidble; + +import com.polidea.rxandroidble2.RxBleDevice; +import com.polidea.rxandroidble2.scan.ScanCallbackType; +import com.polidea.rxandroidble2.scan.ScanRecord; +import com.polidea.rxandroidble2.scan.ScanResult; + +public class RxBleScanResultMock extends ScanResult { + public RxBleScanResultMock(RxBleDevice bleDevice, int rssi, long timestampNanos, ScanCallbackType callbackType, ScanRecord scanRecord) { + super(bleDevice, rssi, timestampNanos, callbackType, scanRecord); + } +}