AMBARI-19040. Fix NPE in UpgradeCatalog250Test.testExecuteDMLUpdates (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7f04e79a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7f04e79a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7f04e79a Branch: refs/heads/branch-dev-patch-upgrade Commit: 7f04e79ab33dc173eb174fd9fcc60bbb54d2c947 Parents: 1e65ba6 Author: Robert Levas <rle...@hortonworks.com> Authored: Wed Nov 30 20:38:34 2016 -0500 Committer: Robert Levas <rle...@hortonworks.com> Committed: Wed Nov 30 20:38:34 2016 -0500 ---------------------------------------------------------------------- .../org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7f04e79a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java index 14fc20b..978e2dc 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java @@ -212,11 +212,13 @@ public class UpgradeCatalog250Test { Method updateAmsConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateAMSConfigs"); Method addNewConfigurationsFromXml = AbstractUpgradeCatalog.class.getDeclaredMethod("addNewConfigurationsFromXml"); Method updateKafkaConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateKafkaConfigs"); + Method updateHiveLlapConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateHiveLlapConfigs"); UpgradeCatalog250 upgradeCatalog250 = createMockBuilder(UpgradeCatalog250.class) .addMockedMethod(updateAmsConfigs) .addMockedMethod(addNewConfigurationsFromXml) .addMockedMethod(updateKafkaConfigs) + .addMockedMethod(updateHiveLlapConfigs) .createMock(); upgradeCatalog250.updateAMSConfigs(); @@ -228,6 +230,9 @@ public class UpgradeCatalog250Test { upgradeCatalog250.updateKafkaConfigs(); expectLastCall().once(); + upgradeCatalog250.updateHiveLlapConfigs(); + expectLastCall().once(); + replay(upgradeCatalog250); upgradeCatalog250.executeDMLUpdates();