From dd0dd422b396eba1ff72906715d6e6ffc20564c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Tue, 29 Apr 2014 21:15:23 +0300 Subject: [PATCH] Fix apt test class visibilities --- .../com/mysema/query/domain/Enum3Test.java | 9 ++++----- .../java/com/mysema/query/domain/Examples.java | 4 +--- .../com/mysema/query/domain/Generic11Test.java | 3 +-- .../mysema/query/domain/Hierarchy2Test.java | 4 ++-- .../com/mysema/query/domain/HierarchyTest.java | 14 ++++++-------- .../query/domain/InterfaceType3Test.java | 12 +++++------- .../mysema/query/domain/LiteralEntityTest.java | 10 ++++------ .../mysema/query/domain/QueryInit5Test.java | 18 ++++++++---------- .../com/mysema/query/domain/SignatureTest.java | 3 +-- .../com/mysema/query/domain/TransientTest.java | 8 +++----- 10 files changed, 35 insertions(+), 50 deletions(-) diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Enum3Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Enum3Test.java index 97ccc139e..7ce0d028a 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/Enum3Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/domain/Enum3Test.java @@ -1,9 +1,8 @@ package com.mysema.query.domain; -import java.io.Serializable; - import javax.persistence.Entity; import javax.persistence.Enumerated; +import java.io.Serializable; import org.junit.Test; @@ -34,7 +33,7 @@ public class Enum3Test { } @Entity - static class Entity1 { + public static class Entity1 { @Enumerated(javax.persistence.EnumType.STRING) private EnumImplementation value; @@ -46,7 +45,7 @@ public class Enum3Test { } @Entity - static class Entity2 { + public static class Entity2 { private EnumImplementation value; @@ -58,7 +57,7 @@ public class Enum3Test { } @Entity - static class Entity3 { + public static class Entity3 { private EnumImplementation value; diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Examples.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Examples.java index 9737fc640..d65c0308f 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/Examples.java +++ b/querydsl-apt/src/test/java/com/mysema/query/domain/Examples.java @@ -50,11 +50,9 @@ public class Examples { @QueryEmbedded Map> map3; - - + } - public static class Complex> implements Comparable> { T a; diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic11Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic11Test.java index d87573633..a3ab6a241 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic11Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic11Test.java @@ -26,8 +26,7 @@ public class Generic11Test { @Entity public static class B2 extends A2 { } // note the missing type parameter - - + @Test public void test() { diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Hierarchy2Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Hierarchy2Test.java index 28f47a4f9..3ed97bf26 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/Hierarchy2Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/domain/Hierarchy2Test.java @@ -33,7 +33,7 @@ public class Hierarchy2Test { } @Entity - static class A { + public static class A { @OneToOne SomeEntity entry; @@ -43,7 +43,7 @@ public class Hierarchy2Test { } @Entity - static class SomeEntity extends SomeMappedSuperClassHavingMyEmbeddable { + public static class SomeEntity extends SomeMappedSuperClassHavingMyEmbeddable { } @Embeddable diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/HierarchyTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/HierarchyTest.java index 31836f3ed..bb394c9d6 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/HierarchyTest.java +++ b/querydsl-apt/src/test/java/com/mysema/query/domain/HierarchyTest.java @@ -13,21 +13,19 @@ */ package com.mysema.query.domain; -import static org.junit.Assert.*; - import javax.persistence.Column; import javax.persistence.Entity; -import org.junit.Test; - import com.mysema.query.annotations.PropertyType; import com.mysema.query.annotations.QueryType; +import org.junit.Test; +import static org.junit.Assert.assertNotNull; public class HierarchyTest { @Entity - static class A { + public static class A { B b; @@ -41,7 +39,7 @@ public class HierarchyTest { } @Entity - static class A2 extends A { + public static class A2 extends A { // XXX: uncomment @Comment to break generation - QA2.a2.b() will then // return B instead of B2 @@ -60,11 +58,11 @@ public class HierarchyTest { } @Entity - static class B { + public static class B { } @Entity - static class B2 extends B { + public static class B2 extends B { } @Test diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/InterfaceType3Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/InterfaceType3Test.java index 3621fffc7..e0c7e2ffa 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/InterfaceType3Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/domain/InterfaceType3Test.java @@ -1,25 +1,23 @@ package com.mysema.query.domain; -import static org.junit.Assert.*; - -import org.junit.Test; - import com.mysema.query.annotations.QueryEntity; +import org.junit.Test; +import static org.junit.Assert.assertNotNull; public class InterfaceType3Test { @QueryEntity - interface A { + public interface A { String getA(); } @QueryEntity - interface B { + public interface B { String getB(); } @QueryEntity - interface C extends A, B { + public interface C extends A, B { String getC(); } diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/LiteralEntityTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/LiteralEntityTest.java index e994a119c..f28a3ff6e 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/LiteralEntityTest.java +++ b/querydsl-apt/src/test/java/com/mysema/query/domain/LiteralEntityTest.java @@ -13,18 +13,16 @@ */ package com.mysema.query.domain; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import org.junit.Test; - import com.mysema.query.annotations.QueryEntity; import com.mysema.query.types.path.EnumPath; +import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; public class LiteralEntityTest { @QueryEntity - enum EnumEntity { + public enum EnumEntity { } diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryInit5Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/QueryInit5Test.java index 5523a5612..156c84367 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryInit5Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/domain/QueryInit5Test.java @@ -1,26 +1,24 @@ package com.mysema.query.domain; -import static org.junit.Assert.*; - -import org.junit.Test; - import com.mysema.query.annotations.QueryEntity; import com.mysema.query.annotations.QueryInit; +import org.junit.Test; +import static org.junit.Assert.assertNotNull; public class QueryInit5Test { - @QueryEntity - static class OtherClass { + @QueryEntity + public static class OtherClass { OtherClass entity; } - @QueryEntity - static class OtherClassTwo { + @QueryEntity + public static class OtherClassTwo { OtherClassTwo entity; } @QueryEntity - static class Parent { + public static class Parent { int x; @QueryInit("*") @@ -28,7 +26,7 @@ public class QueryInit5Test { } @QueryEntity - static class Child extends Parent { + public static class Child extends Parent { @QueryInit("*") OtherClassTwo y; } diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/SignatureTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/SignatureTest.java index 416bb2019..54bee4f46 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/SignatureTest.java +++ b/querydsl-apt/src/test/java/com/mysema/query/domain/SignatureTest.java @@ -28,8 +28,7 @@ public class SignatureTest { public static abstract class APropertyChangeSupported implements Comparable, Cloneable, Serializable { } - - + @QuerySupertype public static abstract class AValueObject extends APropertyChangeSupported implements Comparable, Cloneable, Serializable { diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/TransientTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/TransientTest.java index 892d116d6..bf8b1236e 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/TransientTest.java +++ b/querydsl-apt/src/test/java/com/mysema/query/domain/TransientTest.java @@ -13,20 +13,18 @@ */ package com.mysema.query.domain; -import static org.junit.Assert.*; - import javax.persistence.Entity; import javax.persistence.Transient; -import org.junit.Test; - import com.mysema.query.annotations.PropertyType; import com.mysema.query.annotations.QueryType; +import org.junit.Test; +import static org.junit.Assert.assertNotNull; public class TransientTest { @Entity - static class ExampleEntity { + public static class ExampleEntity { @QueryType(PropertyType.SIMPLE) @Transient