Repository: ambari Updated Branches: refs/heads/branch-2.5 5439392f9 -> 22ccdbf67
AMBARI-20875. Removing A Service Causes DB Verification To Produce Warnings. Fix (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/22ccdbf6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/22ccdbf6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/22ccdbf6 Branch: refs/heads/branch-2.5 Commit: 22ccdbf670f9f0888e975a73a44f264e929d218c Parents: 5439392 Author: Lisnichenko Dmitro <[email protected]> Authored: Tue Jun 6 16:48:29 2017 +0300 Committer: Lisnichenko Dmitro <[email protected]> Committed: Tue Jun 6 16:48:29 2017 +0300 ---------------------------------------------------------------------- .../server/upgrade/UpgradeCatalog252Test.java | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/22ccdbf6/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog252Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog252Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog252Test.java index 484ca5b..b71b335 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog252Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog252Test.java @@ -18,6 +18,15 @@ package org.apache.ambari.server.upgrade; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.capture; +import static org.easymock.EasyMock.eq; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.newCapture; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.reset; +import static org.easymock.EasyMock.verify; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; @@ -52,15 +61,6 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.Provider; -import static org.easymock.EasyMock.anyObject; -import static org.easymock.EasyMock.capture; -import static org.easymock.EasyMock.eq; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.newCapture; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.reset; -import static org.easymock.EasyMock.verify; - /** * {@link org.apache.ambari.server.upgrade.UpgradeCatalog252} unit tests. */ @@ -160,7 +160,7 @@ public class UpgradeCatalog252Test { DBColumnInfo captured = hrcBackgroundColumnCapture.getValue(); Assert.assertEquals(UpgradeCatalog252.SERVICE_DELETED_COLUMN, captured.getName()); - Assert.assertEquals(false, captured.getDefaultValue()); - Assert.assertEquals(Boolean.class, captured.getType()); + Assert.assertEquals(0, captured.getDefaultValue()); + Assert.assertEquals(Short.class, captured.getType()); } }
