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 st...@apache.org on 2015/10/28 11:36:53 UTC
[2/2] hadoop git commit: HADOOP-12514. Make static fields in
GenericTestUtils for assertExceptionContains() package-private and final.
(Mingliang Liu via stevel)
HADOOP-12514. Make static fields in GenericTestUtils for assertExceptionContains() package-private and final. (Mingliang Liu via stevel)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a04b1697
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a04b1697
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a04b1697
Branch: refs/heads/trunk
Commit: a04b16970b0dbe903ac9a3a2a3080cf6de181bc2
Parents: ff2b2be
Author: Steve Loughran <st...@apache.org>
Authored: Wed Oct 28 10:36:26 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Oct 28 10:36:43 2015 +0000
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 4 ++++
.../test/java/org/apache/hadoop/test/GenericTestUtils.java | 7 +++----
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a04b1697/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 1bc9c8f..59fedc8 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -919,6 +919,10 @@ Release 2.8.0 - UNRELEASED
HADOOP-12472. Make GenericTestUtils.assertExceptionContains robust.
(Steve Loughran via jing9)
+ HADOOP-12514. Make static fields in GenericTestUtils for
+ assertExceptionContains() package-private and final.
+ (Mingliang Liu via stevel)
+
HADOOP-12520. Use XInclude in hadoop-azure test configuration to isolate
Azure Storage account keys for service integration tests. (cnauroth)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a04b1697/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java
index 3f0b89d..02e9faa 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java
@@ -143,11 +143,10 @@ public abstract class GenericTestUtils {
Joiner.on(",").join(found));
}
- protected static String E_NULL_THROWABLE = "Null Throwable";
- protected static String E_NULL_THROWABLE_STRING =
+ static final String E_NULL_THROWABLE = "Null Throwable";
+ static final String E_NULL_THROWABLE_STRING =
"Null Throwable.toString() value";
- protected static String E_UNEXPECTED_EXCEPTION =
- "but got unexpected exception";
+ static final String E_UNEXPECTED_EXCEPTION = "but got unexpected exception";
/**
* Assert that an exception's <code>toString()</code> value