Merge branch 'develop' into stable

This commit is contained in:
2021-01-05 16:18:19 -05:00
2 changed files with 11 additions and 10 deletions

View File

@@ -8,8 +8,8 @@
<description>This project implements the javax.crypto API using java.nio instead of java.io.</description>
<properties>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>

View File

@@ -23,22 +23,24 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import com.inteligr8.nio.IVDecryptingByteChannel;
import com.inteligr8.nio.IVEncryptingByteChannel;
public class StreamingCryptoByteChannelUnitTest {
private static File m2dir;
private static Key key;
@BeforeClass
public static void createKey() throws Exception {
String m2path = System.getProperty("user.m2path");
if (m2path == null)
m2path = System.getProperty("user.home") + "/.m2";
m2dir = new File(m2path);
key = KeyGenerator.getInstance("AES").generateKey();
}
@Test
public void streamNioCryptoJar100() throws IOException, InterruptedException, TimeoutException, ExecutionException {
File userHome = new File(System.getProperty("user.home"));
File jar = new File(userHome, ".m2/repository/org/alfresco/consulting/nio-crypto/1.0.0-SNAPSHOT/nio-crypto-1.0.0-SNAPSHOT.jar");
File jar = new File(m2dir, "repository/com/inteligr8/nio-crypto/1.0-SNAPSHOT/nio-crypto-1.0-SNAPSHOT.jar");
this.stream(jar, 16384);
this.stream(jar, 1024);
this.stream(jar, 32);
@@ -47,9 +49,8 @@ public class StreamingCryptoByteChannelUnitTest {
}
@Test
public void streamAlfrescoWar50d() throws IOException, InterruptedException, TimeoutException, ExecutionException {
File userHome = new File(System.getProperty("user.home"));
File war = new File(userHome, ".m2/repository/org/alfresco/alfresco/5.0.d/alfresco-5.0.d.war");
public void streamAlfrescoPdfRenderer11() throws IOException, InterruptedException, TimeoutException, ExecutionException {
File war = new File(m2dir, "repository/org/alfresco/alfresco-pdf-renderer/1.1/alfresco-pdf-renderer-1.1-win64.tgz");
this.stream(war, 16384);
}