mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-28 12:47:43 +00:00
Code Issues Releases Wiki Activity

Remove old protocol v6 code from DeviceTest.java

Browse Source
This commit is contained in:
Philip Cohn-Cort 2020-03-11 01:01:46 -04:00
parent 06a73ca856
commit 7e935a495e
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/org/kde/kdeconnect/DeviceTest.java
View File

@ -155,17 +155,6 @@ public class DeviceTest {
Device.PairingCallback pairingCallback = Mockito.mock(Device.PairingCallback.class); Device.PairingCallback pairingCallback = Mockito.mock(Device.PairingCallback.class);
device.addPairingCallback(pairingCallback); device.addPairingCallback(pairingCallback);
KeyPair keyPair;
try {
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
keyGen.initialize(2048);
keyPair = keyGen.genKeyPair();
} catch (Exception e) {
Log.e("KDE/initializeRsaKeys", "Exception", e);
Log.e("KDE/initializeRsaKeys", "Exception", e);
return;
}
device.publicKey = keyPair.getPublic();
ArgumentCaptor<BasePairingHandler.PairingHandlerCallback> pairingHandlerCallback = ArgumentCaptor.forClass(BasePairingHandler.PairingHandlerCallback.class); ArgumentCaptor<BasePairingHandler.PairingHandlerCallback> pairingHandlerCallback = ArgumentCaptor.forClass(BasePairingHandler.PairingHandlerCallback.class);
Mockito.verify(link, Mockito.times(1)).getPairingHandler(eq(device), pairingHandlerCallback.capture()); Mockito.verify(link, Mockito.times(1)).getPairingHandler(eq(device), pairingHandlerCallback.capture());
@ -174,7 +163,6 @@ public class DeviceTest {
assertEquals(device.getDeviceId(), "unpairedTestDevice"); assertEquals(device.getDeviceId(), "unpairedTestDevice");
assertEquals(device.getName(), "Unpaired Test Device"); assertEquals(device.getName(), "Unpaired Test Device");
assertEquals(device.getDeviceType(), Device.DeviceType.Phone); assertEquals(device.getDeviceType(), Device.DeviceType.Phone);
assertNotNull(device.publicKey);
assertNull(device.certificate); assertNull(device.certificate);
pairingHandlerCallback.getValue().pairingDone(); pairingHandlerCallback.getValue().pairingDone();
@ -196,14 +184,6 @@ public class DeviceTest {
@Test @Test
public void testPairingDoneWithCertificate() { public void testPairingDoneWithCertificate() {
KeyPair keyPair = null;
try {
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
keyGen.initialize(2048);
keyPair = keyGen.genKeyPair();
} catch (Exception e) {
Log.e("KDE/initializeRsaKeys", "Exception", e);
}
NetworkPacket fakeNetworkPacket = new NetworkPacket(NetworkPacket.PACKET_TYPE_IDENTITY); NetworkPacket fakeNetworkPacket = new NetworkPacket(NetworkPacket.PACKET_TYPE_IDENTITY);
fakeNetworkPacket.set("deviceId", "unpairedTestDevice"); fakeNetworkPacket.set("deviceId", "unpairedTestDevice");
@ -234,13 +214,11 @@ public class DeviceTest {
Mockito.when(link.getPairingHandler(any(Device.class), any(BasePairingHandler.PairingHandlerCallback.class))).thenReturn(Mockito.mock(LanPairingHandler.class)); Mockito.when(link.getPairingHandler(any(Device.class), any(BasePairingHandler.PairingHandlerCallback.class))).thenReturn(Mockito.mock(LanPairingHandler.class));
Mockito.when(link.getLinkProvider()).thenReturn(linkProvider); Mockito.when(link.getLinkProvider()).thenReturn(linkProvider);
Device device = new Device(context, fakeNetworkPacket, link); Device device = new Device(context, fakeNetworkPacket, link);
device.publicKey = keyPair.getPublic();
assertNotNull(device); assertNotNull(device);
assertEquals(device.getDeviceId(), "unpairedTestDevice"); assertEquals(device.getDeviceId(), "unpairedTestDevice");
assertEquals(device.getName(), "Unpaired Test Device"); assertEquals(device.getName(), "Unpaired Test Device");
assertEquals(device.getDeviceType(), Device.DeviceType.Phone); assertEquals(device.getDeviceType(), Device.DeviceType.Phone);
assertNotNull(device.publicKey);
assertNotNull(device.certificate); assertNotNull(device.certificate);
Method method; Method method;