diff --git a/querydsl-core/src/test/java/com/mysema/query/BooleanBuilderTest.java b/querydsl-core/src/test/java/com/mysema/query/BooleanBuilderTest.java index 77b4574d4..24f08161c 100644 --- a/querydsl-core/src/test/java/com/mysema/query/BooleanBuilderTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/BooleanBuilderTest.java @@ -8,8 +8,12 @@ package com.mysema.query; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import java.util.Arrays; + import org.junit.Test; +import com.mysema.query.types.Templates; +import com.mysema.query.types.ToStringVisitor; import com.mysema.query.types.expr.BooleanExpression; import com.mysema.query.types.path.BooleanPath; @@ -96,4 +100,20 @@ public class BooleanBuilderTest { builder.or(new BooleanPath("condition")); assertEquals("true || condition", builder.toString()); } + + @Test + public void GetArg(){ + BooleanBuilder builder = new BooleanBuilder(); + builder.and(first); + assertEquals(first, builder.getArg(0)); + assertEquals(Arrays.asList(first), builder.getArgs()); + } + + @Test + public void Accept(){ + BooleanBuilder builder = new BooleanBuilder(); + builder.and(first); + builder.or(new BooleanPath("condition")); + assertEquals("true || condition", builder.accept(ToStringVisitor.DEFAULT, Templates.DEFAULT)); + } } diff --git a/querydsl-core/src/test/java/com/mysema/query/DefaultQueryMetadataTest.java b/querydsl-core/src/test/java/com/mysema/query/DefaultQueryMetadataTest.java index be6b70376..fa7d837f0 100644 --- a/querydsl-core/src/test/java/com/mysema/query/DefaultQueryMetadataTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/DefaultQueryMetadataTest.java @@ -28,7 +28,9 @@ import java.util.Stack; import org.junit.Test; import com.mysema.query.QueryFlag.Position; +import com.mysema.query.types.ConstantImpl; import com.mysema.query.types.expr.NumberOperation; +import com.mysema.query.types.expr.Param; import com.mysema.query.types.path.BeanPath; import com.mysema.query.types.path.NumberPath; import com.mysema.query.types.path.StringPath; @@ -66,16 +68,16 @@ public class DefaultQueryMetadataTest { QueryMetadata metadata2 = (QueryMetadata) in.readObject(); in.close(); - assertEquals(metadata.getFlags(), metadata2.getFlags()); - assertEquals(metadata.getGroupBy().get(0), metadata2.getGroupBy().get(0)); - assertEquals(metadata.getGroupBy(), metadata2.getGroupBy()); - assertEquals(metadata.getHaving(), metadata2.getHaving()); - assertEquals(metadata.getJoins(), metadata2.getJoins()); + assertEquals(metadata.getFlags(), metadata2.getFlags()); + assertEquals(metadata.getGroupBy().get(0), metadata2.getGroupBy().get(0)); + assertEquals(metadata.getGroupBy(), metadata2.getGroupBy()); + assertEquals(metadata.getHaving(), metadata2.getHaving()); + assertEquals(metadata.getJoins(), metadata2.getJoins()); assertEquals(metadata.getModifiers(), metadata2.getModifiers()); - assertEquals(metadata.getOrderBy(), metadata2.getOrderBy()); - assertEquals(metadata.getParams(), metadata2.getParams()); - assertEquals(metadata.getProjection(),metadata2.getProjection()); - assertEquals(metadata.getWhere(), metadata2.getWhere()); + assertEquals(metadata.getOrderBy(), metadata2.getOrderBy()); + assertEquals(metadata.getParams(), metadata2.getParams()); + assertEquals(metadata.getProjection(), metadata2.getProjection()); + assertEquals(metadata.getWhere(), metadata2.getWhere()); } @Test @@ -129,6 +131,13 @@ public class DefaultQueryMetadataTest { metadata.addJoin(JoinType.DEFAULT, str); assertEquals(Arrays.asList(new JoinExpression(JoinType.DEFAULT, str)),metadata.getJoins()); } + + @Test + public void GetJoins2() { + metadata.addJoin(new JoinExpression(JoinType.DEFAULT, str)); + assertEquals(Arrays.asList(new JoinExpression(JoinType.DEFAULT, str)),metadata.getJoins()); + } + @Test public void GetModifiers() { @@ -210,6 +219,20 @@ public class DefaultQueryMetadataTest { assertEquals(metadata.getOrderBy(), clone.getOrderBy()); assertEquals(metadata.getProjection(), clone.getProjection()); assertEquals(metadata.getWhere(), clone.getWhere()); - + } + + @SuppressWarnings("unchecked") + @Test + public void SetParam(){ + metadata.setParam(new Param(String.class, "str"), ConstantImpl.create("X")); + assertEquals(1, metadata.getParams().size()); + assertTrue(metadata.getParams().get(new Param(String.class, "str")).equals(ConstantImpl.create("X"))); + } + + @Test + public void AddFlag(){ + QueryFlag flag = new QueryFlag(Position.START, "X"); + metadata.addFlag(flag); + assertTrue(metadata.hasFlag(flag)); } } diff --git a/querydsl-core/src/test/java/com/mysema/query/types/query/ListSubQueryTest.java b/querydsl-core/src/test/java/com/mysema/query/types/query/ListSubQueryTest.java new file mode 100644 index 000000000..a5007ce17 --- /dev/null +++ b/querydsl-core/src/test/java/com/mysema/query/types/query/ListSubQueryTest.java @@ -0,0 +1,21 @@ +package com.mysema.query.types.query; + +import static org.junit.Assert.assertNotNull; + +import java.util.Date; + +import org.junit.Test; + +import com.mysema.query.DefaultQueryMetadata; +import com.mysema.query.types.PathImpl; + +public class ListSubQueryTest { + + @Test + public void As(){ + ListSubQuery subQuery = new ListSubQuery(Date.class,new DefaultQueryMetadata()); + assertNotNull(subQuery.as(new PathImpl(Date.class,"a"))); + assertNotNull(subQuery.as(new PathImpl(Date.class,"a"))); + } + +} diff --git a/querydsl-core/src/test/java/com/mysema/query/types/query/SubQueryTest.java b/querydsl-core/src/test/java/com/mysema/query/types/query/SubQueryTest.java index 7ca32a386..65cb7ba34 100644 --- a/querydsl-core/src/test/java/com/mysema/query/types/query/SubQueryTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/types/query/SubQueryTest.java @@ -53,5 +53,5 @@ public class SubQueryTest { prev = sq; } } - + } diff --git a/querydsl-core/src/test/java/com/mysema/query/types/template/TemplateExpressionTest.java b/querydsl-core/src/test/java/com/mysema/query/types/template/TemplateExpressionTest.java index 3875ddc44..b1627a402 100644 --- a/querydsl-core/src/test/java/com/mysema/query/types/template/TemplateExpressionTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/types/template/TemplateExpressionTest.java @@ -16,6 +16,7 @@ import java.util.List; import org.junit.Test; +import com.mysema.query.annotations.PropertyType; import com.mysema.query.types.ConstantImpl; import com.mysema.query.types.Expression; import com.mysema.query.types.JavaTemplates; @@ -38,6 +39,7 @@ public class TemplateExpressionTest { new ComparableTemplate(String.class, template, args), new DateTemplate(java.sql.Date.class, template, args), new DateTimeTemplate(Date.class, template, args), + new EnumTemplate(PropertyType.class, template, args), new NumberTemplate(Integer.class, template, args), new SimpleTemplate(Object.class, template, args), new StringTemplate(template, args), @@ -68,6 +70,7 @@ public class TemplateExpressionTest { ComparableTemplate.create(String.class, template, arg); DateTemplate.create(Date.class, template, arg); DateTimeTemplate.create(Date.class, template, arg); + EnumTemplate.create(PropertyType.class, template, arg); NumberTemplate.create(Integer.class, template, arg); SimpleTemplate.create(Object.class, template, arg); StringTemplate.create(template, arg); @@ -83,6 +86,7 @@ public class TemplateExpressionTest { ComparableTemplate.create(String.class, template, arg); DateTemplate.create(Date.class, template, arg); DateTimeTemplate.create(Date.class, template, arg); + EnumTemplate.create(PropertyType.class, template, arg); NumberTemplate.create(Integer.class, template, arg); SimpleTemplate.create(Object.class, template, arg); StringTemplate.create(template, arg);