YARN-10885. Modify Some Junit Test.

apache · Aug 5, 2022 · f6096e2 · f6096e2
1 parent 0eefb19
commit f6096e2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/.../main/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreFacade.java b/.../main/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreFacade.java
@@ -646,4 +646,14 @@ public boolean equals(Object obj) {
   protected interface Func<T, TResult> {
     TResult invoke(T input) throws Exception;
   }
+
+  @VisibleForTesting
+  public Cache<Object, Object> getCache() {
+    return cache;
+  }
+
+  @VisibleForTesting
+  protected Object getAppHomeSubClusterCacheRequest(String appId) {
+    return buildGetApplicationHomeSubClusterRequest(appId);
+  }
 }
diff --git a/...t/java/org/apache/hadoop/yarn/server/federation/utils/TestFederationStateStoreFacade.java b/...t/java/org/apache/hadoop/yarn/server/federation/utils/TestFederationStateStoreFacade.java
@@ -41,6 +41,8 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import javax.cache.Cache;
+
 /**
  * Unit tests for FederationStateStoreFacade.
  */
@@ -64,12 +66,14 @@ public static Collection<Boolean[]> getParameters() {
   private FederationStateStoreTestUtil stateStoreTestUtil;
   private FederationStateStoreFacade facade =
       FederationStateStoreFacade.getInstance();
+  private Boolean isCachingEnabled;
 
   public TestFederationStateStoreFacade(Boolean isCachingEnabled) {
     conf = new Configuration();
     if (!(isCachingEnabled.booleanValue())) {
       conf.setInt(YarnConfiguration.FEDERATION_CACHE_TIME_TO_LIVE_SECS, 0);
     }
+    this.isCachingEnabled = isCachingEnabled;
   }
 
   @Before
@@ -216,9 +220,17 @@ public void testGetApplicationHomeSubClusterCache() throws YarnException {
     SubClusterId subClusterIdAdd =
         facade.addApplicationHomeSubCluster(appHomeSubCluster);
 
-    SubClusterId subClusterIdCache = facade.getApplicationHomeSubCluster(appId);
-    Assert.assertEquals(subClusterIdCache, subClusterIdAdd);
+    SubClusterId subClusterIdByFacade = facade.getApplicationHomeSubCluster(appId);
+    Assert.assertEquals(subClusterIdByFacade, subClusterIdAdd);
     Assert.assertEquals(subClusterId1, subClusterIdAdd);
+
+    if (isCachingEnabled.booleanValue()) {
+      Cache<Object, Object> cache = facade.getCache();
+      Object cacheKey = facade.getAppHomeSubClusterCacheRequest(appId.toString());
+      Object subClusterIdByCache = cache.get(cacheKey);
+      Assert.assertEquals(subClusterIdByFacade, subClusterIdByCache);
+      Assert.assertEquals(subClusterId1, subClusterIdByCache);
+    }
   }
 
 }