Repository: ambari Updated Branches: refs/heads/branch-1.6.0 ee7a0a03c -> 7efd15c1c
AMBARI-5751. Ambari upgrade to Ambari-1.6.0 from Ambari-1.5.1 logs PSQLException. Unit test fix. (mpapirkovskyy) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7efd15c1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7efd15c1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7efd15c1 Branch: refs/heads/branch-1.6.0 Commit: 7efd15c1c6933928e50c4e2eea8d2ec47e2009f7 Parents: ee7a0a0 Author: Myroslav Papirkovskyy <mpapyrkovs...@hortonworks.com> Authored: Fri May 16 20:51:26 2014 +0300 Committer: Myroslav Papirkovskyy <mpapyrkovs...@hortonworks.com> Committed: Fri May 16 20:52:04 2014 +0300 ---------------------------------------------------------------------- .../ambari/server/upgrade/UpgradeCatalog160Test.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7efd15c1/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java index e0c97d2..5eca757 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java @@ -23,10 +23,7 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; import org.apache.ambari.server.configuration.Configuration; -import org.apache.ambari.server.controller.AmbariManagementController; import org.apache.ambari.server.orm.DBAccessor; -import org.apache.ambari.server.state.Cluster; -import org.apache.ambari.server.state.Clusters; import org.easymock.Capture; import org.junit.Assert; import org.junit.Test; @@ -40,11 +37,11 @@ import java.util.Map; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.assertNull; +import static junit.framework.Assert.assertTrue; +import static org.easymock.EasyMock.aryEq; import static org.easymock.EasyMock.capture; import static org.easymock.EasyMock.createMockBuilder; -import static org.easymock.EasyMock.createNiceControl; import static org.easymock.EasyMock.createNiceMock; import static org.easymock.EasyMock.eq; import static org.easymock.EasyMock.expect; @@ -147,8 +144,8 @@ public class UpgradeCatalog160Test { dbAccessor.addColumn(eq("hostcomponentdesiredstate"), capture(restartRequiredColumnCapture)); - dbAccessor.addFKConstraint("hostgroup_configuration", "FK_hg_config_blueprint_name", - new String[]{"blueprint_name", "hostgroup_name"}, "hostgroup", new String[]{"blueprint_name", "name"}, true); + dbAccessor.addFKConstraint(eq("hostgroup_configuration"), eq("FK_hg_config_blueprint_name"), + aryEq(new String[]{"blueprint_name", "hostgroup_name"}), eq("hostgroup"), aryEq(new String[]{"blueprint_name", "name"}), eq(true)); } private void setViewEntityConfigExpectations(DBAccessor dbAccessor,
