Merge pull request #515 from oracle/refine_monitoring

Clean map in test, show returned map on failure

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/helpers/ServerKubernetesObjectsManager.java

@@ -14,6 +14,10 @@ public class ServerKubernetesObjectsManager {
 
   private ServerKubernetesObjectsManager() {}
 
+  static void clear() {
+    serverMap.clear();
+  }
+
   static ServerKubernetesObjects getOrCreate(DomainPresenceInfo info, String serverName) {
     return getOrCreate(info, info.getDomain().getSpec().getDomainUID(), serverName);
   }

operator/src/test/java/oracle/kubernetes/operator/helpers/ServerKubernetesObjectsLookupTest.java

@@ -43,7 +43,9 @@ protected void failed(Throwable e, Description description) {
             Memento serverMap =
                 StaticStubSupport.preserve(ServerKubernetesObjectsManager.class, "serverMap");
             Map<String, ServerKubernetesObjects> map = serverMap.getOriginalValue();
-            System.out.println("   " + map);
+            System.out.println("   internal: " + map);
+            System.out.println(
+                "   returned: " + ServerKubernetesObjectsManager.getServerKubernetesObjects());
           } catch (NoSuchFieldException ignored) {
           }
         }
@@ -58,11 +60,12 @@ public void setUp() throws Exception {
     mementos.add(
         StaticStubSupport.install(
             ServerKubernetesObjectsManager.class, "serverMap", new ConcurrentHashMap<>()));
+    ServerKubernetesObjectsManager.clear();
     DomainPresenceMonitor.clear();
   }
 
   @After
-  public void tearDown() throws Exception {
+  public void tearDown() {
     for (Memento memento : mementos) memento.revert();
   }