Move shutdown timeout logic to separate class

2 files changed, 18 insertions, 14 deletions

diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/ConfiguredApplicationTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/ConfiguredApplicationTest.java
deleted file mode 100644
index c8cf5c0ce63..00000000000
--- a/container-disc/src/test/java/com/yahoo/container/jdisc/ConfiguredApplicationTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.jdisc;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class ConfiguredApplicationTest {
-    @Test
-    public void testConfigId2FileName() {
-        assertEquals("admin.metrics.2088223-v6-1.ostk.bm2.prod.ne1.yahoo.com", ConfiguredApplication.santizeFileName("admin/metrics/2088223-v6-1.ostk.bm2.prod.ne1.yahoo.com"));
-        assertEquals("admin.standalone.cluster-controllers.1", ConfiguredApplication.santizeFileName("admin/standalone/cluster-controllers/1 "));
-    }
-}
diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/ShutdownDeadlineTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/ShutdownDeadlineTest.java
new file mode 100644
index 00000000000..244c9f528c5
--- /dev/null
+++ b/container-disc/src/test/java/com/yahoo/container/jdisc/ShutdownDeadlineTest.java
@@ -0,0 +1,18 @@
+package com.yahoo.container.jdisc;// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+
+import org.junit.jupiter.api.Test;
+
+import static com.yahoo.container.jdisc.ShutdownDeadline.sanitizeFileName;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @author bjorncs
+ */
+class ShutdownDeadlineTest {
+    @Test
+    void testConfigId2FileName() {
+        assertEquals("admin.metrics.2088223-v6-1.ostk.bm2.prod.ne1.yahoo.com", sanitizeFileName("admin/metrics/2088223-v6-1.ostk.bm2.prod.ne1.yahoo.com"));
+        assertEquals("admin.standalone.cluster-controllers.1", sanitizeFileName("admin/standalone/cluster-controllers/1 "));
+    }
+}
\ No newline at end of file