From 5bc4686eb8e0a8a3476b1aed36e2d4d736ab9997 Mon Sep 17 00:00:00 2001 From: Alan Evans Date: Thu, 22 Oct 2020 17:52:35 -0300 Subject: [PATCH] Ignore some more ZKGroup dependent tests on mac. --- .../groups/GroupId_v1_v2_migration_derivation_Test.java | 3 +++ .../org/thoughtcrime/securesms/groups/ZkGroupLibraryUtil.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/test/java/org/thoughtcrime/securesms/groups/GroupId_v1_v2_migration_derivation_Test.java b/app/src/test/java/org/thoughtcrime/securesms/groups/GroupId_v1_v2_migration_derivation_Test.java index 26a3d57051..75ef83ca78 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/groups/GroupId_v1_v2_migration_derivation_Test.java +++ b/app/src/test/java/org/thoughtcrime/securesms/groups/GroupId_v1_v2_migration_derivation_Test.java @@ -10,6 +10,7 @@ import java.util.Arrays; import java.util.Collection; import static org.junit.Assert.assertEquals; +import static org.thoughtcrime.securesms.groups.ZkGroupLibraryUtil.assumeZkGroupSupportedOnOS; @RunWith(Parameterized.class) public final class GroupId_v1_v2_migration_derivation_Test { @@ -43,6 +44,8 @@ public final class GroupId_v1_v2_migration_derivation_Test { @Test public void deriveMigrationV2GroupId() { + assumeZkGroupSupportedOnOS(); + GroupId.V1 groupV1Id = GroupId.v1orThrow(Hex.fromStringOrThrow(inputV1GroupId)); GroupId.V2 migratedV2GroupId = groupV1Id.deriveV2MigrationGroupId(); diff --git a/app/src/test/java/org/thoughtcrime/securesms/groups/ZkGroupLibraryUtil.java b/app/src/test/java/org/thoughtcrime/securesms/groups/ZkGroupLibraryUtil.java index 0914e91607..3d9ffcc184 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/groups/ZkGroupLibraryUtil.java +++ b/app/src/test/java/org/thoughtcrime/securesms/groups/ZkGroupLibraryUtil.java @@ -20,7 +20,7 @@ class ZkGroupLibraryUtil { Class.forName(Native.class.getName()); } catch (ClassNotFoundException e) { fail(); - } catch (UnsatisfiedLinkError e) { + } catch (NoClassDefFoundError | UnsatisfiedLinkError e) { String osName = System.getProperty("os.name"); if (isUnix(osName)) {