Repository: ambari Updated Branches: refs/heads/branch-feature-logsearch-ui ed660940a -> 0b6679afc
http://git-wip-us.apache.org/repos/asf/ambari/blob/af1bf85c/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java index 782cf2c..a342baa 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java @@ -179,7 +179,7 @@ public class UpgradeCatalog300Test { // component table Capture<DBAccessor.DBColumnInfo> componentStateColumn = newCapture(); - dbAccessor.addColumn(eq(UpgradeCatalog250.COMPONENT_TABLE), capture(componentStateColumn)); + dbAccessor.addColumn(eq(UpgradeCatalog300.COMPONENT_TABLE), capture(componentStateColumn)); replay(dbAccessor, configuration); http://git-wip-us.apache.org/repos/asf/ambari/blob/af1bf85c/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogTest.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogTest.java index fa40db9..aee334b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogTest.java @@ -82,8 +82,9 @@ public class UpgradeCatalogTest { Multibinder<UpgradeCatalog> catalogBinder = Multibinder.newSetBinder(binder(), UpgradeCatalog.class); catalogBinder.addBinding().to(UpgradeCatalog201.class); - catalogBinder.addBinding().to(UpgradeCatalog200.class); - catalogBinder.addBinding().to(UpgradeCatalog210.class); + catalogBinder.addBinding().to(UpgradeCatalog251.class); + catalogBinder.addBinding().to(UpgradeCatalog252.class); + catalogBinder.addBinding().to(UpgradeCatalog300.class); } } @@ -113,13 +114,13 @@ public class UpgradeCatalogTest { Set<UpgradeCatalog> upgradeCatalogSet = schemaUpgradeHelper.getAllUpgradeCatalogs(); Assert.assertNotNull(upgradeCatalogSet); - Assert.assertEquals(3, upgradeCatalogSet.size()); + Assert.assertEquals(4, upgradeCatalogSet.size()); - List<UpgradeCatalog> upgradeCatalogs = schemaUpgradeHelper.getUpgradePath(null, "2.0.1"); + List<UpgradeCatalog> upgradeCatalogs = schemaUpgradeHelper.getUpgradePath(null, "2.5.1"); Assert.assertNotNull(upgradeCatalogs); Assert.assertEquals(2, upgradeCatalogs.size()); - Assert.assertEquals("2.0.0", upgradeCatalogs.get(0).getTargetVersion()); - Assert.assertEquals("2.0.1", upgradeCatalogs.get(1).getTargetVersion()); + Assert.assertEquals("2.0.1", upgradeCatalogs.get(0).getTargetVersion()); + Assert.assertEquals("2.5.1", upgradeCatalogs.get(1).getTargetVersion()); } }
