AMBARI-6011. Log on Upgrade path seems wrong. (mpapirkovskyy)

ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java

@@ -262,8 +262,7 @@ public abstract class AbstractUpgradeCatalog implements UpgradeCatalog {
 
   @Override
   public String toString() {
-    return "{ " + this.getClass().getCanonicalName() +": " +
-      "sourceVersion = " + getSourceVersion() + ", " +
+    return "{ ugradeCatalog: sourceVersion = " + getSourceVersion() + ", " +
       "targetVersion = " + getTargetVersion() + " }";
   }
 }

ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog151.java

@@ -31,6 +31,12 @@ import java.util.List;
  * Upgrade catalog for version 1.5.1.
  */
 public class UpgradeCatalog151 extends AbstractUpgradeCatalog {
+  
+  //SourceVersion is only for book-keeping purpose
+  @Override
+  public String getSourceVersion() {
+    return "1.5.0";
+  }
 
 
   // ----- Constructors ------------------------------------------------------

ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog160.java

@@ -37,6 +37,12 @@ import com.google.inject.Injector;
  */
 public class UpgradeCatalog160 extends AbstractUpgradeCatalog {
 
+  //SourceVersion is only for book-keeping purpos  
+  @Override
+  public String getSourceVersion() {
+    return "1.5.1";
+  }
+
   // ----- Constructors ------------------------------------------------------
 
   @Inject

ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog161.java

@@ -43,6 +43,12 @@ import com.google.inject.Injector;
  */
 public class UpgradeCatalog161 extends AbstractUpgradeCatalog {
 
+  //SourceVersion is only for book-keeping purpos
+  @Override
+  public String getSourceVersion() {
+    return "1.6.0";
+  }
+
   /**
    * Logger.
    */

ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog150Test.java

@@ -293,4 +293,10 @@ public class UpgradeCatalog150Test {
     }
     Assert.assertFalse(failFlag);
   }
+  
+  @Test
+  public void testGetSourceVersion() {
+    UpgradeCatalog150 upgradeCatalog150 = injector.getInstance(UpgradeCatalog150.class);
+    Assert.assertNull(upgradeCatalog150.getSourceVersion());
+  }  
 }

ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog151Test.java

@@ -104,5 +104,11 @@ public class UpgradeCatalog151Test {
     Injector injector = Guice.createInjector(module);
     return injector.getInstance(UpgradeCatalog151.class);
   }
-
+  
+  @Test
+  public void testGetSourceVersion() {
+    final DBAccessor dbAccessor     = createNiceMock(DBAccessor.class);
+    UpgradeCatalog upgradeCatalog = getUpgradeCatalog(dbAccessor);
+    Assert.assertEquals("1.5.0", upgradeCatalog.getSourceVersion());
+  }  
 }

ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java

@@ -271,7 +271,13 @@ public class UpgradeCatalog160Test {
     assertNull(column.getDefaultValue());
     assertTrue(column.isNullable());
   }
-
+  
+  @Test
+  public void testGetSourceVersion() {
+    final DBAccessor dbAccessor     = createNiceMock(DBAccessor.class);
+    UpgradeCatalog upgradeCatalog = getUpgradeCatalog(dbAccessor);
+    Assert.assertEquals("1.5.1", upgradeCatalog.getSourceVersion());
+  }  
   /**
    * Checks that the restart_require column was created correct when using a
    * non-Postgres DB (MySQL, Oracle, etc).

ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog161Test.java

@@ -311,7 +311,7 @@ public class UpgradeCatalog161Test {
     assertEquals(String.class, column.getType());
     assertNull(column.getDefaultValue());
     assertTrue(column.isNullable());
-
+  
     column = descriptionColumnCapture.getValue();
     assertEquals("description", column.getName());
     assertEquals(255, (int) column.getLength());
@@ -340,4 +340,11 @@ public class UpgradeCatalog161Test {
     assertNull(column.getDefaultValue());
     assertTrue(column.isNullable());
   }
+  
+  @Test
+  public void testGetSourceVersion() {
+    final DBAccessor dbAccessor     = createNiceMock(DBAccessor.class);
+    UpgradeCatalog upgradeCatalog = getUpgradeCatalog(dbAccessor);
+    Assert.assertEquals("1.6.0", upgradeCatalog.getSourceVersion());
+  }   
 }