Restructured test cases

Author: jglick

html/src/test/java/org/kohsuke/stapler/html/HtmlTestCase.java

@@ -0,0 +1,17 @@
+package org.kohsuke.stapler.html;
+
+import org.kohsuke.stapler.test.JettyTestCase;
+
+public abstract class HtmlTestCase extends JettyTestCase {
+
+    protected final String load(String uri) throws Exception {
+        return createWebClient()
+                .getPage(url.toURI().resolve(uri).toURL())
+                .getWebResponse()
+                .getContentAsString()
+                .replaceAll("<!--.+?-->", " ")
+                .replaceAll("\\s+", " ")
+                .trim()
+                .replace('"', '\'');
+    }
+}

html/src/test/java/org/kohsuke/stapler/html/IncludedFromTest.java

@@ -0,0 +1,20 @@
+package org.kohsuke.stapler.html;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+public final class IncludedFromTest extends HtmlTestCase {
+
+    public void testIncludedFromJelly() throws Exception {
+        assertThat(
+                load("top"),
+                is("A prologue. <div> Center text includes a <span>special value</span>. </div> An epilogue."));
+    }
+
+    @HtmlView("center")
+    public Center getCenter() {
+        return new Center("special value");
+    }
+
+    public record Center(String value) {}
+}

…/org/kohsuke/stapler/html/SmokeTest.java …/kohsuke/stapler/html/StructureTest.javahtml/src/test/java/org/kohsuke/stapler/html/SmokeTest.java renamed to html/src/test/java/org/kohsuke/stapler/html/StructureTest.java html/src/test/java/org/kohsuke/stapler/html/SmokeTest.java renamed to html/src/test/java/org/kohsuke/stapler/html/StructureTest.java

@@ -3,14 +3,12 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import java.util.List;
-import org.kohsuke.stapler.test.JettyTestCase;
 
-public final class SmokeTest extends JettyTestCase {
+public final class StructureTest extends HtmlTestCase {
 
     Status status;
 
@@ -54,28 +52,4 @@ public record Items(List<Element> elements) {
             public record Element(String name, String value) {}
         }
     }
-
-    public void testCalledFromJelly() throws Exception {
-        assertThat(
-                load("top"),
-                is("A prologue. <div> Center text includes a <span>special value</span>. </div> An epilogue."));
-    }
-
-    @HtmlView("center")
-    public Center getCenter() {
-        return new Center("special value");
-    }
-
-    public record Center(String value) {}
-
-    private String load(String uri) throws Exception {
-        return createWebClient()
-                .getPage(url.toURI().resolve(uri).toURL())
-                .getWebResponse()
-                .getContentAsString()
-                .replaceAll("<!--.+?-->", " ")
-                .replaceAll("\\s+", " ")
-                .trim()
-                .replace('"', '\'');
-    }
 }