wip

FlowCrypt · Jan 29, 2025 · 989d5f6 · 989d5f6
1 parent 35a4eb2
commit 989d5f6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/FlowCrypt/src/test/java/com/flowcrypt/email/security/pgp/PgpDecryptAndOrVerifyTest.kt b/FlowCrypt/src/test/java/com/flowcrypt/email/security/pgp/PgpDecryptAndOrVerifyTest.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact [email protected]
- * Contributors: denbond7
+ * Contributors: DenBond7
  */
 
 package com.flowcrypt.email.security.pgp
@@ -36,8 +36,7 @@ import java.util.UUID
 class PgpDecryptAndOrVerifyTest {
 
   @get:Rule
-  val temporaryFolder: TemporaryFolder =
-    TemporaryFolder.builder().parentFolder(SHARED_FOLDER).build()
+  val temporaryFolder: TemporaryFolder = TemporaryFolder()
 
   @Test
   @Ignore("need to add realization")
@@ -65,8 +64,8 @@ class PgpDecryptAndOrVerifyTest {
       destOutputStream = outputStreamForEncryptedSource,
       pgpPublicKeyRingCollection = PGPPublicKeyRingCollection(
         listOf(
-          senderPGPSecretKeyRing.certificate,
-          receiverPGPSecretKeyRing.certificate
+          KeyRingUtils.publicKeyRingFrom(senderPGPSecretKeyRing),
+          KeyRingUtils.publicKeyRingFrom(receiverPGPSecretKeyRing)
         )
       ),
       doArmor = false
@@ -105,8 +104,8 @@ class PgpDecryptAndOrVerifyTest {
       destOutputStream = outputStreamForEncryptedSource,
       pgpPublicKeyRingCollection = PGPPublicKeyRingCollection(
         listOf(
-          senderPGPSecretKeyRing.certificate,
-          receiverPGPSecretKeyRing.certificate
+          KeyRingUtils.publicKeyRingFrom(senderPGPSecretKeyRing),
+          KeyRingUtils.publicKeyRingFrom(receiverPGPSecretKeyRing)
         )
       ),
       doArmor = false
@@ -186,8 +185,8 @@ class PgpDecryptAndOrVerifyTest {
       destOutputStream = outputStreamForEncryptedSource,
       pgpPublicKeyRingCollection = PGPPublicKeyRingCollection(
         listOf(
-          senderPGPSecretKeyRing.certificate,
-          receiverPGPSecretKeyRing.certificate
+          KeyRingUtils.publicKeyRingFrom(senderPGPSecretKeyRing),
+          KeyRingUtils.publicKeyRingFrom(receiverPGPSecretKeyRing)
         )
       ),
       doArmor = shouldSrcBeArmored

diff --git a/FlowCrypt/src/test/java/com/flowcrypt/email/util/CreateFileWithIncreasedIndexTest.kt b/FlowCrypt/src/test/java/com/flowcrypt/email/util/CreateFileWithIncreasedIndexTest.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact [email protected]
- * Contributors: denbond7
+ * Contributors: DenBond7
  */
 
 package com.flowcrypt.email.util
@@ -15,8 +15,7 @@ import org.junit.rules.TemporaryFolder
  */
 class CreateFileWithIncreasedIndexTest {
   @get:Rule
-  val temporaryFolder: TemporaryFolder =
-    TemporaryFolder.builder().parentFolder(SHARED_FOLDER).build()
+  val temporaryFolder: TemporaryFolder = TemporaryFolder()
 
   @Test
   fun fileWithExistedNameOnce() {