Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F324A108F3 for ; Wed, 16 Jul 2014 19:04:31 +0000 (UTC) Received: (qmail 80027 invoked by uid 500); 16 Jul 2014 19:04:31 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 79965 invoked by uid 500); 16 Jul 2014 19:04:31 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 79956 invoked by uid 99); 16 Jul 2014 19:04:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Jul 2014 19:04:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Jul 2014 19:04:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8D4172388831; Wed, 16 Jul 2014 19:04:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1611140 - /hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/CryptoStreamsTestBase.java Date: Wed, 16 Jul 2014 19:04:07 -0000 To: common-commits@hadoop.apache.org From: wang@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140716190407.8D4172388831@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 {