From aced12cb00f3ad6a5485d74f24322fb697a38cd9 Mon Sep 17 00:00:00 2001 From: TFStudy <3202410880@qq.com> Date: Fri, 4 Jun 2021 09:56:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- entry/build.gradle | 1 + entry/src/main/config.json | 2 +- scanner/scanner-proguard-rules.pro | 17 -- .../BluetoothLeScannerImplOreoTest.java | 79 ------- .../v18/scanner/BluetoothUuidTest.java | 44 ---- .../support/v18/scanner/ScanFilterTest.java | 194 ------------------ .../support/v18/scanner/ScanRecordTest.java | 66 ------ .../support/v18/scanner/ScanResultTest.java | 47 ----- .../support/v18/scanner/ScanSettingsTest.java | 57 ----- scanner/src/main/AndroidManifest.xml | 43 ---- 11 files changed, 3 insertions(+), 549 deletions(-) delete mode 100644 scanner/scanner-proguard-rules.pro delete mode 100644 scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/BluetoothLeScannerImplOreoTest.java delete mode 100644 scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/BluetoothUuidTest.java delete mode 100644 scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/ScanFilterTest.java delete mode 100644 scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/ScanRecordTest.java delete mode 100644 scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/ScanResultTest.java delete mode 100644 scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/ScanSettingsTest.java delete mode 100644 scanner/src/main/AndroidManifest.xml diff --git a/build.gradle b/build.gradle index 2368e1d..5113244 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.2.7' + classpath 'com.huawei.ohos:hap:2.4.4.2' classpath 'com.huawei.ohos:decctest:1.0.0.6' } } diff --git a/entry/build.gradle b/entry/build.gradle index 18fad72..af8464c 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -11,4 +11,5 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) testCompile 'junit:junit:4.12' implementation project(':scanner') + ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.100' } diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 4a1be10..ade643d 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -39,7 +39,7 @@ "name": "com.example.myapplication.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", - "label": "MyApplication", + "label": "$string:app_name", "type": "page", "launchType": "standard" }, diff --git a/scanner/scanner-proguard-rules.pro b/scanner/scanner-proguard-rules.pro deleted file mode 100644 index 49484f7..0000000 --- a/scanner/scanner-proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in C:\Users\alno\AppData\Local\Android\sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/BluetoothLeScannerImplOreoTest.java b/scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/BluetoothLeScannerImplOreoTest.java deleted file mode 100644 index 62588e3..0000000 --- a/scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/BluetoothLeScannerImplOreoTest.java +++ /dev/null @@ -1,79 +0,0 @@ -package no.nordicsemi.android.support.v18.scanner; - -import android.bluetooth.BluetoothAdapter; -import android.bluetooth.BluetoothDevice; -import android.os.ParcelUuid; -import android.util.SparseArray; - -import org.junit.Test; - -import java.lang.reflect.Constructor; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.fail; - -public class BluetoothLeScannerImplOreoTest { - - @Test - public void toImpl() { - // Build mock data - List serviceUuids = new ArrayList<>(); - serviceUuids.add(ParcelUuid.fromString("00001809-0000-1000-8000-00805F9B34FB")); - - SparseArray manufacturerData = new SparseArray<>(); - manufacturerData.append(0x0059, new byte[] { 1, 2, 3}); - - Map serviceData = new HashMap<>(); - serviceData.put(ParcelUuid.fromString("00001809-0000-1000-8000-00805F9B34FB"), new byte[] { 0x64 }); - - final byte[] bytes = new byte[] { 2, 1, 6, 5, 8, 'T', 'e', 's', 't', 6, (byte) 0xFF, 0x59, 0x00, 1, 2, 3, 4, 0x16, 0x09, 0x18, 0x64, 2, 0x0A, 1}; - - try { - BluetoothDevice device = - BluetoothAdapter.getDefaultAdapter().getRemoteDevice("01:02:03:04:05:06"); - - final Constructor constructor = - android.bluetooth.le.ScanRecord.class.getDeclaredConstructor(List.class, - SparseArray.class, Map.class, int.class, int.class, String.class, byte[].class); - - final android.bluetooth.le.ScanRecord _record = (android.bluetooth.le.ScanRecord) - constructor.newInstance(serviceUuids, manufacturerData, serviceData, 0x06, 1, "Test", bytes); - - android.bluetooth.le.ScanResult _result = new android.bluetooth.le.ScanResult(device, - 0b000001, 1, 2, 0, - android.bluetooth.le.ScanResult.TX_POWER_NOT_PRESENT, -70, - android.bluetooth.le.ScanResult.PERIODIC_INTERVAL_NOT_PRESENT, _record, - 123456789L); - - // Convert to support.v18.ScanResult - final BluetoothLeScannerImplOreo impl = new BluetoothLeScannerImplOreo(); - final ScanResult result = impl.fromNativeScanResult(_result); - - // Validate - assertEquals(_result.isLegacy(), result.isLegacy()); - assertEquals(_result.isConnectable(), result.isConnectable()); - assertEquals(ScanResult.DATA_COMPLETE, result.getDataStatus()); - assertNotNull(result.getScanRecord()); - final ScanRecord record = result.getScanRecord(); - assertEquals(6, record.getAdvertiseFlags()); - assertArrayEquals(bytes, record.getBytes()); - assertNotNull(record.getManufacturerSpecificData(0x0059)); - assertArrayEquals(_record.getManufacturerSpecificData(0x0059), - record.getManufacturerSpecificData(0x0059)); - assertEquals(ScanResult.PERIODIC_INTERVAL_NOT_PRESENT, result.getPeriodicAdvertisingInterval()); - assertEquals(ScanResult.TX_POWER_NOT_PRESENT, result.getTxPower()); - assertEquals(123456789L, result.getTimestampNanos()); - assertSame(_result.getDevice(), result.getDevice()); - assertSame(device, result.getDevice()); - } catch (Exception e) { - fail(e.getMessage()); - } - } -} \ No newline at end of file diff --git a/scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/BluetoothUuidTest.java b/scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/BluetoothUuidTest.java deleted file mode 100644 index 399b941..0000000 --- a/scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/BluetoothUuidTest.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package no.nordicsemi.android.support.v18.scanner; - -import android.os.ParcelUuid; -import org.junit.Test; - -import static junit.framework.Assert.assertEquals; - -public class BluetoothUuidTest { - - @Test public void testUuidParser() { - byte[] uuid16 = new byte[] { - 0x0B, 0x11 - }; - assertEquals(ParcelUuid.fromString("0000110B-0000-1000-8000-00805F9B34FB"), - BluetoothUuid.parseUuidFrom(uuid16)); - byte[] uuid32 = new byte[] { - 0x0B, 0x11, 0x33, (byte) 0xFE - }; - assertEquals(ParcelUuid.fromString("FE33110B-0000-1000-8000-00805F9B34FB"), - BluetoothUuid.parseUuidFrom(uuid32)); - byte[] uuid128 = new byte[] { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, - (byte) 0xFF - }; - assertEquals(ParcelUuid.fromString("FF0F0E0D-0C0B-0A09-0807-0060504030201"), - BluetoothUuid.parseUuidFrom(uuid128)); - } -} diff --git a/scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/ScanFilterTest.java b/scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/ScanFilterTest.java deleted file mode 100644 index 46394c8..0000000 --- a/scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/ScanFilterTest.java +++ /dev/null @@ -1,194 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package no.nordicsemi.android.support.v18.scanner; - -import android.bluetooth.BluetoothAdapter; -import android.bluetooth.BluetoothDevice; -import android.os.Parcel; -import android.os.ParcelUuid; -import androidx.test.runner.AndroidJUnit4; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; - -@RunWith(AndroidJUnit4.class) public class ScanFilterTest { - - private static final String DEVICE_MAC = "01:02:03:04:05:AB"; - private ScanResult scanResult; - private ScanFilter.Builder filterBuilder; - - @Before public void setup() { - byte[] scanRecord = new byte[] { - 0x02, 0x01, 0x1a, // advertising flags - 0x05, 0x02, 0x0b, 0x11, 0x0a, 0x11, // 16 bit service uuids - 0x04, 0x09, 0x50, 0x65, 0x64, // setName - 0x02, 0x0A, (byte) 0xec, // tx power level - 0x05, 0x16, 0x0b, 0x11, 0x50, 0x64, // service data - 0x05, (byte) 0xff, (byte) 0xe0, 0x00, 0x02, 0x15, // manufacturer specific data - 0x03, 0x50, 0x01, 0x02, // an unknown data type won't cause trouble - }; - - final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); - final BluetoothDevice device = adapter.getRemoteDevice(DEVICE_MAC); - - scanResult = - new ScanResult(device, ScanRecord.parseFromBytes(scanRecord), -10, 1397545200000000L); - filterBuilder = new ScanFilter.Builder(); - } - - @Test public void testsetNameFilter() { - ScanFilter filter = filterBuilder.setDeviceName("Ped").build(); - assertTrue("setName filter fails", filter.matches(scanResult)); - filter = filterBuilder.setDeviceName("Pem").build(); - assertFalse("setName filter fails", filter.matches(scanResult)); - } - - @Test public void testDeviceFilter() { - ScanFilter filter = filterBuilder.setDeviceAddress(DEVICE_MAC).build(); - assertTrue("device filter fails", filter.matches(scanResult)); - filter = filterBuilder.setDeviceAddress("11:22:33:44:55:66").build(); - assertFalse("device filter fails", filter.matches(scanResult)); - } - - @Test public void testsetServiceUuidFilter() { - ScanFilter filter = - filterBuilder.setServiceUuid(ParcelUuid.fromString("0000110A-0000-1000-8000-00805F9B34FB")) - .build(); - assertTrue("uuid filter fails", filter.matches(scanResult)); - filter = - filterBuilder.setServiceUuid(ParcelUuid.fromString("0000110C-0000-1000-8000-00805F9B34FB")) - .build(); - assertFalse("uuid filter fails", filter.matches(scanResult)); - filter = - filterBuilder.setServiceUuid(ParcelUuid.fromString("0000110C-0000-1000-8000-00805F9B34FB"), - ParcelUuid.fromString("FFFFFFF0-FFFF-FFFF-FFFF-FFFFFFFFFFFF")).build(); - assertTrue("uuid filter fails", filter.matches(scanResult)); - } - - @Test public void testsetServiceDataFilter() { - byte[] setServiceData = new byte[] { - 0x50, 0x64 - }; - ParcelUuid serviceDataUuid = ParcelUuid.fromString("0000110B-0000-1000-8000-00805F9B34FB"); - ScanFilter filter = filterBuilder.setServiceData(serviceDataUuid, setServiceData).build(); - assertTrue("service data filter fails", filter.matches(scanResult)); - byte[] emptyData = new byte[0]; - filter = filterBuilder.setServiceData(serviceDataUuid, emptyData).build(); - assertTrue("service data filter fails", filter.matches(scanResult)); - byte[] prefixData = new byte[] { - 0x50 - }; - filter = filterBuilder.setServiceData(serviceDataUuid, prefixData).build(); - assertTrue("service data filter fails", filter.matches(scanResult)); - byte[] nonMatchData = new byte[] { - 0x51, 0x64 - }; - byte[] mask = new byte[] { - (byte) 0x00, (byte) 0xFF - }; - filter = filterBuilder.setServiceData(serviceDataUuid, nonMatchData, mask).build(); - assertTrue("partial service data filter fails", filter.matches(scanResult)); - filter = filterBuilder.setServiceData(serviceDataUuid, nonMatchData).build(); - assertFalse("service data filter fails", filter.matches(scanResult)); - } - - @Test public void testManufacturerSpecificData() { - byte[] setManufacturerData = new byte[] { - 0x02, 0x15 - }; - int manufacturerId = 0xE0; - ScanFilter filter = - filterBuilder.setManufacturerData(manufacturerId, setManufacturerData).build(); - assertTrue("manufacturer data filter fails", filter.matches(scanResult)); - byte[] emptyData = new byte[0]; - filter = filterBuilder.setManufacturerData(manufacturerId, emptyData).build(); - assertTrue("manufacturer data filter fails", filter.matches(scanResult)); - byte[] prefixData = new byte[] { - 0x02 - }; - filter = filterBuilder.setManufacturerData(manufacturerId, prefixData).build(); - assertTrue("manufacturer data filter fails", filter.matches(scanResult)); - // Test data mask - byte[] nonMatchData = new byte[] { - 0x02, 0x14 - }; - filter = filterBuilder.setManufacturerData(manufacturerId, nonMatchData).build(); - assertFalse("manufacturer data filter fails", filter.matches(scanResult)); - byte[] mask = new byte[] { - (byte) 0xFF, (byte) 0x00 - }; - filter = filterBuilder.setManufacturerData(manufacturerId, nonMatchData, mask).build(); - assertTrue("partial setManufacturerData filter fails", filter.matches(scanResult)); - } - - @Test public void testReadWriteParcel() { - ScanFilter filter = filterBuilder.build(); - testReadWriteParcelForFilter(filter); - filter = filterBuilder.setDeviceName("Ped").build(); - testReadWriteParcelForFilter(filter); - filter = filterBuilder.setDeviceAddress("11:22:33:44:55:66").build(); - testReadWriteParcelForFilter(filter); - filter = - filterBuilder.setServiceUuid(ParcelUuid.fromString("0000110C-0000-1000-8000-00805F9B34FB")) - .build(); - testReadWriteParcelForFilter(filter); - filter = - filterBuilder.setServiceUuid(ParcelUuid.fromString("0000110C-0000-1000-8000-00805F9B34FB"), - ParcelUuid.fromString("FFFFFFF0-FFFF-FFFF-FFFF-FFFFFFFFFFFF")).build(); - testReadWriteParcelForFilter(filter); - byte[] serviceData = new byte[] { - 0x50, 0x64 - }; - ParcelUuid serviceDataUuid = ParcelUuid.fromString("0000110B-0000-1000-8000-00805F9B34FB"); - filter = filterBuilder.setServiceData(serviceDataUuid, serviceData).build(); - testReadWriteParcelForFilter(filter); - filter = filterBuilder.setServiceData(serviceDataUuid, new byte[0]).build(); - testReadWriteParcelForFilter(filter); - byte[] serviceDataMask = new byte[] { - (byte) 0xFF, (byte) 0xFF - }; - filter = filterBuilder.setServiceData(serviceDataUuid, serviceData, serviceDataMask).build(); - testReadWriteParcelForFilter(filter); - byte[] manufacturerData = new byte[] { - 0x02, 0x15 - }; - int manufacturerId = 0xE0; - filter = filterBuilder.setManufacturerData(manufacturerId, manufacturerData).build(); - testReadWriteParcelForFilter(filter); - filter = filterBuilder.setServiceData(serviceDataUuid, new byte[0]).build(); - testReadWriteParcelForFilter(filter); - byte[] manufacturerDataMask = new byte[] { - (byte) 0xFF, (byte) 0xFF - }; - filter = - filterBuilder.setManufacturerData(manufacturerId, manufacturerData, manufacturerDataMask) - .build(); - testReadWriteParcelForFilter(filter); - } - - private void testReadWriteParcelForFilter(ScanFilter filter) { - Parcel parcel = Parcel.obtain(); - filter.writeToParcel(parcel, 0); - parcel.setDataPosition(0); - ScanFilter filterFromParcel = ScanFilter.CREATOR.createFromParcel(parcel); - assertEquals(filter, filterFromParcel); - } -} diff --git a/scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/ScanRecordTest.java b/scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/ScanRecordTest.java deleted file mode 100644 index 6e87bab..0000000 --- a/scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/ScanRecordTest.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package no.nordicsemi.android.support.v18.scanner; - -import android.os.ParcelUuid; -import androidx.test.runner.AndroidJUnit4; -import java.util.Arrays; -import org.junit.Test; -import org.junit.runner.RunWith; - -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertTrue; -import static junit.framework.Assert.fail; - -@RunWith(AndroidJUnit4.class) public class ScanRecordTest { - - @Test public void testParser() { - byte[] scanRecord = new byte[] { - 0x02, 0x01, 0x1a, // advertising flags - 0x05, 0x02, 0x0b, 0x11, 0x0a, 0x11, // 16 bit service uuids - 0x04, 0x09, 0x50, 0x65, 0x64, // name - 0x02, 0x0A, (byte) 0xec, // tx power level - 0x05, 0x16, 0x0b, 0x11, 0x50, 0x64, // service data - 0x05, (byte) 0xff, (byte) 0xe0, 0x00, 0x02, 0x15, // manufacturer specific data - 0x03, 0x50, 0x01, 0x02, // an unknown data type won't cause trouble - }; - ScanRecord data = ScanRecord.parseFromBytes(scanRecord); - assertEquals(0x1a, data.getAdvertiseFlags()); - ParcelUuid uuid1 = ParcelUuid.fromString("0000110A-0000-1000-8000-00805F9B34FB"); - ParcelUuid uuid2 = ParcelUuid.fromString("0000110B-0000-1000-8000-00805F9B34FB"); - assertTrue(data.getServiceUuids().contains(uuid1)); - assertTrue(data.getServiceUuids().contains(uuid2)); - assertEquals("Ped", data.getDeviceName()); - assertEquals(-20, data.getTxPowerLevel()); - assertTrue(data.getManufacturerSpecificData().get(0x00E0) != null); - assertArrayEquals(new byte[] { - 0x02, 0x15 - }, data.getManufacturerSpecificData().get(0x00E0)); - assertTrue(data.getServiceData().containsKey(uuid2)); - assertArrayEquals(new byte[] { - 0x50, 0x64 - }, data.getServiceData().get(uuid2)); - } - - // Assert two byte arrays are equal. - private static void assertArrayEquals(byte[] expected, byte[] actual) { - if (!Arrays.equals(expected, actual)) { - fail("expected:<" + Arrays.toString(expected) + - "> but was:<" + Arrays.toString(actual) + ">"); - } - } -} diff --git a/scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/ScanResultTest.java b/scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/ScanResultTest.java deleted file mode 100644 index 829aaa4..0000000 --- a/scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/ScanResultTest.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package no.nordicsemi.android.support.v18.scanner; - -import android.bluetooth.BluetoothAdapter; -import android.bluetooth.BluetoothDevice; -import android.os.Parcel; -import androidx.test.runner.AndroidJUnit4; -import org.junit.Test; -import org.junit.runner.RunWith; - -import static junit.framework.Assert.assertEquals; - -@RunWith(AndroidJUnit4.class) public class ScanResultTest { - - @Test public void testScanResultParceling() { - BluetoothDevice device = - BluetoothAdapter.getDefaultAdapter().getRemoteDevice("01:02:03:04:05:06"); - byte[] scanRecord = new byte[] { - 1, 2, 3 - }; - int rssi = -10; - long timestampMicros = 10000L; - ScanResult result = - new ScanResult(device, ScanRecord.parseFromBytes(scanRecord), rssi, timestampMicros); - Parcel parcel = Parcel.obtain(); - result.writeToParcel(parcel, 0); - // Need to reset parcel data position to the beginning. - parcel.setDataPosition(0); - ScanResult resultFromParcel = ScanResult.CREATOR.createFromParcel(parcel); - assertEquals(result, resultFromParcel); - } -} diff --git a/scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/ScanSettingsTest.java b/scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/ScanSettingsTest.java deleted file mode 100644 index 1b51124..0000000 --- a/scanner/src/androidTest/java/no/nordicsemi/android/support/v18/scanner/ScanSettingsTest.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package no.nordicsemi.android.support.v18.scanner; - -import androidx.test.runner.AndroidJUnit4; -import org.junit.Test; -import org.junit.runner.RunWith; - -import static junit.framework.Assert.fail; - -@RunWith(AndroidJUnit4.class) public class ScanSettingsTest { - - @Test public void testCallbackType() { - ScanSettings.Builder builder = new ScanSettings.Builder(); - builder.setCallbackType(ScanSettings.CALLBACK_TYPE_ALL_MATCHES); - builder.setCallbackType(ScanSettings.CALLBACK_TYPE_FIRST_MATCH); - builder.setCallbackType(ScanSettings.CALLBACK_TYPE_MATCH_LOST); - builder.setCallbackType( - ScanSettings.CALLBACK_TYPE_FIRST_MATCH | ScanSettings.CALLBACK_TYPE_MATCH_LOST); - try { - builder.setCallbackType( - ScanSettings.CALLBACK_TYPE_ALL_MATCHES | ScanSettings.CALLBACK_TYPE_MATCH_LOST); - fail("should have thrown IllegalArgumentException!"); - } catch (IllegalArgumentException e) { - // nothing to do - } - try { - builder.setCallbackType( - ScanSettings.CALLBACK_TYPE_ALL_MATCHES | ScanSettings.CALLBACK_TYPE_FIRST_MATCH); - fail("should have thrown IllegalArgumentException!"); - } catch (IllegalArgumentException e) { - // nothing to do - } - try { - builder.setCallbackType(ScanSettings.CALLBACK_TYPE_ALL_MATCHES | - ScanSettings.CALLBACK_TYPE_FIRST_MATCH | - ScanSettings.CALLBACK_TYPE_MATCH_LOST); - fail("should have thrown IllegalArgumentException!"); - } catch (IllegalArgumentException e) { - // nothing to do - } - } -} diff --git a/scanner/src/main/AndroidManifest.xml b/scanner/src/main/AndroidManifest.xml deleted file mode 100644 index 7567df0..0000000 --- a/scanner/src/main/AndroidManifest.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - -- Gitee