You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by wa...@apache.org on 2014/07/16 21:04:07 UTC
svn commit: r1611140 -
/hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/CryptoStreamsTestBase.java
Author: wang
Date: Wed Jul 16 19:04:06 2014
New Revision: 1611140
URL: http://svn.apache.org/r1611140
Log:
HDFS-6405. Test Crypto streams in HDFS. (yliu via wang)
Modified:
hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/CryptoStreamsTestBase.java
Modified: hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/CryptoStreamsTestBase.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/CryptoStreamsTestBase.java?rev=1611140&r1=1611139&r2=1611140&view=diff
==============================================================================
--- hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/CryptoStreamsTestBase.java (original)
+++ hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/CryptoStreamsTestBase.java Wed Jul 16 19:04:06 2014
@@ -28,6 +28,7 @@ import java.util.Random;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.fs.ByteBufferReadable;
+import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.HasEnhancedByteBufferAccess;
import org.apache.hadoop.fs.PositionedReadable;
import org.apache.hadoop.fs.ReadOption;
@@ -146,6 +147,25 @@ public abstract class CryptoStreamsTestB
in.close();
}
+ /** Test crypto writing with different buffer size. */
+ @Test(timeout = 120000)
+ public void testWrite() throws Exception {
+ // Default buffer size
+ writeCheck(defaultBufferSize);
+
+ // Small buffer size
+ writeCheck(smallBufferSize);
+ }
+
+ private void writeCheck(int bufferSize) throws Exception {
+ OutputStream out = getOutputStream(bufferSize);
+ writeData(out);
+
+ if (out instanceof FSDataOutputStream) {
+ Assert.assertEquals(((FSDataOutputStream) out).getPos(), getDataLen());
+ }
+ }
+
/** Test crypto with different IV. */
@Test(timeout=120000)
public void testCryptoIV() throws Exception {