WatchBuilderTest.tearDown() fix

Author: rjeberhard

operator/src/test/java/oracle/kubernetes/operator/DomainUpPlanTest.java

@@ -16,7 +16,6 @@
 import io.kubernetes.client.openapi.models.V1SubjectRulesReviewStatus;
 import oracle.kubernetes.operator.helpers.DomainPresenceInfo;
 import oracle.kubernetes.operator.helpers.KubernetesTestSupport;
-import oracle.kubernetes.operator.helpers.TuningParametersStub;
 import oracle.kubernetes.operator.helpers.UnitTestHash;
 import oracle.kubernetes.operator.steps.DomainPresenceStep;
 import oracle.kubernetes.operator.utils.InMemoryCertificates;
@@ -164,7 +163,6 @@ public void useSequenceBeforeAdminServerStep() {
 
   @Test
   public void whenAdminPodCreated_hasListenPort() throws NoSuchFieldException {
-    mementos.add(TuningParametersStub.install());
     mementos.add(UnitTestHash.install());
 
     WlsDomainConfigSupport configSupport = new WlsDomainConfigSupport("domain");

operator/src/test/java/oracle/kubernetes/operator/NamespaceTest.java

@@ -21,6 +21,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import static com.meterware.simplestub.Stub.createStrictStub;
 import static java.util.function.Function.identity;
 import static oracle.kubernetes.operator.DomainProcessorTestSetup.NS;
 import static org.hamcrest.Matchers.not;
@@ -48,7 +49,7 @@ public void setUp() throws Exception {
     mementos.add(StaticStubSupport.preserve(Main.class, "namespaceStatuses"));
     mementos.add(StaticStubSupport.preserve(Main.class, "isNamespaceStopping"));
     mementos.add(StaticStubSupport.install(Main.class, "getHelmVariable", getTestHelmValue));
-
+    mementos.add(TuningParametersStub.install(120));
     AtomicBoolean stopping = new AtomicBoolean(true);
     JobWatcher.defineFactory(r -> createDaemonThread(), tuning, ns -> stopping);
   }
@@ -103,4 +104,23 @@ private Map<String, AtomicBoolean> createNamespaceFlags() {
     return currentNamespaces.stream()
         .collect(Collectors.toMap(identity(), a -> new AtomicBoolean()));
   }
+
+  abstract static class TuningParametersStub implements TuningParameters {
+
+    int domainPresenceRecheckIntervalSeconds;
+
+    public static Memento install(int newValue) throws NoSuchFieldException {
+      return StaticStubSupport.install(
+          TuningParametersImpl.class, "INSTANCE", createStrictStub(TuningParametersStub.class, newValue));
+    }
+
+    TuningParametersStub(int domainPresenceRecheckIntervalSeconds) {
+      this.domainPresenceRecheckIntervalSeconds = domainPresenceRecheckIntervalSeconds;
+    }
+
+    @Override
+    public MainTuning getMainTuning() {
+      return new MainTuning(2, 2, domainPresenceRecheckIntervalSeconds, 2, 2, 2, 2L, 2L);
+    }
+  }
 }