From b5d6f23d8ac3d4bedb139fdaecc2e9dc621f385a Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sat, 3 Aug 2013 15:06:46 +0200
Subject: wip

---
 .../compiler/InMemoryJavaFileManager.java          | 16 +++++++----
 .../container/compiler/JavaSourceFromString.java   |  1 -
 .../trygvis/container/compiler/ProcessorTest.java  | 32 ++++++++++++++++------
 .../io/trygvis/container/compiler/UtilsTest.java   | 25 +++++++++++++++++
 .../src/test/resources/Car.java                    |  6 ----
 .../src/test/resources/Person.java                 | 25 -----------------
 .../resources/io/trygvis/persistence/test/Car.java |  8 ++++++
 .../io/trygvis/persistence/test/Person.java        | 27 ++++++++++++++++++
 .../io/trygvis/persistence/test/package-info.java  |  3 ++
 9 files changed, 98 insertions(+), 45 deletions(-)
 create mode 100644 container-compiler-plugin/src/test/java/io/trygvis/container/compiler/UtilsTest.java
 delete mode 100644 container-compiler-plugin/src/test/resources/Car.java
 delete mode 100644 container-compiler-plugin/src/test/resources/Person.java
 create mode 100644 container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/Car.java
 create mode 100644 container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/Person.java
 create mode 100644 container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/package-info.java

(limited to 'container-compiler-plugin/src/test')

diff --git a/container-compiler-plugin/src/test/java/io/trygvis/container/compiler/InMemoryJavaFileManager.java b/container-compiler-plugin/src/test/java/io/trygvis/container/compiler/InMemoryJavaFileManager.java
index e476d3e..60a78ae 100644
--- a/container-compiler-plugin/src/test/java/io/trygvis/container/compiler/InMemoryJavaFileManager.java
+++ b/container-compiler-plugin/src/test/java/io/trygvis/container/compiler/InMemoryJavaFileManager.java
@@ -13,11 +13,11 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Writer;
 import java.net.URI;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.TreeMap;
 
 public class InMemoryJavaFileManager extends ForwardingJavaFileManager<StandardJavaFileManager> {
-    public final Map<String, String> codes = new HashMap<>();
+    public final Map<String, String> codes = new TreeMap<>();
 
     public InMemoryJavaFileManager(StandardJavaFileManager standardFileManager) {
         super(standardFileManager);
@@ -25,13 +25,11 @@ public class InMemoryJavaFileManager extends ForwardingJavaFileManager<StandardJ
 
     @Override
     public FileObject getFileForOutput(Location location, String packageName, String relativeName, FileObject sibling) throws IOException {
-        System.out.println("io.trygvis.container.compiler.InMemoryJavaFileManager.getFileForOutput");
         throw new RuntimeException("");
     }
 
     @Override
     public JavaFileObject getJavaFileForOutput(Location location, final String className, JavaFileObject.Kind kind, FileObject sibling) throws IOException {
-        System.out.println("io.trygvis.container.compiler.InMemoryJavaFileManager.getJavaFileForOutput");
         return new SimpleJavaFileObject(URI.create("wat://woot/" + className.replace('.', '/') + ".java"), kind) {
             String code;
 
@@ -41,7 +39,7 @@ public class InMemoryJavaFileManager extends ForwardingJavaFileManager<StandardJ
                     @Override
                     public void close() {
                         super.close();
-                        System.out.println("Closing writer to: className = " + className);
+//                        System.out.println("Closing writer to: className = " + className);
                         code = super.toString();
                         codes.put(className, code);
                     }
@@ -71,4 +69,12 @@ public class InMemoryJavaFileManager extends ForwardingJavaFileManager<StandardJ
             }
         };
     }
+
+    @Override
+    public boolean isSameFile(FileObject a, FileObject b) {
+        return a.toUri().compareTo(b.toUri()) == 0;
+//        System.out.println("a = " + a);
+//        System.out.println("b = " + b);
+//        return super.isSameFile(a, b);
+    }
 }
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
index e07a11f..b950064 100644
--- 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
@@ -1,6 +1,5 @@
 package io.trygvis.container.compiler;
 
-import javax.tools.JavaFileObject;
 import javax.tools.SimpleJavaFileObject;
 import java.net.URI;
 
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 2205d52..bac8209 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
@@ -9,11 +9,13 @@ import javax.tools.JavaCompiler;
 import javax.tools.JavaFileObject;
 import javax.tools.StandardJavaFileManager;
 import javax.tools.ToolProvider;
+import java.io.IOException;
+import java.net.URL;
 import java.nio.charset.Charset;
-import java.util.Arrays;
 import java.util.Locale;
+import java.util.Map;
 
-import static java.util.Collections.singletonList;
+import static java.util.Arrays.asList;
 import static org.fest.assertions.Assertions.assertThat;
 
 public class ProcessorTest {
@@ -28,20 +30,25 @@ public class ProcessorTest {
 
         InMemoryJavaFileManager fileManager = new InMemoryJavaFileManager(standardFileManager);
 
-        JavaSourceFromString myEntity = new JavaSourceFromString("Person", IOUtils.toString(getClass().getResource("/Person.java"), UTF_8));
+        JavaSourceFromString person = loadCode("io.trygvis.persistence.test.Person");
+        JavaSourceFromString packageInfo = loadCode("io.trygvis.persistence.test.package-info");
 
         JavaCompiler.CompilationTask task = compiler.getTask(null, fileManager, collector, null,
-                null, singletonList(myEntity));
+                null, asList(person, packageInfo));
 
-        task.setProcessors(Arrays.asList(new MyProcessor()));
+        task.setProcessors(asList(new MyProcessor()));
 
         Boolean result = task.call();
 
-        assertThat(fileManager.codes.keySet()).containsOnly("Person_Sql");
-        System.out.println(fileManager.codes.get("Person_Sql"));
+        assertThat(fileManager.codes.keySet()).containsOnly(
+                "io.trygvis.persistence.test.Daos",
+                "io.trygvis.persistence.test.PersonDao");
+        for (Map.Entry<String, String> entry : fileManager.codes.entrySet()) {
+            System.out.println("=== " + entry.getKey());
+            System.out.println(entry.getValue());
+        }
 
         for (Diagnostic<? extends JavaFileObject> diagnostic : collector.getDiagnostics()) {
-//            System.out.println("diagnostic = " + diagnostic);
             System.out.println("diagnostic.source = ->" + diagnostic.getSource().getName() + "<-");
             System.out.println("diagnostic.message = " + diagnostic.getMessage(Locale.ENGLISH));
         }
@@ -51,4 +58,13 @@ public class ProcessorTest {
 
         fileManager.close();
     }
+
+    private JavaSourceFromString loadCode(String className) throws IOException {
+        String path = "/" + className.replace('.', '/') + ".java";
+        URL resource = getClass().getResource(path);
+        if(resource == null) {
+            throw new RuntimeException("Could not load code for: " + path);
+        }
+        return new JavaSourceFromString(className, IOUtils.toString(resource, UTF_8));
+    }
 }
diff --git a/container-compiler-plugin/src/test/java/io/trygvis/container/compiler/UtilsTest.java b/container-compiler-plugin/src/test/java/io/trygvis/container/compiler/UtilsTest.java
new file mode 100644
index 0000000..0dd1414
--- /dev/null
+++ b/container-compiler-plugin/src/test/java/io/trygvis/container/compiler/UtilsTest.java
@@ -0,0 +1,25 @@
+package io.trygvis.container.compiler;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import static io.trygvis.container.compiler.Utils.toFieldName;
+import static org.testng.Assert.assertEquals;
+
+public class UtilsTest {
+    @DataProvider(name = "toFieldName", parallel = true)
+    public static Object[][] SqlNameDataProvider() {
+        return new Object[][] {
+                new Object[]{"FooBar", "fooBar"},
+                new Object[]{"fooBar", "fooBar"},
+                new Object[]{"foo_bar", "fooBar"},
+                new Object[]{"_foo_bar", "fooBar"},
+                new Object[]{"foo_bar_", "fooBar"},
+        };
+    }
+
+    @Test(dataProvider = "toFieldName")
+    public void testToFieldName(String input, String output) {
+        assertEquals(toFieldName(input), output);
+    }
+}
diff --git a/container-compiler-plugin/src/test/resources/Car.java b/container-compiler-plugin/src/test/resources/Car.java
deleted file mode 100644
index 5661bc2..0000000
--- a/container-compiler-plugin/src/test/resources/Car.java
+++ /dev/null
@@ -1,6 +0,0 @@
-import javax.persistence.Entity;
-
-@Entity
-public class Car {
-    private int year;
-}
diff --git a/container-compiler-plugin/src/test/resources/Person.java b/container-compiler-plugin/src/test/resources/Person.java
deleted file mode 100644
index 4bdb882..0000000
--- a/container-compiler-plugin/src/test/resources/Person.java
+++ /dev/null
@@ -1,25 +0,0 @@
-import io.trygvis.persistence.SqlEntity;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import java.util.Date;
-
-@Entity
-@SqlEntity("io.trygvis.persistence.test.PersonTypeHandler")
-public class Person {
-    @Id
-    public Long id;
-
-    public Date birthDate;
-
-    @ManyToOne
-    public Person mother;
-
-//    @ManyToOne
-//    public Person father;
-
-//    @OneToMany(mappedBy = "id")
-//    @OrderBy("birthDate asc")
-//    private List<Person> children = new ArrayList<>();
-}
diff --git a/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/Car.java b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/Car.java
new file mode 100644
index 0000000..4b80afc
--- /dev/null
+++ b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/Car.java
@@ -0,0 +1,8 @@
+package io.trygvis.persistence.test;
+
+import javax.persistence.Entity;
+
+@Entity
+public class Car {
+    private int year;
+}
diff --git a/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/Person.java b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/Person.java
new file mode 100644
index 0000000..131691f
--- /dev/null
+++ b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/Person.java
@@ -0,0 +1,27 @@
+package io.trygvis.persistence.test;
+
+import io.trygvis.persistence.SqlEntity;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import java.util.Date;
+
+@Entity
+@SqlEntity("io.trygvis.persistence.test.PersonTypeHandler")
+public class Person {
+    @Id
+    public Long id;
+
+    public Date birthDate;
+
+    @ManyToOne
+    public Person mother;
+
+//    @ManyToOne
+//    public Person father;
+
+//    @OneToMany(mappedBy = "id")
+//    @OrderBy("birthDate asc")
+//    private List<Person> children = new ArrayList<>();
+}
diff --git a/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/package-info.java b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/package-info.java
new file mode 100644
index 0000000..9ca5e93
--- /dev/null
+++ b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/package-info.java
@@ -0,0 +1,3 @@
+@SqlEntitySet package io.trygvis.persistence.test;
+
+import io.trygvis.persistence.SqlEntitySet;
-- 
cgit v1.2.3