Merge Form into Template

2 files changed, 45 insertions, 49 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 40913184a67..8c276ff0491 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
@@ -13,61 +13,61 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 class TemplateFileTest {
     @Test
     void verifyVariableSection() {
-        Form form = getForm("template1.tmp");
-        form.set("varname", "varvalue");
+        Template template = getTemplate("template1.tmp");
+        template.set("varname", "varvalue");
         assertEquals("variable section 'varvalue'\n" +
-                     "end of text\n", form.render());
+                     "end of text\n", template.render());
     }
 
     @Test
     void verifySimpleListSection() {
-        Form form = getForm("template1.tmp");
-        form.set("varname", "varvalue")
-            .add("listname")
-            .set("varname", "different varvalue")
-            .set("varname2", "varvalue2");
+        Template template = getTemplate("template1.tmp");
+        template.set("varname", "varvalue")
+                .add("listname")
+                .set("varname", "different varvalue")
+                .set("varname2", "varvalue2");
         assertEquals("variable section 'varvalue'\n" +
                      "same variable section 'different varvalue'\n" +
                      "different variable section 'varvalue2'\n" +
                      "between ends\n" +
-                     "end of text\n", form.render());
+                     "end of text\n", template.render());
     }
 
     @Test
     void verifyNestedListSection() {
-        Form form = getForm("template2.tmp");
-        Form A0 = form.add("listA");
-        Form A0B0 = A0.add("listB");
-        Form A0B1 = A0.add("listB");
+        Template template = getTemplate("template2.tmp");
+        Template A0 = template.add("listA");
+        Template A0B0 = A0.add("listB");
+        Template A0B1 = A0.add("listB");
 
-        Form A1 = form.add("listA");
-        Form A1B0 = A1.add("listB");
+        Template A1 = template.add("listA");
+        Template A1B0 = A1.add("listB");
         assertEquals("body A\n" +
                      "body B\n" +
                      "body B\n" +
                      "body A\n" +
                      "body B\n",
-                     form.render());
+                     template.render());
     }
 
     @Test
     void verifyVariableReferences() {
-        Form form = getForm("template3.tmp");
-        form.set("varname", "varvalue")
-            .set("innerVarSetAtTop", "val2");
-        form.add("l");
-        form.add("l")
-            .set("varname", "varvalue2");
+        Template template = getTemplate("template3.tmp");
+        template.set("varname", "varvalue")
+                .set("innerVarSetAtTop", "val2");
+        template.add("l");
+        template.add("l")
+                .set("varname", "varvalue2");
         assertEquals("varvalue\n" +
                      "varvalue\n" +
                      "inner varvalue\n" +
                      "val2\n" +
                      "inner varvalue2\n" +
                      "val2\n",
-                     form.render());
+                     template.render());
     }
 
-    private Form getForm(String filename) {
-        return TemplateFile.read(Path.of("src/test/resources/" + filename)).newForm();
+    private Template getTemplate(String filename) {
+        return TemplateFile.read(Path.of("src/test/resources/" + filename));
     }
 }
\ 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
index 8d503dd4784..fd73d315af6 100644
--- 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
@@ -11,25 +11,25 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 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");
+        Template template = Template.from("a%{list a}\n" +
+                                          "b%{end}\n" +
+                                          "c%{list c-}\n" +
+                                          "d%{end-}\n" +
+                                          "e\n");
+        template.add("a");
+        template.add("c");
 
         assertEquals("a\n" +
                      "b\n" +
                      "cde\n",
-                     form.render());
+                     template.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());
+        assertEquals("Hello world!", template.snapshot().set("cond", true).render());
+        assertEquals("Hello!", template.snapshot().set("cond", false).render());
     }
 
     @Test
@@ -40,26 +40,26 @@ public class TemplateTest {
                                           "list: %{list formname}element%{end}\n" +
                                           "%{end-}\n");
 
-        assertEquals("", template.newForm().set("cond", false).render());
+        assertEquals("", template.snapshot().set("cond", false).render());
 
         assertEquals("var: varvalue\n" +
                      "if: \n" +
                      "list: \n",
-                     template.newForm()
+                     template.snapshot()
                              .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");
+        Template template2 = template.snapshot()
+                                     .set("cond", true)
+                                     .set("varname", "varvalue")
+                                     .set("inner", false);
+        template2.add("formname");
 
         assertEquals("var: varvalue\n" +
                      "if: inner is false\n" +
-                     "list: element\n", form.render());
+                     "list: element\n", template2.render());
     }
 
     @Test
@@ -69,11 +69,7 @@ public class TemplateTest {
                                      "%{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();
+        assertEquals("if body\n", template.snapshot().set("cond", true).render());
+        assertEquals("else body\n", template.snapshot().set("cond", false).render());
     }
 }