From d720e70f2242bd2d107626ef1395f177505368da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Mon, 5 May 2014 22:18:10 +0300
Subject: [PATCH] Fix APT tests

---
 .../mysema/query/apt/AbstractProcessorTest.java   |  2 +-
 .../com/mysema/query/apt/GenericExporterTest.java | 15 +++++----------
 .../mysema/query/domain/QueryEmbedded7Test.java   |  8 +++-----
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/AbstractProcessorTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/AbstractProcessorTest.java
index 748cc5a89..8c0e8d251 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/AbstractProcessorTest.java
+++ b/querydsl-apt/src/test/java/com/mysema/query/apt/AbstractProcessorTest.java
@@ -71,7 +71,7 @@ public abstract class AbstractProcessorTest {
 //        Processor.elementCache.clear();
         if (compilationResult != 0) {
             System.err.println(compiler.getClass().getName());
-            Assert.fail("Compilation Failed");
+            Assert.fail("Compilation Failed:\n " + new String(err.toByteArray(), "UTF-8"));
         }
     }
     
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/GenericExporterTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/GenericExporterTest.java
index 5cb062013..8eb40249e 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/GenericExporterTest.java
+++ b/querydsl-apt/src/test/java/com/mysema/query/apt/GenericExporterTest.java
@@ -1,20 +1,11 @@
 package com.mysema.query.apt;
 
-import static org.junit.Assert.fail;
-
+import javax.persistence.*;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.Embeddable;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Transient;
-
-import org.junit.Test;
-
 import com.google.common.base.Charsets;
 import com.google.common.collect.ForwardingSet;
 import com.google.common.io.Files;
@@ -24,6 +15,8 @@ import com.mysema.query.codegen.Keywords;
 import com.mysema.query.domain.AbstractEntityTest;
 import com.mysema.query.domain.CustomCollection;
 import com.mysema.query.domain.Generic2Test;
+import org.junit.Test;
+import static org.junit.Assert.fail;
 
 public class GenericExporterTest extends AbstractProcessorTest {
 
@@ -50,6 +43,7 @@ public class GenericExporterTest extends AbstractProcessorTest {
         expected.add("QExampleEntity.java");
 
         expected.add("QQueryProjectionTest_DTOWithProjection.java");
+        expected.add("QQueryProjectionTest_EntityWithProjection.java");
 
         // FIXME
         expected.add("QExternalEntityTest_MyEntity.java");
@@ -87,6 +81,7 @@ public class GenericExporterTest extends AbstractProcessorTest {
 
         expected.add("QTemporal2Test_Cheque.java");
         expected.add("QQueryProjectionTest_DTOWithProjection.java");
+        expected.add("QQueryProjectionTest_EntityWithProjection.java");
 
         // FIXME
         expected.add("QGeneric4Test_HidaBez.java");
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded7Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded7Test.java
index de19c6efc..df4a577c0 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded7Test.java
+++ b/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded7Test.java
@@ -1,22 +1,20 @@
 package com.mysema.query.domain;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.Collection;
 import java.util.Locale;
 import java.util.Set;
 
-import org.junit.Test;
-
 import com.mysema.query.annotations.QueryEmbedded;
 import com.mysema.query.annotations.QueryEntity;
 import com.mysema.query.types.path.NumberPath;
 import com.mysema.query.types.path.StringPath;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 public class QueryEmbedded7Test {
 
     @QueryEntity
-    static class Entity {
+    public static class Entity {
         
         @QueryEmbedded
         Collection<String> users;