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 ar...@apache.org on 2018/05/22 20:14:50 UTC
[22/50] [abbrv] hadoop git commit: HADOOP-15154. Abstract new method
assertCapability for StreamCapabilities testing. Contributed by Zsolt
Venczel.
HADOOP-15154. Abstract new method assertCapability for StreamCapabilities testing. Contributed by Zsolt Venczel.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/89f59113
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/89f59113
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/89f59113
Branch: refs/heads/HDDS-48
Commit: 89f59113927dd886f09d8fe2c05ff2cd5d1390c1
Parents: 9775ecb
Author: Xiao Chen <xi...@apache.org>
Authored: Fri May 18 11:28:48 2018 -0700
Committer: Xiao Chen <xi...@apache.org>
Committed: Fri May 18 11:29:20 2018 -0700
----------------------------------------------------------------------
.../apache/hadoop/crypto/TestCryptoStreams.java | 39 +++++++++++++-------
.../hadoop/fs/contract/ContractTestUtils.java | 29 +++++++++++++++
2 files changed, 54 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/89f59113/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreams.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreams.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreams.java
index 2172d8a..cd7391a 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreams.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreams.java
@@ -44,8 +44,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.apache.hadoop.fs.contract.ContractTestUtils.assertCapabilities;
public class TestCryptoStreams extends CryptoStreamsTestBase {
/**
@@ -419,21 +418,33 @@ public class TestCryptoStreams extends CryptoStreamsTestBase {
// verify hasCapability returns what FakeOutputStream is set up for
CryptoOutputStream cos =
(CryptoOutputStream) getOutputStream(defaultBufferSize, key, iv);
- assertTrue(cos instanceof StreamCapabilities);
- assertTrue(cos.hasCapability(StreamCapabilities.HFLUSH));
- assertTrue(cos.hasCapability(StreamCapabilities.HSYNC));
- assertTrue(cos.hasCapability(StreamCapabilities.DROPBEHIND));
- assertFalse(cos.hasCapability(StreamCapabilities.READAHEAD));
- assertFalse(cos.hasCapability(StreamCapabilities.UNBUFFER));
+
+ assertCapabilities(cos,
+ new String[] {
+ StreamCapabilities.HFLUSH,
+ StreamCapabilities.HSYNC,
+ StreamCapabilities.DROPBEHIND
+ },
+ new String[] {
+ StreamCapabilities.READAHEAD,
+ StreamCapabilities.UNBUFFER
+ }
+ );
// verify hasCapability for input stream
CryptoInputStream cis =
(CryptoInputStream) getInputStream(defaultBufferSize, key, iv);
- assertTrue(cis instanceof StreamCapabilities);
- assertTrue(cis.hasCapability(StreamCapabilities.DROPBEHIND));
- assertTrue(cis.hasCapability(StreamCapabilities.READAHEAD));
- assertTrue(cis.hasCapability(StreamCapabilities.UNBUFFER));
- assertFalse(cis.hasCapability(StreamCapabilities.HFLUSH));
- assertFalse(cis.hasCapability(StreamCapabilities.HSYNC));
+
+ assertCapabilities(cis,
+ new String[] {
+ StreamCapabilities.DROPBEHIND,
+ StreamCapabilities.READAHEAD,
+ StreamCapabilities.UNBUFFER
+ },
+ new String[] {
+ StreamCapabilities.HFLUSH,
+ StreamCapabilities.HSYNC
+ }
+ );
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/89f59113/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/ContractTestUtils.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/ContractTestUtils.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/ContractTestUtils.java
index 54d015a..38a6fb1 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/ContractTestUtils.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/ContractTestUtils.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.LocatedFileStatus;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.RemoteIterator;
+import org.apache.hadoop.fs.StreamCapabilities;
import org.apache.hadoop.io.IOUtils;
import org.junit.Assert;
import org.junit.internal.AssumptionViolatedException;
@@ -1437,6 +1438,34 @@ public class ContractTestUtils extends Assert {
return list;
}
+ /**
+ * Custom assert to test {@link StreamCapabilities}.
+ *
+ * @param stream The stream to test for StreamCapabilities
+ * @param shouldHaveCapabilities The array of expected capabilities
+ * @param shouldNotHaveCapabilities The array of unexpected capabilities
+ */
+ public static void assertCapabilities(
+ Object stream, String[] shouldHaveCapabilities,
+ String[] shouldNotHaveCapabilities) {
+ assertTrue("Stream should be instanceof StreamCapabilities",
+ stream instanceof StreamCapabilities);
+
+ if (shouldHaveCapabilities!=null) {
+ for (String shouldHaveCapability : shouldHaveCapabilities) {
+ assertTrue("Should have capability: " + shouldHaveCapability,
+ ((StreamCapabilities) stream).hasCapability(shouldHaveCapability));
+ }
+ }
+
+ if (shouldNotHaveCapabilities!=null) {
+ for (String shouldNotHaveCapability : shouldNotHaveCapabilities) {
+ assertFalse("Should not have capability: " + shouldNotHaveCapability,
+ ((StreamCapabilities) stream)
+ .hasCapability(shouldNotHaveCapability));
+ }
+ }
+ }
/**
* Results of recursive directory creation/scan operations.
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org