wip

4 files changed, 47 insertions, 32 deletions

diff --git a/container-compiler-plugin/src/test/java/io/trygvis/container/compiler/EntityHandlerTest.java b/container-compiler-plugin/src/test/java/io/trygvis/container/compiler/EntityHandlerTest.java
index 98fcaea..e24a362 100644
--- a/container-compiler-plugin/src/test/java/io/trygvis/container/compiler/EntityHandlerTest.java
+++ b/container-compiler-plugin/src/test/java/io/trygvis/container/compiler/EntityHandlerTest.java
@@ -15,6 +15,7 @@ public class EntityHandlerTest {
                 new Object[]{"MyClass", "my_class"},
                 new Object[]{"myField", "my_field"},
                 new Object[]{"name", "name"},
+                new Object[]{"_first_name", "_first_name"},
                 new Object[]{"first_name", "first_name"},
                 new Object[]{"first_name_", "first_name_"},
         };
diff --git a/container-compiler-plugin/src/test/java/io/trygvis/container/compiler/JavaSourceFromString.java b/container-compiler-plugin/src/test/java/io/trygvis/container/compiler/JavaSourceFromString.java
new file mode 100644
index 0000000..e07a11f
--- /dev/null
+++ b/container-compiler-plugin/src/test/java/io/trygvis/container/compiler/JavaSourceFromString.java
@@ -0,0 +1,32 @@
+package io.trygvis.container.compiler;
+
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import java.net.URI;
+
+/**
+ * A file object used to represent source coming from a string.
+ */
+public class JavaSourceFromString extends SimpleJavaFileObject {
+    /**
+     * The source code of this "file".
+     */
+    final String code;
+
+    /**
+     * Constructs a new JavaSourceFromString.
+     *
+     * @param name the name of the compilation unit represented by this file object
+     * @param code the source code for the compilation unit represented by this file object
+     */
+    JavaSourceFromString(String name, String code) {
+        super(URI.create("string:///" + name.replace('.', '/') + Kind.SOURCE.extension),
+                Kind.SOURCE);
+        this.code = code;
+    }
+
+    @Override
+    public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+        return code;
+    }
+}
diff --git a/container-compiler-plugin/src/test/java/io/trygvis/container/compiler/ProcessorTest.java b/container-compiler-plugin/src/test/java/io/trygvis/container/compiler/ProcessorTest.java
index e070f3c..2205d52 100644
--- a/container-compiler-plugin/src/test/java/io/trygvis/container/compiler/ProcessorTest.java
+++ b/container-compiler-plugin/src/test/java/io/trygvis/container/compiler/ProcessorTest.java
@@ -7,10 +7,8 @@ import javax.tools.Diagnostic;
 import javax.tools.DiagnosticCollector;
 import javax.tools.JavaCompiler;
 import javax.tools.JavaFileObject;
-import javax.tools.SimpleJavaFileObject;
 import javax.tools.StandardJavaFileManager;
 import javax.tools.ToolProvider;
-import java.net.URI;
 import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Locale;
@@ -21,33 +19,6 @@ import static org.fest.assertions.Assertions.assertThat;
 public class ProcessorTest {
     Charset UTF_8 = Charset.forName("utf-8");
 
-    /**
-     * A file object used to represent source coming from a string.
-     */
-    public class JavaSourceFromString extends SimpleJavaFileObject {
-        /**
-         * The source code of this "file".
-         */
-        final String code;
-
-        /**
-         * Constructs a new JavaSourceFromString.
-         *
-         * @param name the name of the compilation unit represented by this file object
-         * @param code the source code for the compilation unit represented by this file object
-         */
-        JavaSourceFromString(String name, String code) {
-            super(URI.create("string:///" + name.replace('.', '/') + JavaFileObject.Kind.SOURCE.extension),
-                    JavaFileObject.Kind.SOURCE);
-            this.code = code;
-        }
-
-        @Override
-        public CharSequence getCharContent(boolean ignoreEncodingErrors) {
-            return code;
-        }
-    }
-
     @Test
     public void testBasic() throws Exception {
         JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
@@ -66,6 +37,9 @@ public class ProcessorTest {
 
         Boolean result = task.call();
 
+        assertThat(fileManager.codes.keySet()).containsOnly("Person_Sql");
+        System.out.println(fileManager.codes.get("Person_Sql"));
+
         for (Diagnostic<? extends JavaFileObject> diagnostic : collector.getDiagnostics()) {
 //            System.out.println("diagnostic = " + diagnostic);
             System.out.println("diagnostic.source = ->" + diagnostic.getSource().getName() + "<-");
@@ -76,8 +50,5 @@ public class ProcessorTest {
         assertThat(result).isTrue();
 
         fileManager.close();
-
-        assertThat(fileManager.codes.keySet()).containsOnly("Person_Sql");
-        System.out.println(fileManager.codes.get("Person_Sql"));
     }
 }
diff --git a/container-compiler-plugin/src/test/java/io/trygvis/persistence/test/PersonTypeHandler.java b/container-compiler-plugin/src/test/java/io/trygvis/persistence/test/PersonTypeHandler.java
new file mode 100644
index 0000000..68e17c3
--- /dev/null
+++ b/container-compiler-plugin/src/test/java/io/trygvis/persistence/test/PersonTypeHandler.java
@@ -0,0 +1,11 @@
+package io.trygvis.persistence.test;
+
+import io.trygvis.persistence.FieldMirror;
+import io.trygvis.persistence.TypeHandler;
+
+public class PersonTypeHandler implements TypeHandler {
+    @Override
+    public String resultSetSetter(int i, String o, FieldMirror field) {
+        return "setLong(" + i + ", o." + field.javaName + ".id)";
+    }
+}