hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From whe...@apache.org
Subject svn commit: r1586181 - in /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/main/java/org/apache/hadoop/hdfs/server/common/UpgradeStatusReport.java src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java
Date Thu, 10 Apr 2014 00:20:28 GMT
Author: wheat9
Date: Thu Apr 10 00:20:28 2014
New Revision: 1586181

URL: http://svn.apache.org/r1586181
Log:
HDFS-6225. Remove the o.a.h.hdfs.server.common.UpgradeStatusReport. Contributed by Haohui
Mai.

Removed:
    hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/UpgradeStatusReport.java
Modified:
    hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
    hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java

Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1586181&r1=1586180&r2=1586181&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Thu Apr 10 00:20:28 2014
@@ -288,6 +288,9 @@ Release 2.5.0 - UNRELEASED
     HDFS-6170. Support GETFILESTATUS operation in WebImageViewer.
     (Akira Ajisaka via wheat9)
 
+    HDFS-6225. Remove the o.a.h.hdfs.server.common.UpgradeStatusReport.
+    (wheat9)
+
   OPTIMIZATIONS
 
   BUG FIXES 

Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java?rev=1586181&r1=1586180&r2=1586181&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java
(original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java
Thu Apr 10 00:20:28 2014
@@ -616,33 +616,6 @@ public class TestJspHelper {
     }
   }
 
-  @Test
-  public void testUpgradeStatusReport() {
-    short status = 6;
-    int version = 15;
-    String EXPECTED__NOTF_PATTERN = "Upgrade for version {0} has been completed.\nUpgrade
is not finalized.";
-    String EXPECTED_PATTERN = "Upgrade for version {0} is in progress. Status = {1}%";
-
-    UpgradeStatusReport upgradeStatusReport = new UpgradeStatusReport(version,
-        status, true);
-    assertTrue(upgradeStatusReport.getVersion() == version);
-    assertTrue(upgradeStatusReport.getUpgradeStatus() == status);
-    assertTrue(upgradeStatusReport.isFinalized());
-
-    assertEquals(MessageFormat.format(EXPECTED_PATTERN, version, status),
-        upgradeStatusReport.getStatusText(true));
-
-    status += 100;
-    upgradeStatusReport = new UpgradeStatusReport(version, status, false);
-    assertFalse(upgradeStatusReport.isFinalized());
-    assertTrue(upgradeStatusReport.toString().equals(
-        MessageFormat.format(EXPECTED__NOTF_PATTERN, version)));
-    assertTrue(upgradeStatusReport.getStatusText(false).equals(
-        MessageFormat.format(EXPECTED__NOTF_PATTERN, version)));
-    assertTrue(upgradeStatusReport.getStatusText(true).equals(
-        MessageFormat.format(EXPECTED__NOTF_PATTERN, version)));
-  }  
-  
   @Test 
   public void testAuthority(){
     DatanodeID dnWithIp = new DatanodeID("127.0.0.1", "hostName", null,



Mime
View raw message