Move some tests to TemplateTest

2 files changed, 79 insertions, 68 deletions

diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/template/TemplateFileTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/template/TemplateFileTest.java
index b73e50180c6..40913184a67 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/template/TemplateFileTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/template/TemplateFileTest.java
@@ -67,75 +67,7 @@ class TemplateFileTest {
                      form.render());
     }
 
-    @Test
-    void verifyNewlineRemoval() {
-        Form form = makeForm("a%{list a}\n" +
-                             "b%{end}\n" +
-                             "c%{list c-}\n" +
-                             "d%{end-}\n" +
-                             "e\n");
-        form.add("a");
-        form.add("c");
-
-        assertEquals("a\n" +
-                     "b\n" +
-                     "cde\n",
-                     form.render());
-    }
-
-    @Test
-    void verifyIfSection() {
-        Template template = Template.from("Hello%{if cond} world%{end}!");
-        assertEquals("Hello world!", template.newForm().set("cond", true).render());
-        assertEquals("Hello!", template.newForm().set("cond", false).render());
-    }
-
-    @Test
-    void verifyComplexIfSection() {
-        Template template = Template.from("%{if cond-}\n" +
-                                          "var: %{=varname}\n" +
-                                          "if: %{if !inner}inner is false%{end}\n" +
-                                          "list: %{list formname}element%{end}\n" +
-                                          "%{end-}\n");
-
-        assertEquals("", template.newForm().set("cond", false).render());
-
-        assertEquals("var: varvalue\n" +
-                     "if: \n" +
-                     "list: \n",
-                     template.newForm()
-                             .set("cond", true)
-                             .set("varname", "varvalue")
-                             .set("inner", true)
-                             .render());
-
-        Form form = template.newForm()
-                            .set("cond", true)
-                            .set("varname", "varvalue")
-                            .set("inner", false);
-        form.add("formname");
-
-        assertEquals("var: varvalue\n" +
-                     "if: inner is false\n" +
-                     "list: element\n", form.render());
-    }
-
-    @Test
-    void verifyElse() {
-        var template = Template.from("%{if cond-}\n" +
-                                     "if body\n" +
-                                     "%{else-}\n" +
-                                     "else body\n" +
-                                     "%{end-}\n");
-        assertEquals("if body\n", template.newForm().set("cond", true).render());
-        assertEquals("else body\n", template.newForm().set("cond", false).render());
-    }
-
     private Form getForm(String filename) {
         return TemplateFile.read(Path.of("src/test/resources/" + filename)).newForm();
     }
-
-    private Form makeForm(String templateText) {
-        return Template.from(templateText).newForm();
-    }
 }
\ No newline at end of file
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/template/TemplateTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/template/TemplateTest.java
new file mode 100644
index 00000000000..8d503dd4784
--- /dev/null
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/template/TemplateTest.java
@@ -0,0 +1,79 @@
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.hosted.node.admin.task.util.template;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @author hakonhall
+ */
+public class TemplateTest {
+    @Test
+    void verifyNewlineRemoval() {
+        Form form = makeForm("a%{list a}\n" +
+                             "b%{end}\n" +
+                             "c%{list c-}\n" +
+                             "d%{end-}\n" +
+                             "e\n");
+        form.add("a");
+        form.add("c");
+
+        assertEquals("a\n" +
+                     "b\n" +
+                     "cde\n",
+                     form.render());
+    }
+
+    @Test
+    void verifyIfSection() {
+        Template template = Template.from("Hello%{if cond} world%{end}!");
+        assertEquals("Hello world!", template.newForm().set("cond", true).render());
+        assertEquals("Hello!", template.newForm().set("cond", false).render());
+    }
+
+    @Test
+    void verifyComplexIfSection() {
+        Template template = Template.from("%{if cond-}\n" +
+                                          "var: %{=varname}\n" +
+                                          "if: %{if !inner}inner is false%{end}\n" +
+                                          "list: %{list formname}element%{end}\n" +
+                                          "%{end-}\n");
+
+        assertEquals("", template.newForm().set("cond", false).render());
+
+        assertEquals("var: varvalue\n" +
+                     "if: \n" +
+                     "list: \n",
+                     template.newForm()
+                             .set("cond", true)
+                             .set("varname", "varvalue")
+                             .set("inner", true)
+                             .render());
+
+        Form form = template.newForm()
+                            .set("cond", true)
+                            .set("varname", "varvalue")
+                            .set("inner", false);
+        form.add("formname");
+
+        assertEquals("var: varvalue\n" +
+                     "if: inner is false\n" +
+                     "list: element\n", form.render());
+    }
+
+    @Test
+    void verifyElse() {
+        var template = Template.from("%{if cond-}\n" +
+                                     "if body\n" +
+                                     "%{else-}\n" +
+                                     "else body\n" +
+                                     "%{end-}\n");
+        assertEquals("if body\n", template.newForm().set("cond", true).render());
+        assertEquals("else body\n", template.newForm().set("cond", false).render());
+    }
+
+    private Form makeForm(String templateText) {
+        return Template.from(templateText).newForm();
+    }
+}