-
Notifications
You must be signed in to change notification settings - Fork 574
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fixed scan filtering by name for API <21. #243
Merged
Merged
Changes from 2 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
rxandroidble/src/test/groovy/com/polidea/rxandroidble/scan/ScanFilterTest.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
package com.polidea.rxandroidble.scan | ||
|
||
import android.bluetooth.BluetoothDevice | ||
import com.polidea.rxandroidble.internal.scan.RxBleInternalScanResult | ||
import spock.lang.Specification | ||
|
||
class ScanFilterTest extends Specification { | ||
|
||
RxBleInternalScanResult mockInternalScanResult = Mock RxBleInternalScanResult | ||
|
||
BluetoothDevice mockBluetoothDevice = Mock BluetoothDevice | ||
|
||
ScanRecord mockScanRecord = Mock ScanRecord | ||
|
||
ScanFilter objectUnderTest | ||
|
||
def setup() { | ||
mockInternalScanResult.getBluetoothDevice() >> mockBluetoothDevice | ||
mockInternalScanResult.getScanRecord() >> mockScanRecord | ||
} | ||
|
||
def "should match by device name if the name is present in ScanRecord"() { | ||
|
||
given: | ||
String name = "xxx" | ||
givenScanRecordWith deviceName: name | ||
objectUnderTest = new ScanFilter.Builder().setDeviceName(name).build() | ||
|
||
expect: | ||
objectUnderTest.matches(mockInternalScanResult) | ||
} | ||
|
||
def "should match by device name if the name is present in BluetoothDevice"() { | ||
|
||
given: | ||
String name = "xxx" | ||
mockBluetoothDevice.getName() >> name | ||
objectUnderTest = new ScanFilter.Builder().setDeviceName(name).build() | ||
|
||
expect: | ||
objectUnderTest.matches(mockInternalScanResult) | ||
} | ||
|
||
def "should not match by device name if the name is not present in BluetoothDevice nor ScanRecord"() { | ||
|
||
given: | ||
String name = "xxx" | ||
objectUnderTest = new ScanFilter.Builder().setDeviceName(name).build() | ||
|
||
expect: | ||
!objectUnderTest.matches(mockInternalScanResult) | ||
} | ||
|
||
private void givenScanRecordWith(Map scanRecordMap) { | ||
mockScanRecord.getDeviceName() >> (scanRecordMap['deviceName'] ?: null) | ||
mockScanRecord.getServiceUuids() >> (scanRecordMap['serviceUuids'] ?: null) | ||
mockScanRecord.getServiceData(_) >> (scanRecordMap['serviceData'] ?: null) | ||
mockScanRecord.getManufacturerSpecificData(_) >> (scanRecordMap['manufacturerSpecificData'] ?: null) | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Small but pricy optimization. You can inline check from line 282 (and extract to a method) to avoid code execution when it's not required.
In this example the second check will be executed regardless the first one (even if deviceName matches).