MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2025-02-17 21:06:48 +01:00
Code Releases Wiki Activity

Fix tests after DeviceService changes

Browse Source
This commit is contained in:
José Rebelo 2022-08-05 21:36:16 +01:00
parent 65e054a747
commit 7892b8be6a
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
View File

@ -84,6 +84,10 @@ public class GBDeviceService implements DeviceService {
return new GBDeviceService(mContext, device);
}
public GBDevice getDevice() {
return mDevice;
}
protected Intent createIntent() {
return new Intent(mContext, mServiceClass);
}

2
app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationServiceTestCase.java
View File

@ -86,7 +86,7 @@ public class DeviceCommunicationServiceTestCase extends TestBase {
public void ensureConnected() {
mDeviceService.start();
// connection goes synchronously here
mDeviceService.connect(getDevice());
mDeviceService.forDevice(getDevice()).connect();
Mockito.verify(mockSupport, Mockito.times(1)).connect();
assertTrue(getDevice().isInitialized());
}

19
app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/TestDeviceService.java
View File

@ -7,7 +7,9 @@ import android.content.Intent;
import org.robolectric.Robolectric;
import org.robolectric.android.controller.ServiceController;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceService;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceService;
/**
* Extends GBDeviceServer so that communication with the service works
@ -17,15 +19,28 @@ class TestDeviceService extends GBDeviceService {
private final ServiceController<DeviceCommunicationService> serviceController;
private final DeviceCommunicationService service;
TestDeviceService(Context context) throws Exception {
super(context);
TestDeviceService(Context context) {
this(context, null);
}
TestDeviceService(final Context context, final GBDevice device) {
super(context, device);
serviceController = Robolectric.buildService(DeviceCommunicationService.class, createIntent());
service = serviceController.create().get();
}
@Override
public DeviceService forDevice(final GBDevice device) {
return new TestDeviceService(mContext, device);
}
@Override
protected void invokeService(Intent intent) {
if (getDevice() != null) {
intent.putExtra(GBDevice.EXTRA_DEVICE, getDevice());
}
// calling though to the service natively does not work with robolectric,
// we have to use the ServiceController to do that
service.onStartCommand(intent, Service.START_FLAG_REDELIVERY, (int) (Math.random() * 10000));