From b31f6a0aecf50f1c81a1811fa588fa627c62ff68 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 4 Jan 2016 21:32:11 +0100 Subject: [PATCH] fixed another test, but not that important. thus [ci skip] --- ...yptorTest.java => FileContentCryptorImplTest.java} | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) rename main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/{FileContentCryptorTest.java => FileContentCryptorImplTest.java} (95%) diff --git a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentCryptorTest.java b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentCryptorImplTest.java similarity index 95% rename from main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentCryptorTest.java rename to main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentCryptorImplTest.java index 3102bf8e4..780e1c760 100644 --- a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentCryptorTest.java +++ b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentCryptorImplTest.java @@ -30,9 +30,9 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class FileContentCryptorTest { +public class FileContentCryptorImplTest { - private static final Logger LOG = LoggerFactory.getLogger(FileContentCryptorTest.class); + private static final Logger LOG = LoggerFactory.getLogger(FileContentCryptorImplTest.class); private static final SecureRandom RANDOM_MOCK = new SecureRandom() { @@ -74,8 +74,8 @@ public class FileContentCryptorTest { final SecretKey macKey = new SecretKeySpec(keyBytes, "HmacSHA256"); FileContentCryptor cryptor = new FileContentCryptorImpl(encryptionKey, macKey, RANDOM_MOCK); - ByteBuffer tooShortHeader = ByteBuffer.allocate(64); - cryptor.createFileContentDecryptor(tooShortHeader, 3); + ByteBuffer header = ByteBuffer.allocate(cryptor.getHeaderSize()); + cryptor.createFileContentDecryptor(header, 3); } @Test(expected = IllegalArgumentException.class) @@ -85,8 +85,7 @@ public class FileContentCryptorTest { final SecretKey macKey = new SecretKeySpec(keyBytes, "HmacSHA256"); FileContentCryptor cryptor = new FileContentCryptorImpl(encryptionKey, macKey, RANDOM_MOCK); - ByteBuffer tooShortHeader = ByteBuffer.allocate(64); - cryptor.createFileContentEncryptor(Optional.of(tooShortHeader), 3); + cryptor.createFileContentEncryptor(Optional.empty(), 3); } @Test