COH-21718 Port CE related changes to verify the ServiceMonitor thread closes in DefaultCacheServerTest (14.1.1.0 --> ce/14.1.1.0)

[git-p4: depot-paths = "//dev/coherence-ce/release/coherence-ce-v14.1.1.0/": change = 81330]

Author: fryp

prj/coherence-testing-support/src/main/java/util/ThreadHelper.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates.
+ *
+ * Licensed under the Universal Permissive License v 1.0 as shown at
+ * http://oss.oracle.com/licenses/upl.
+ */
+package util;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+/**
+ * Thread related helpers.
+ *
+ * @author phf 2020.08.27
+ */
+public class ThreadHelper
+    {
+    /**
+     * Get a collection of threads whose names start with the given prefix.
+     *
+     * @param sPrefix  the thread name prefix
+     *
+     * @return the thread
+     */
+    public static Collection<Thread> getThreadsByPrefix(String sPrefix)
+        {
+        ThreadGroup threadGroup = Thread.currentThread().getThreadGroup();
+
+        ThreadGroup parentThreadGroup;
+        while ((parentThreadGroup = threadGroup.getParent()) != null)
+            {
+            threadGroup = parentThreadGroup;
+            }
+
+        Thread[] aThreads = new Thread[threadGroup.activeCount() + 1];
+        threadGroup.enumerate(aThreads);
+
+        Collection<Thread> colThreads = new HashSet<>();
+        for (Thread thread : aThreads)
+            {
+            String sName = thread == null ? null : thread.getName();
+
+            if (sName != null && sName.startsWith(sPrefix))
+                {
+                colThreads.add(thread);
+                }
+            }
+
+        return colThreads;
+        }
+    }

prj/coherence/src/test/java/com/tangosol/net/DefaultCacheServerTest.java

@@ -16,6 +16,7 @@
 
 import com.oracle.coherence.common.base.Blocking;
 
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -24,14 +25,24 @@
 import java.util.List;
 import java.util.Map;
 
+import util.ThreadHelper;
+
 import static com.oracle.bedrock.deferred.DeferredHelper.invoking;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
-
 public class DefaultCacheServerTest
     {
+    /**
+     * COH-21718 - Ensure the DCS ServiceMonitor thread has stopped.
+     */
+    @After
+    public void cleanup()
+        {
+        Eventually.assertDeferred(() -> ThreadHelper.getThreadsByPrefix("ServiceMonitor").isEmpty(), is(true));
+        }
+
     /**
      * Ensure a new {@link DefaultCacheServer} instance with a null
      * {@link ConfigurableCacheFactory} instance fails and passes with a

prj/coherence/src/test/java/com/tangosol/util/fsm/DynamicEventTest.java

@@ -18,6 +18,8 @@
 import org.junit.After;
 import org.junit.Test;
 
+import util.ThreadHelper;
+
 import static com.oracle.bedrock.testsupport.deferred.Eventually.within;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
@@ -35,7 +37,7 @@ public class DynamicEventTest
     @After
     public void cleanup()
         {
-        Eventually.assertDeferred(() -> NonBlockingFiniteStateMachineTest.getThreadsByName(FSM_NAME_PREFIX).isEmpty(), is(true));
+        Eventually.assertDeferred(() -> ThreadHelper.getThreadsByPrefix(FSM_NAME_PREFIX).isEmpty(), is(true));
         }
 
     /**

prj/coherence/src/test/java/com/tangosol/util/fsm/NonBlockingFiniteStateMachineAnnotationTest.java

@@ -26,6 +26,8 @@
 import org.junit.After;
 import org.junit.Test;
 
+import util.ThreadHelper;
+
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
@@ -42,7 +44,7 @@ public class NonBlockingFiniteStateMachineAnnotationTest
     @After
     public void cleanup()
         {
-        Eventually.assertDeferred(() -> NonBlockingFiniteStateMachineTest.getThreadsByName(FSM_NAME_PREFIX).isEmpty(), is(true));
+        Eventually.assertDeferred(() -> ThreadHelper.getThreadsByPrefix(FSM_NAME_PREFIX).isEmpty(), is(true));
         }
 
     /**

prj/coherence/src/test/java/com/tangosol/util/fsm/NonBlockingFiniteStateMachineTest.java

@@ -23,13 +23,13 @@
 import org.junit.After;
 import org.junit.Test;
 
-import java.util.Collection;
 import java.util.EnumSet;
-import java.util.HashSet;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import util.ThreadHelper;
+
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
@@ -47,7 +47,7 @@ public class NonBlockingFiniteStateMachineTest
     @After
     public void cleanup()
         {
-        Eventually.assertDeferred(() -> getThreadsByName(FSM_NAME_PREFIX).isEmpty(), is(true));
+        Eventually.assertDeferred(() -> ThreadHelper.getThreadsByPrefix(FSM_NAME_PREFIX).isEmpty(), is(true));
         }
 
     /**
@@ -367,47 +367,11 @@ public void testFSMWorkerThread()
 
         machine.start();
 
-        Eventually.assertDeferred(() -> getThreadsByName(FSM_NAME_PREFIX).size(), is(1));
+        Eventually.assertDeferred(() -> ThreadHelper.getThreadsByPrefix(FSM_NAME_PREFIX).size(), is(1));
 
         machine.stop();
 
-        Eventually.assertDeferred(() -> getThreadsByName(FSM_NAME_PREFIX).isEmpty(), is(true));
-        }
-
-    // ----- helper methods ------------------------------------------------
-
-    /**
-     * Get a collection of threads whose names start with the given prefix.
-     *
-     * @param sPrefix  the thread name prefix
-     *
-     * @return the thread
-     */
-    public static Collection<Thread> getThreadsByName(String sPrefix)
-        {
-        ThreadGroup threadGroup = Thread.currentThread().getThreadGroup();
-
-        ThreadGroup parentThreadGroup;
-        while ((parentThreadGroup = threadGroup.getParent()) != null)
-            {
-            threadGroup = parentThreadGroup;
-            }
-
-        Thread[] aThreads = new Thread[threadGroup.activeCount() + 1];
-        threadGroup.enumerate(aThreads);
-
-        Collection<Thread> colThreads = new HashSet<>();
-        for (Thread thread : aThreads)
-            {
-            String sName = thread == null ? null : thread.getName();
-
-            if (sName != null && sName.startsWith(sPrefix))
-                {
-                colThreads.add(thread);
-                }
-            }
-
-        return colThreads;
+        Eventually.assertDeferred(() -> ThreadHelper.getThreadsByPrefix(FSM_NAME_PREFIX).isEmpty(), is(true));
         }
 
     // ----- constants ------------------------------------------------------