Skip to content

Commit 60a3d49

Browse files
velovelo
authored
Using assertJ hasToString() (#509)
1 parent f75f2f6 commit 60a3d49

File tree

93 files changed

+583
-600
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+583
-600
lines changed

‎querydsl-apt/src/main/java/com/querydsl/apt/SimpleTypeVisitorAdapter.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,21 @@
1818
import javax.lang.model.util.SimpleTypeVisitor8;
1919

2020
/**
21-
* Converts Java 8 {@link javax.lang.model.type.IntersectionType IntersectionType} instances into their first bound when visiting
21+
* Converts Java 8 {@link javax.lang.model.type.IntersectionType IntersectionType} instances into
22+
* their first bound when visiting
2223
*
2324
* @param <R>
2425
* @param <P>
2526
*/
2627
class SimpleTypeVisitorAdapter<R, P> extends SimpleTypeVisitor8<R, P> {
2728

28-
@Override
29-
public R visitIntersection(IntersectionType t, P p) {
30-
return t.getBounds().get(0).accept(this, p);
31-
}
29+
@Override
30+
public R visitIntersection(IntersectionType t, P p) {
31+
return t.getBounds().get(0).accept(this, p);
32+
}
3233

33-
@Override
34-
public R visitUnion(UnionType t, P p) {
35-
return visitUnknown(t, p);
36-
}
34+
@Override
35+
public R visitUnion(UnionType t, P p) {
36+
return visitUnknown(t, p);
37+
}
3738
}

‎querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/AnimalTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class AnimalTest {
2424
public void cast() {
2525
QCat cat = QAnimal.animal.as(QCat.class);
2626
assertThat(cat.getMetadata().getElement()).isEqualTo(QAnimal.animal);
27-
assertThat(cat.toString()).isEqualTo("animal");
27+
assertThat(cat).hasToString("animal");
2828
}
2929

3030
@Test

‎querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public void clone_() {
106106
.from(cat, Collections.<Cat>emptyList())
107107
.where(cat.isNotNull())
108108
.clone();
109-
assertThat(query.getMetadata().getWhere().toString()).isEqualTo("cat is not null");
109+
assertThat(query.getMetadata().getWhere()).hasToString("cat is not null");
110110
}
111111

112112
@Test

‎querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/BooleanBuilderTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void advanced() {
8787
BooleanBuilder builder = new BooleanBuilder();
8888
builder.andAnyOf(first, second, first);
8989
builder.orAllOf(first, second, first);
90-
assertThat(builder.toString()).isEqualTo("true || false || true || true && false && true");
90+
assertThat(builder).hasToString("true || false || true || true && false && true");
9191
}
9292

9393
@Test
@@ -155,9 +155,9 @@ public void hashCode_() {
155155
@Test
156156
public void toString_() {
157157
BooleanBuilder builder = new BooleanBuilder().and(first);
158-
assertThat(builder.toString()).isEqualTo("true");
158+
assertThat(builder).hasToString("true");
159159
builder.or(Expressions.booleanPath("condition"));
160-
assertThat(builder.toString()).isEqualTo("true || condition");
160+
assertThat(builder).hasToString("true || condition");
161161
}
162162

163163
// @Test

‎querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DateConstantTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ public void test() {
3131
cal.set(Calendar.YEAR, 2000);
3232

3333
DateExpression<Date> date = DateConstant.create(new Date(cal.getTimeInMillis()));
34-
assertThat(date.dayOfMonth().toString()).isEqualTo("1");
35-
assertThat(date.month().toString()).isEqualTo("1");
36-
assertThat(date.year().toString()).isEqualTo("2000");
37-
assertThat(date.dayOfWeek().toString()).isEqualTo("7");
38-
assertThat(date.dayOfYear().toString()).isEqualTo("1");
34+
assertThat(date.dayOfMonth()).hasToString("1");
35+
assertThat(date.month()).hasToString("1");
36+
assertThat(date.year()).hasToString("2000");
37+
assertThat(date.dayOfWeek()).hasToString("7");
38+
assertThat(date.dayOfYear()).hasToString("1");
3939
}
4040
}

‎querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DateTimeConstantTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ public void test() {
3434
cal.set(Calendar.MILLISECOND, 3);
3535

3636
DateTimeExpression<Date> date = DateTimeConstant.create(cal.getTime());
37-
assertThat(date.dayOfMonth().toString()).isEqualTo("1");
38-
assertThat(date.month().toString()).isEqualTo("1");
39-
assertThat(date.year().toString()).isEqualTo("2000");
40-
assertThat(date.dayOfWeek().toString()).isEqualTo("7");
41-
assertThat(date.dayOfYear().toString()).isEqualTo("1");
42-
assertThat(date.hour().toString()).isEqualTo("13");
43-
assertThat(date.minute().toString()).isEqualTo("30");
44-
assertThat(date.second().toString()).isEqualTo("12.0");
45-
assertThat(date.milliSecond().toString()).isEqualTo("3");
37+
assertThat(date.dayOfMonth()).hasToString("1");
38+
assertThat(date.month()).hasToString("1");
39+
assertThat(date.year()).hasToString("2000");
40+
assertThat(date.dayOfWeek()).hasToString("7");
41+
assertThat(date.dayOfYear()).hasToString("1");
42+
assertThat(date.hour()).hasToString("13");
43+
assertThat(date.minute()).hasToString("30");
44+
assertThat(date.second()).hasToString("12.0");
45+
assertThat(date.milliSecond()).hasToString("3");
4646
}
4747
}

‎querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/StringConstantTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ public class StringConstantTest {
2222

2323
@Test
2424
public void test() {
25-
assertThat(expr("ab").append("c").toString()).isEqualTo("abc");
26-
assertThat(expr("bc").prepend("a").toString()).isEqualTo("abc");
27-
assertThat(expr("ABC").lower().toString()).isEqualTo("abc");
28-
assertThat(expr("abc").upper().toString()).isEqualTo("ABC");
29-
assertThat(expr("abc").substring(0, 2).toString()).isEqualTo("ab");
25+
assertThat(expr("ab").append("c")).hasToString("abc");
26+
assertThat(expr("bc").prepend("a")).hasToString("abc");
27+
assertThat(expr("ABC").lower()).hasToString("abc");
28+
assertThat(expr("abc").upper()).hasToString("ABC");
29+
assertThat(expr("abc").substring(0, 2)).hasToString("ab");
3030
}
3131

3232
@Test
3333
public void test2() {
34-
assertThat(expr("ab").append(expr("c")).toString()).isEqualTo("abc");
35-
assertThat(expr("bc").prepend(expr("a")).toString()).isEqualTo("abc");
36-
assertThat(expr("ABC").lower().toString()).isEqualTo("abc");
37-
assertThat(expr("abc").upper().toString()).isEqualTo("ABC");
38-
assertThat(expr("abc").substring(0, 2).toString()).isEqualTo("ab");
34+
assertThat(expr("ab").append(expr("c"))).hasToString("abc");
35+
assertThat(expr("bc").prepend(expr("a"))).hasToString("abc");
36+
assertThat(expr("ABC").lower()).hasToString("abc");
37+
assertThat(expr("abc").upper()).hasToString("ABC");
38+
assertThat(expr("abc").substring(0, 2)).hasToString("ab");
3939
}
4040

4141
private StringExpression expr(String str) {

‎querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/TimeConstantTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ public void test() {
3131
cal.set(Calendar.MILLISECOND, 3);
3232

3333
TimeExpression<Time> time = TimeConstant.create(new Time(cal.getTimeInMillis()));
34-
assertThat(time.hour().toString()).isEqualTo("13");
35-
assertThat(time.minute().toString()).isEqualTo("30");
36-
assertThat(time.second().toString()).isEqualTo("12.0");
34+
assertThat(time.hour()).hasToString("13");
35+
assertThat(time.minute()).hasToString("30");
36+
assertThat(time.second()).hasToString("12.0");
3737
// assertEquals("3", time.getMilliSecond().toString());
3838
}
3939
}

‎querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/AliasTest.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,23 @@ public void basicUsage() {
4747
DomainType domainType = Alias.alias(DomainType.class);
4848
assertThat($(domainType.getFirstName()).lower().toString())
4949
.isEqualTo("lower(domainType.firstName)");
50-
assertThat($(domainType.getAge()).toString()).isEqualTo("domainType.age");
51-
assertThat($(domainType.getMap().get("a")).toString()).isEqualTo("domainType.map.get(a)");
52-
assertThat($(domainType.getList().get(0)).toString()).isEqualTo("domainType.list.get(0)");
50+
assertThat($(domainType.getAge())).hasToString("domainType.age");
51+
assertThat($(domainType.getMap().get("a"))).hasToString("domainType.map.get(a)");
52+
assertThat($(domainType.getList().get(0))).hasToString("domainType.list.get(0)");
5353

54-
assertThat($(domainType.getBigDecimal()).toString()).isEqualTo("domainType.bigDecimal");
55-
assertThat($(domainType.getBigInteger()).toString()).isEqualTo("domainType.bigInteger");
56-
assertThat($(domainType.getByte()).toString()).isEqualTo("domainType.byte");
57-
assertThat($(domainType.getCollection()).toString()).isEqualTo("domainType.collection");
58-
assertThat($(domainType.getDouble()).toString()).isEqualTo("domainType.double");
59-
assertThat($(domainType.getFloat()).toString()).isEqualTo("domainType.float");
60-
assertThat($(domainType.getDate()).toString()).isEqualTo("domainType.date");
61-
assertThat($(domainType.getDate2()).toString()).isEqualTo("domainType.date2");
62-
assertThat($(domainType.getSet()).toString()).isEqualTo("domainType.set");
63-
assertThat($(domainType.getShort()).toString()).isEqualTo("domainType.short");
64-
assertThat($(domainType.getTime()).toString()).isEqualTo("domainType.time");
65-
assertThat($(domainType.getTimestamp()).toString()).isEqualTo("domainType.timestamp");
66-
assertThat($(domainType.getGender()).toString()).isEqualTo("domainType.gender");
54+
assertThat($(domainType.getBigDecimal())).hasToString("domainType.bigDecimal");
55+
assertThat($(domainType.getBigInteger())).hasToString("domainType.bigInteger");
56+
assertThat($(domainType.getByte())).hasToString("domainType.byte");
57+
assertThat($(domainType.getCollection())).hasToString("domainType.collection");
58+
assertThat($(domainType.getDouble())).hasToString("domainType.double");
59+
assertThat($(domainType.getFloat())).hasToString("domainType.float");
60+
assertThat($(domainType.getDate())).hasToString("domainType.date");
61+
assertThat($(domainType.getDate2())).hasToString("domainType.date2");
62+
assertThat($(domainType.getSet())).hasToString("domainType.set");
63+
assertThat($(domainType.getShort())).hasToString("domainType.short");
64+
assertThat($(domainType.getTime())).hasToString("domainType.time");
65+
assertThat($(domainType.getTimestamp())).hasToString("domainType.timestamp");
66+
assertThat($(domainType.getGender())).hasToString("domainType.gender");
6767
}
6868

6969
@Test
@@ -76,16 +76,16 @@ public void getAny() {
7676
@Test
7777
public void otherMethods() {
7878
DomainType domainType = Alias.alias(DomainType.class);
79-
assertThat(domainType.toString()).isEqualTo("domainType");
79+
assertThat(domainType).hasToString("domainType");
8080
}
8181

8282
@Test
8383
public void var() {
84-
assertThat(Alias.var().toString()).isEqualTo("it");
85-
assertThat(Alias.var(1).toString()).isEqualTo("varInteger1");
86-
assertThat(Alias.var("X").toString()).isEqualTo("X");
87-
assertThat(Alias.var(Gender.MALE).toString()).isEqualTo("varMALE");
88-
assertThat(Alias.var(new AliasTest()).toString()).isEqualTo("varAliasTest_XXX");
84+
assertThat(Alias.var()).hasToString("it");
85+
assertThat(Alias.var(1)).hasToString("varInteger1");
86+
assertThat(Alias.var("X")).hasToString("X");
87+
assertThat(Alias.var(Gender.MALE)).hasToString("varMALE");
88+
assertThat(Alias.var(new AliasTest())).hasToString("varAliasTest_XXX");
8989
}
9090

9191
@Override

‎querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/ScalaAccessorsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class ScalaAccessorsTest {
2323
@Test
2424
public void scalaAccessors() {
2525
ScalaAccessors scalaAccessors = Alias.alias(ScalaAccessors.class);
26-
assertThat($(scalaAccessors.firstName()).toString()).isEqualTo("scalaAccessors.firstName");
27-
assertThat($(scalaAccessors.lastName()).toString()).isEqualTo("scalaAccessors.lastName");
26+
assertThat($(scalaAccessors.firstName())).hasToString("scalaAccessors.firstName");
27+
assertThat($(scalaAccessors.lastName())).hasToString("scalaAccessors.lastName");
2828
}
2929
}

0 commit comments

Comments
 (0)