From 7caa60913e4db267f7d7bdfe0e1de90ec12db13f Mon Sep 17 00:00:00 2001
From: Lester Solbakken <lesters@oath.com>
Date: Tue, 18 Dec 2018 10:37:27 +0100
Subject: Add url config type

---
 .../com/yahoo/config/codegen/DefLineParsingTest.java | 20 ++++++++++++++++++++
 .../java/com/yahoo/config/codegen/DefParserTest.java |  4 ++--
 .../yahoo/config/codegen/JavaClassBuilderTest.java   |  4 +++-
 .../config/codegen/NormalizedDefinitionTest.java     |  2 +-
 4 files changed, 26 insertions(+), 4 deletions(-)

(limited to 'configgen/src/test/java')

diff --git a/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java b/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java
index 99699d888dc..a267c2bc535 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java
@@ -101,6 +101,26 @@ public class DefLineParsingTest {
         assertEquals("file", l.getType().getName());
     }
 
+    @Test
+    public void testParseUrls() {
+        DefLine l = new DefLine("urlVal url");
+
+        assertEquals("urlVal", l.getName());
+        assertNull(l.getDefault());
+        assertEquals("url", l.getType().getName());
+    }
+
+    @Test
+    public void testParseDefaultUrls() {
+        DefLine l = new DefLine("urlVal url default=\"http://docs.vespa.ai\"");
+
+        assertEquals("urlVal", l.getName());
+        assertEquals("http://docs.vespa.ai", l.getDefault().getValue());
+        assertEquals("\"http://docs.vespa.ai\"", l.getDefault().getStringRepresentation());
+        assertEquals("url", l.getType().getName());
+    }
+
+
     @Test
     public void testParseDefaultInt() {
         DefLine l = new DefLine("foo int default=1000");
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java b/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java
index e36641bb626..98c30aa09cf 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java
@@ -28,7 +28,7 @@ public class DefParserTest {
         CNode root = new DefParser("test", new FileReader(defFile)).getTree();
         assertNotNull(root);
         CNode[] children = root.getChildren();
-        assertThat(children.length, is(31));
+        assertThat(children.length, is(34));
 
         int numGrandChildren = 0;
         int numGreatGrandChildren = 0;
@@ -70,7 +70,7 @@ public class DefParserTest {
     public void testMd5Sum() throws IOException {
         File defFile = new File(DEF_NAME);
         CNode root = new DefParser("test", new FileReader(defFile)).getTree();
-        assertThat(root.defMd5, is("eb2d24dbbcf054b21be729e2cfaafd93"));
+        assertThat(root.defMd5, is("f901bdc5c96e7005130399c63f247823"));
     }
 
     @Test
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java b/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java
index 381d587e3c3..11da88a12fa 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java
@@ -35,6 +35,8 @@ public class JavaClassBuilderTest {
                 "namespace=test\n" + //
                 "p path\n" + //
                 "pathArr[] path\n" + //
+                "u url\n" + //
+                "urlArr[] url\n" + //
                 "f file\n" + //
                 "fileArr[] file\n" + //
                 "i int default=0\n" + //
@@ -116,7 +118,7 @@ public class JavaClassBuilderTest {
 
         for (int i = 0; i < referenceClassLines.size(); i++) {
             if (configClassLines.length <= i)
-                fail("Missing lines i generated comnfig class. First missing line:\n" + referenceClassLines.get(i));
+                fail("Missing lines i generated config class. First missing line:\n" + referenceClassLines.get(i));
             assertEquals("Line " + i, referenceClassLines.get(i), configClassLines[i]);
         }
     }
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java b/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java
index cbb0d9c4082..9cda4cfbb1c 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java
@@ -68,7 +68,7 @@ public class NormalizedDefinitionTest {
         }
 
         assertNotNull(out);
-        assertThat(out.size(), is(69));
+        assertThat(out.size(), is(72));
 
         assertNotNull(fileReader);
         fileReader.close();
-- 
cgit v1.2.3