Merge remote-tracking branch 'private/issue/238' into 0.4-develop

asakusafw · Aug 16, 2012 · 4a79cc5 · 4a79cc5
2 parents 3c53d71 + d44b56b
commit 4a79cc5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/dmdl-project/asakusa-dmdl-java/src/main/java/com/asakusafw/dmdl/java/util/NameUtil.java b/dmdl-project/asakusa-dmdl-java/src/main/java/com/asakusafw/dmdl/java/util/NameUtil.java
@@ -41,6 +41,7 @@ public static String toPackageName(AstName name) {
         StringBuilder buf = new StringBuilder();
         buf.append(simples.removeFirst());
         for (String simpleName : simples) {
+            buf.append(".");
             buf.append(simpleName);
         }
         return buf.toString();

diff --git a/...usa-dmdl-java/src/test/java/com/asakusafw/dmdl/java/emitter/ConcreteModelEmitterTest.java b/...usa-dmdl-java/src/test/java/com/asakusafw/dmdl/java/emitter/ConcreteModelEmitterTest.java
@@ -110,6 +110,19 @@ public void namespace() {
         assertThat(object.get("value"), eq(100));
     }
 
+    /**
+     * change own namespace.
+     */
+    @Test
+    public void namespace_complex() {
+        ModelLoader loader = generate();
+        loader.setNamespace("com.example.complexNamespace");
+        ModelWrapper object = loader.newModel("Simple");
+
+        object.set("value", 100);
+        assertThat(object.get("value"), eq(100));
+    }
+
     private Matcher<Object> eq(final Object value) {
         return is(value);
     }

diff --git a/...sakusa-dmdl-java/src/test/resources/com/asakusafw/dmdl/java/emitter/namespace_complex.txt b/...sakusa-dmdl-java/src/test/resources/com/asakusafw/dmdl/java/emitter/namespace_complex.txt
@@ -0,0 +1,2 @@
+@namespace(value = com.example.complex_namespace)
+simple = { value : INT; };