diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 1bc9c8fd50a..59fedc8df5e 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) 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 3f0b89dec91..02e9faac70a 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 static void assertGlobEquals(File dir, String pattern, 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 toString() value