Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-22 07:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_bt_test_data' into 'master'

Browse Source 
Create a valid BT MAC and UUID when creating testdata

See merge request akwizgran/briar!769
This commit is contained in:
akwizgran
2018-04-24 09:26:42 +00:00
parent 951605151f 575847cb36
commit b30c2a8033
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java
View File

@@ -45,6 +45,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
import java.util.UUID;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -52,6 +53,7 @@ import javax.inject.Inject;
import static java.util.logging.Level.INFO; import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static org.briarproject.bramble.api.plugin.BluetoothConstants.UUID_BYTES;
import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED; import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED;
import static org.briarproject.bramble.util.StringUtils.getRandomString; import static org.briarproject.bramble.util.StringUtils.getRandomString;
import static org.briarproject.briar.test.TestData.AUTHOR_NAMES; import static org.briarproject.briar.test.TestData.AUTHOR_NAMES;
@@ -206,7 +208,9 @@ public class TestDataCreatorImpl implements TestDataCreator {
// Bluetooth // Bluetooth
TransportProperties bt = new TransportProperties(); TransportProperties bt = new TransportProperties();
String btAddress = getRandomBluetoothAddress(); String btAddress = getRandomBluetoothAddress();
String uuid = getRandomUUID();
bt.put(BluetoothConstants.PROP_ADDRESS, btAddress); bt.put(BluetoothConstants.PROP_ADDRESS, btAddress);
bt.put(BluetoothConstants.PROP_UUID,uuid);
props.put(BluetoothConstants.ID, bt); props.put(BluetoothConstants.ID, bt);
// LAN // LAN
@@ -231,11 +235,17 @@ public class TestDataCreatorImpl implements TestDataCreator {
StringBuilder sb = new StringBuilder(18); StringBuilder sb = new StringBuilder(18);
for (byte b : mac) { for (byte b : mac) {
if (sb.length() > 0) sb.append(":"); if (sb.length() > 0) sb.append(":");
sb.append(String.format("%02x", b)); sb.append(String.format("%02X", b));
} }
return sb.toString(); return sb.toString();
} }
private String getRandomUUID() {
byte[] uuid = new byte[UUID_BYTES];
random.nextBytes(uuid);
return UUID.nameUUIDFromBytes(uuid).toString();
}
private String getRandomLanAddress() { private String getRandomLanAddress() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
// address // address