From 72c0d2cb962f75f9c3a13d7bcd3097bc0eaddf2a Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 15 Dec 2015 21:43:24 +0100 Subject: [PATCH] removed timeouts from tests, as timeouts were caused by slow JVM stuff like class loading or Cipher.getInstance --- .../org/cryptomator/crypto/engine/impl/CryptorImplTest.java | 4 ++-- .../crypto/engine/impl/FilenameCryptorImplTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/impl/CryptorImplTest.java b/main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/impl/CryptorImplTest.java index 98a33d914..c6cee4b48 100644 --- a/main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/impl/CryptorImplTest.java +++ b/main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/impl/CryptorImplTest.java @@ -29,7 +29,7 @@ public class CryptorImplTest { }; - @Test(timeout = 1000) + @Test public void testMasterkeyDecryption() throws IOException { final String testMasterKey = "{\"version\":3,\"scryptSalt\":\"AAAAAAAAAAA=\",\"scryptCostParam\":2,\"scryptBlockSize\":8," // + "\"primaryMasterKey\":\"mM+qoQ+o0qvPTiDAZYt+flaC3WbpNAx1sTXaUzxwpy0M9Ctj6Tih/Q==\"," // @@ -39,7 +39,7 @@ public class CryptorImplTest { Assert.assertTrue(cryptor.readKeysFromMasterkeyFile(testMasterKey.getBytes(), "asd")); } - @Test(timeout = 5000) + @Test public void testMasterkeyEncryption() throws IOException { final String expectedMasterKey = "{\"version\":3,\"scryptSalt\":\"AAAAAAAAAAA=\",\"scryptCostParam\":16384,\"scryptBlockSize\":8," // + "\"primaryMasterKey\":\"BJPIq5pvhN24iDtPJLMFPLaVJWdGog9k4n0P03j4ru+ivbWY9OaRGQ==\"," // diff --git a/main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImplTest.java b/main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImplTest.java index 251fa1835..f0ef516f7 100644 --- a/main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImplTest.java +++ b/main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImplTest.java @@ -20,7 +20,7 @@ import org.junit.Test; public class FilenameCryptorImplTest { - @Test(timeout = 1000) + @Test public void testDeterministicEncryptionOfFilenames() throws IOException { final byte[] keyBytes = new byte[32]; final SecretKey encryptionKey = new SecretKeySpec(keyBytes, "AES"); @@ -46,7 +46,7 @@ public class FilenameCryptorImplTest { Assert.assertEquals(originalPath3, decryptedPath3); } - @Test(timeout = 1000) + @Test public void testDeterministicHashingOfDirectoryIds() throws IOException { final byte[] keyBytes = new byte[32]; final SecretKey encryptionKey = new SecretKeySpec(keyBytes, "AES");