2 files changed, 123 insertions, 0 deletions
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/DefParserNamespaceTest.java b/configgen/src/test/java/com/yahoo/config/codegen/DefParserNamespaceTest.java
index 0fef22c0d22..bab09f36ad0 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/DefParserNamespaceTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/DefParserNamespaceTest.java
@@ -24,6 +24,14 @@ public class DefParserNamespaceTest {
         assertThat(root.getNamespace(), is("myproject.config"));
     }
 
+    @Test
+    public void package_is_used_as_namespace_when_no_namespace_is_given() {
+        String PACKAGE = "com.github.myproject";
+        DefParser parser = createParser("package=" + PACKAGE + "\n");
+        CNode root = parser.getTree();
+        assertThat(root.getNamespace(), is(PACKAGE));
+    }
+
     @Test(expected = CodegenRuntimeException.class)
     public void uppercase_chars_are_not_allowed() {
         createParser("version=1\nnamespace=Foo\na string\n").getTree();
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/DefParserPackageTest.java b/configgen/src/test/java/com/yahoo/config/codegen/DefParserPackageTest.java
new file mode 100644
index 00000000000..97986a05bf3
--- /dev/null
+++ b/configgen/src/test/java/com/yahoo/config/codegen/DefParserPackageTest.java
@@ -0,0 +1,115 @@
+package com.yahoo.config.codegen;
+
+import org.junit.Test;
+
+import java.io.IOException;
+
+import static com.yahoo.config.codegen.DefParser.DEFAULT_PACKAGE_PREFIX;
+import static com.yahoo.config.codegen.DefParserTest.assertLineFails;
+import static com.yahoo.config.codegen.DefParserTest.createDefTemplate;
+import static com.yahoo.config.codegen.DefParserTest.createParser;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+/**
+ * Tests setting explicit java package in the def file.
+ *
+ * @author gjoranv
+ */
+public class DefParserPackageTest {
+    String PACKAGE = "com.github.myproject";
+
+    @Test
+    public void package_is_set_on_root_node() {
+        DefParser parser = createParser("package=" + PACKAGE + "\n");
+        CNode root = parser.getTree();
+        assertThat(root.getPackage(), is(PACKAGE));
+    }
+
+    @Test
+    public void package_and_namespace_can_coexist() {
+        String namespace = "test.namespace";
+        DefParser parser = createParser("package=" + PACKAGE +
+                                                "\nnamespace=" + namespace +"\n");
+        CNode root = parser.getTree();
+        assertThat(root.getPackage(), is(PACKAGE));
+        assertThat(root.getNamespace(), is(namespace));
+    }
+
+    // Required by JavaClassBuilder ctor.
+    @Test
+    public void package_is_null_when_not_explicitly_given() {
+        String namespace = "test.namespace";
+        DefParser parser = createParser("namespace=" + namespace + "\n");
+        CNode root = parser.getTree();
+        assertThat(root.getPackage(), nullValue());
+    }
+
+    @Test(expected = CodegenRuntimeException.class)
+    public void uppercase_chars_are_not_allowed() {
+        createParser("package=Foo.bar\n").getTree();
+    }
+
+    @Test
+    public void spaces_are_allowed_around_equals_sign() {
+        DefParser parser = createParser("package =  " + PACKAGE + "\n");
+        CNode root = parser.getTree();
+        assertThat(root.getPackage(), is(PACKAGE));
+    }
+
+    @Test
+    public void empty_package_is_not_allowed() {
+       assertLineFails("package");
+    }
+
+    @Test
+    public void consecutive_dots_are_not_allowed() {
+        assertLineFails("package=a..b");
+    }
+
+    @Test
+    public void package_alters_def_md5() {
+        DefParser parser = createParser("a string\n");
+        CNode root = parser.getTree();
+
+        parser = createParser("package=" + PACKAGE + "\na string\n");
+        CNode rootWithPackage = parser.getTree();
+
+        assertThat(root.defMd5, not(rootWithPackage.defMd5));
+    }
+
+
+    @Test
+    public void number_is_allowed_as_non_leading_char() throws IOException, DefParser.DefParserException {
+        StringBuilder sb = createDefTemplate();
+        String line = "package=a.b.c2\n";
+        sb.append(line);
+        createParser(sb.toString()).parse();
+    }
+
+    @Test
+    public void number_is_not_allowed_as_package_start_char() throws IOException, DefParser.DefParserException {
+        assertLineFails("package=2.a.b");
+    }
+
+    @Test
+    public void number_is_not_allowed_as_leading_char_in_package_token() throws IOException, DefParser.DefParserException {
+        assertLineFails("package=a.b.2c");
+    }
+
+    @Test
+    public void underscore_in_package_is_allowed() throws IOException, DefParser.DefParserException {
+        StringBuilder sb = createDefTemplate();
+        String line = "package=a_b.c\n";
+        sb.append(line);
+        createParser(sb.toString()).parse();
+
+        sb = createDefTemplate();
+        line = "package=a_b.c_d\n";
+        sb.append(line);
+        createParser(sb.toString()).parse();
+    }
+
+}