PGPainless/pgpainless
PGPainless
/
pgpainless
mirror of https://github.com/pgpainless/pgpainless.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Rework some tests to use MessageMetadata

This commit is contained in:
Paul Schaub 2022-11-22 15:20:06 +01:00
parent 39f8f89fe0
commit 8f6227c14b
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pgpainless-core/src/test/java/org/pgpainless/decryption_verification/MessageMetadataTest.java
View File

@ -62,7 +62,7 @@ public class MessageMetadataTest {
assertEquals("", metadata.getFilename());
JUtils.assertDateEquals(new Date(0L), metadata.getModificationDate());
assertEquals(StreamEncoding.BINARY, metadata.getFormat());
assertEquals(StreamEncoding.BINARY, metadata.getLiteralDataEncoding());
}
@Test
@ -79,6 +79,6 @@ public class MessageMetadataTest {
assertNull(metadata.getEncryptionAlgorithm());
assertEquals("collateral_murder.zip", metadata.getFilename());
assertEquals(DateUtil.parseUTCDate("2010-04-05 10:12:03 UTC"), metadata.getModificationDate());
assertEquals(StreamEncoding.BINARY, metadata.getFormat());
assertEquals(StreamEncoding.BINARY, metadata.getLiteralDataEncoding());
}
}

2
pgpainless-core/src/test/java/org/pgpainless/decryption_verification/OpenPgpMessageInputStreamTest.java
View File

@ -335,7 +335,7 @@ public class OpenPgpMessageInputStreamTest {
assertNull(metadata.getEncryptionAlgorithm());
assertEquals("", metadata.getFilename());
JUtils.assertDateEquals(new Date(0L), metadata.getModificationDate());
assertEquals(StreamEncoding.BINARY, metadata.getFormat());
assertEquals(StreamEncoding.BINARY, metadata.getLiteralDataEncoding());
assertTrue(metadata.getVerifiedInlineSignatures().isEmpty());
assertTrue(metadata.getRejectedInlineSignatures().isEmpty());
}

20
pgpainless-core/src/test/java/org/pgpainless/encryption_signing/FileInformationTest.java
View File

@ -28,7 +28,7 @@ import org.pgpainless.PGPainless;
import org.pgpainless.algorithm.StreamEncoding;
import org.pgpainless.decryption_verification.ConsumerOptions;
import org.pgpainless.decryption_verification.DecryptionStream;
import org.pgpainless.decryption_verification.OpenPgpMetadata;
import org.pgpainless.decryption_verification.MessageMetadata;
public class FileInformationTest {
@ -80,11 +80,11 @@ public class FileInformationTest {
decryptionStream.close();
OpenPgpMetadata decResult = decryptionStream.getResult();
MessageMetadata decResult = decryptionStream.getMetadata();
assertEquals(fileName, decResult.getFileName());
assertEquals(fileName, decResult.getFilename());
JUtils.assertDateEquals(modificationDate, decResult.getModificationDate());
assertEquals(encoding, decResult.getFileEncoding());
assertEquals(encoding, decResult.getLiteralDataEncoding());
}
@Test
@ -119,11 +119,11 @@ public class FileInformationTest {
decryptionStream.close();
OpenPgpMetadata decResult = decryptionStream.getResult();
MessageMetadata decResult = decryptionStream.getMetadata();
assertEquals("", decResult.getFileName());
assertEquals("", decResult.getFilename());
JUtils.assertDateEquals(PGPLiteralData.NOW, decResult.getModificationDate());
assertEquals(PGPLiteralData.BINARY, decResult.getFileEncoding().getCode());
assertEquals(PGPLiteralData.BINARY, decResult.getLiteralDataEncoding().getCode());
assertFalse(decResult.isForYourEyesOnly());
}
@ -160,11 +160,11 @@ public class FileInformationTest {
decryptionStream.close();
OpenPgpMetadata decResult = decryptionStream.getResult();
MessageMetadata decResult = decryptionStream.getMetadata();
assertEquals(PGPLiteralData.CONSOLE, decResult.getFileName());
assertEquals(PGPLiteralData.CONSOLE, decResult.getFilename());
JUtils.assertDateEquals(PGPLiteralData.NOW, decResult.getModificationDate());
assertEquals(PGPLiteralData.BINARY, decResult.getFileEncoding().getCode());
assertEquals(PGPLiteralData.BINARY, decResult.getLiteralDataEncoding().getCode());
assertTrue(decResult.isForYourEyesOnly());
}
}