empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Ignore some more ZKGroup dependent tests on mac.

Browse source
This commit is contained in:
Alan Evans 2020-10-22 17:52:35 -03:00 • committed by Cody Henthorne
parent f676d1c61c
commit 5bc4686eb8
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/test/java/org/thoughtcrime/securesms/groups/GroupId_v1_v2_migration_derivation_Test.java
View file

@ -10,6 +10,7 @@ import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.thoughtcrime.securesms.groups.ZkGroupLibraryUtil.assumeZkGroupSupportedOnOS;
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
public final class GroupId_v1_v2_migration_derivation_Test { public final class GroupId_v1_v2_migration_derivation_Test {
@ -43,6 +44,8 @@ public final class GroupId_v1_v2_migration_derivation_Test {
@Test @Test
public void deriveMigrationV2GroupId() { public void deriveMigrationV2GroupId() {
assumeZkGroupSupportedOnOS();
GroupId.V1 groupV1Id = GroupId.v1orThrow(Hex.fromStringOrThrow(inputV1GroupId)); GroupId.V1 groupV1Id = GroupId.v1orThrow(Hex.fromStringOrThrow(inputV1GroupId));
GroupId.V2 migratedV2GroupId = groupV1Id.deriveV2MigrationGroupId(); GroupId.V2 migratedV2GroupId = groupV1Id.deriveV2MigrationGroupId();

2
app/src/test/java/org/thoughtcrime/securesms/groups/ZkGroupLibraryUtil.java
View file

@ -20,7 +20,7 @@ class ZkGroupLibraryUtil {
Class.forName(Native.class.getName()); Class.forName(Native.class.getName());
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
fail(); fail();
} catch (UnsatisfiedLinkError e) { } catch (NoClassDefFoundError | UnsatisfiedLinkError e) {
String osName = System.getProperty("os.name"); String osName = System.getProperty("os.name");
if (isUnix(osName)) { if (isUnix(osName)) {