Refactoring tests

Author: hchaverri

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java

@@ -38,6 +38,7 @@
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.fs.statistics.IOStatistics;
 import org.apache.hadoop.fs.statistics.IOStatisticsSource;
+import org.apache.hadoop.fs.statistics.impl.IOStatisticsBinding;
 import org.apache.hadoop.fs.statistics.impl.IOStatisticsStore;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.metrics2.annotation.Metric;
@@ -59,8 +60,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.apache.hadoop.fs.statistics.impl.IOStatisticsBinding.iostatisticsStore;
-
 
 @InterfaceAudience.Public
 @InterfaceStability.Evolving
@@ -109,7 +108,7 @@ private String formatTokenId(TokenIdent id) {
    */
   private DelegationKey currentKey;
   /**
-   * Metrics to track token management operations
+   * Metrics to track token management operations.
    */
   protected DelegationTokenSecretManagerMetrics metrics;
 
@@ -890,7 +889,7 @@ static DelegationTokenSecretManagerMetrics create() {
     }
 
     public DelegationTokenSecretManagerMetrics() {
-      ioStatistics = iostatisticsStore()
+      ioStatistics = IOStatisticsBinding.iostatisticsStore()
           .withDurationTracking(STORE_TOKEN_STAT, UPDATE_TOKEN_STAT, REMOVE_TOKEN_STAT)
           .withCounters(TOKEN_FAILURE_STAT)
           .build();

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestDelegationToken.java

@@ -30,6 +30,9 @@
 import java.util.List;
 import java.util.Map;
 
+import java.util.concurrent.Callable;
+import org.apache.hadoop.metrics2.lib.MutableCounterLong;
+import org.apache.hadoop.metrics2.lib.MutableRate;
 import org.apache.hadoop.test.LambdaTestUtils;
 import org.junit.Assert;
 
@@ -625,18 +628,12 @@ public void testDelegationTokenSecretManagerMetrics() throws Exception {
     try {
       dtSecretManager.startThreads();
 
-      Assert.assertEquals(0, dtSecretManager.metrics.storeToken.lastStat().numSamples());
-      final Token<TestDelegationTokenIdentifier> token =
-          generateDelegationToken(dtSecretManager, "SomeUser", "JobTracker");
-      Assert.assertEquals(1, dtSecretManager.metrics.storeToken.lastStat().numSamples());
+      final Token<TestDelegationTokenIdentifier> token = callAndValidateMetrics(dtSecretManager.metrics.storeToken,
+          () -> generateDelegationToken(dtSecretManager, "SomeUser", "JobTracker"), 1);
 
-      Assert.assertEquals(0, dtSecretManager.metrics.updateToken.lastStat().numSamples());
-      dtSecretManager.renewToken(token, "JobTracker");
-      Assert.assertEquals(1, dtSecretManager.metrics.updateToken.lastStat().numSamples());
+      callAndValidateMetrics(dtSecretManager.metrics.updateToken, () -> dtSecretManager.renewToken(token, "JobTracker"), 1);
 
-      Assert.assertEquals(0, dtSecretManager.metrics.removeToken.lastStat().numSamples());
-      dtSecretManager.cancelToken(token, "JobTracker");
-      Assert.assertEquals(1, dtSecretManager.metrics.removeToken.lastStat().numSamples());
+      callAndValidateMetrics(dtSecretManager.metrics.removeToken, () -> dtSecretManager.cancelToken(token, "JobTracker"), 1);
     } finally {
       dtSecretManager.stopThreads();
     }
@@ -654,17 +651,32 @@ public void testDelegationTokenSecretManagerMetricsFailures() throws Exception {
 
       dtSecretManager.setThrowError(true);
 
-      Assert.assertEquals(0, dtSecretManager.metrics.tokenFailure.value());
-      generateDelegationToken(dtSecretManager, "SomeUser", "JobTracker");
-      Assert.assertEquals(1, dtSecretManager.metrics.tokenFailure.value());
+      callAndValidateMetrics(dtSecretManager.metrics.tokenFailure,
+          () -> generateDelegationToken(dtSecretManager, "SomeUser", "JobTracker"), 1, false);
 
-      LambdaTestUtils.intercept(Exception.class, () -> dtSecretManager.renewToken(token, "JobTracker"));
-      Assert.assertEquals(2, dtSecretManager.metrics.tokenFailure.value());
+      callAndValidateMetrics(dtSecretManager.metrics.tokenFailure, () -> dtSecretManager.renewToken(token, "JobTracker"), 2, true);
 
-      LambdaTestUtils.intercept(Exception.class, () -> dtSecretManager.cancelToken(token, "JobTracker"));
-      Assert.assertEquals(3, dtSecretManager.metrics.tokenFailure.value());
+      callAndValidateMetrics(dtSecretManager.metrics.tokenFailure, () -> dtSecretManager.cancelToken(token, "JobTracker"), 3, true);
     } finally {
       dtSecretManager.stopThreads();
     }
   }
+
+  private <T> T callAndValidateMetrics(MutableRate metric, Callable<T> callable, int expectedCount) throws Exception {
+    Assert.assertEquals(expectedCount - 1, metric.lastStat().numSamples());
+    T returnedObject = callable.call();
+    Assert.assertEquals(expectedCount, metric.lastStat().numSamples());
+    return returnedObject;
+  }
+
+  private <T> void callAndValidateMetrics(MutableCounterLong counter, Callable<T> callable, int expectedCount, boolean expectError)
+      throws Exception {
+    Assert.assertEquals(expectedCount - 1, counter.value());
+    if (expectError) {
+      LambdaTestUtils.intercept(IOException.class, callable);
+    } else {
+      callable.call();
+    }
+    Assert.assertEquals(expectedCount, counter.value());
+  }
 }