Skip to content

Commit a8bade5

Browse files
rickierickie
authored
Enable Checkstyle's NumericalPrefixesInfixesSuffixesCharacterCase module (#2114)
1 parent 30af7b9 commit a8bade5

16 files changed

+108
-110
lines changed

‎error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJFloatRules.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ static final class AbstractFloatAssertIsEqualTo {
3939
@BeforeTemplate
4040
AbstractFloatAssert<?> before(AbstractFloatAssert<?> floatAssert, float n) {
4141
return Refaster.anyOf(
42-
floatAssert.isCloseTo(n, offset(0F)), floatAssert.isCloseTo(n, withPercentage(0)));
42+
floatAssert.isCloseTo(n, offset(0f)), floatAssert.isCloseTo(n, withPercentage(0)));
4343
}
4444

4545
@AfterTemplate
@@ -52,7 +52,7 @@ static final class AbstractFloatAssertIsNotEqualTo {
5252
@BeforeTemplate
5353
AbstractFloatAssert<?> before(AbstractFloatAssert<?> floatAssert, float n) {
5454
return Refaster.anyOf(
55-
floatAssert.isNotCloseTo(n, offset(0F)), floatAssert.isNotCloseTo(n, withPercentage(0)));
55+
floatAssert.isNotCloseTo(n, offset(0f)), floatAssert.isNotCloseTo(n, withPercentage(0)));
5656
}
5757

5858
@AfterTemplate

‎error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/AssertJFloatRulesTestInput.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,30 @@ public ImmutableSet<Object> elidedTypesAndStaticImports() {
1616

1717
ImmutableSet<AbstractFloatAssert<?>> testAbstractFloatAssertIsCloseToWithOffset() {
1818
return ImmutableSet.of(
19-
assertThat(0F).isEqualTo(1, offset(0F)),
20-
assertThat(0F).isEqualTo(Float.valueOf(1), offset(0F)));
19+
assertThat(0f).isEqualTo(1, offset(0f)),
20+
assertThat(0f).isEqualTo(Float.valueOf(1), offset(0f)));
2121
}
2222

2323
ImmutableSet<AbstractFloatAssert<?>> testAbstractFloatAssertIsEqualTo() {
2424
return ImmutableSet.of(
25-
assertThat(0F).isCloseTo(1, offset(0F)), assertThat(0F).isCloseTo(1, withPercentage(0)));
25+
assertThat(0f).isCloseTo(1, offset(0f)), assertThat(0f).isCloseTo(1, withPercentage(0)));
2626
}
2727

2828
ImmutableSet<AbstractFloatAssert<?>> testAbstractFloatAssertIsNotEqualTo() {
2929
return ImmutableSet.of(
30-
assertThat(0F).isNotCloseTo(1, offset(0F)),
31-
assertThat(0F).isNotCloseTo(1, withPercentage(0)));
30+
assertThat(0f).isNotCloseTo(1, offset(0f)),
31+
assertThat(0f).isNotCloseTo(1, withPercentage(0)));
3232
}
3333

3434
AbstractFloatAssert<?> testAbstractFloatAssertIsZero() {
35-
return assertThat(0F).isZero();
35+
return assertThat(0f).isZero();
3636
}
3737

3838
AbstractFloatAssert<?> testAbstractFloatAssertIsNotZero() {
39-
return assertThat(0F).isNotZero();
39+
return assertThat(0f).isNotZero();
4040
}
4141

4242
AbstractFloatAssert<?> testAbstractFloatAssertIsOne() {
43-
return assertThat(0F).isOne();
43+
return assertThat(0f).isOne();
4444
}
4545
}

‎error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/AssertJFloatRulesTestOutput.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@ public ImmutableSet<Object> elidedTypesAndStaticImports() {
1616

1717
ImmutableSet<AbstractFloatAssert<?>> testAbstractFloatAssertIsCloseToWithOffset() {
1818
return ImmutableSet.of(
19-
assertThat(0F).isCloseTo(1, offset(0F)),
20-
assertThat(0F).isCloseTo(Float.valueOf(1), offset(0F)));
19+
assertThat(0f).isCloseTo(1, offset(0f)),
20+
assertThat(0f).isCloseTo(Float.valueOf(1), offset(0f)));
2121
}
2222

2323
ImmutableSet<AbstractFloatAssert<?>> testAbstractFloatAssertIsEqualTo() {
24-
return ImmutableSet.of(assertThat(0F).isEqualTo(1), assertThat(0F).isEqualTo(1));
24+
return ImmutableSet.of(assertThat(0f).isEqualTo(1), assertThat(0f).isEqualTo(1));
2525
}
2626

2727
ImmutableSet<AbstractFloatAssert<?>> testAbstractFloatAssertIsNotEqualTo() {
28-
return ImmutableSet.of(assertThat(0F).isNotEqualTo(1), assertThat(0F).isNotEqualTo(1));
28+
return ImmutableSet.of(assertThat(0f).isNotEqualTo(1), assertThat(0f).isNotEqualTo(1));
2929
}
3030

3131
AbstractFloatAssert<?> testAbstractFloatAssertIsZero() {
32-
return assertThat(0F).isEqualTo(0);
32+
return assertThat(0f).isEqualTo(0);
3333
}
3434

3535
AbstractFloatAssert<?> testAbstractFloatAssertIsNotZero() {
36-
return assertThat(0F).isNotEqualTo(0);
36+
return assertThat(0f).isNotEqualTo(0);
3737
}
3838

3939
AbstractFloatAssert<?> testAbstractFloatAssertIsOne() {
40-
return assertThat(0F).isEqualTo(1);
40+
return assertThat(0f).isEqualTo(1);
4141
}
4242
}

‎error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/AssertJNumberRulesTestInput.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ final class AssertJNumberRulesTest implements RefasterRuleCollectionTestCase {
1919
assertThat(0).isGreaterThanOrEqualTo(1),
2020
assertThat(0L).isGreaterThan(0),
2121
assertThat(0L).isGreaterThanOrEqualTo(1),
22-
assertThat(0.0F).isGreaterThan(0),
22+
assertThat(0.0f).isGreaterThan(0),
2323
assertThat(0.0).isGreaterThan(0),
2424
assertThat(BigInteger.ZERO).isGreaterThan(BigInteger.ZERO),
2525
assertThat(BigInteger.ZERO).isGreaterThanOrEqualTo(BigInteger.valueOf(1)),
@@ -36,7 +36,7 @@ final class AssertJNumberRulesTest implements RefasterRuleCollectionTestCase {
3636
assertThat(0).isLessThan(1),
3737
assertThat(0L).isLessThanOrEqualTo(0),
3838
assertThat(0L).isLessThan(1),
39-
assertThat(0.0F).isLessThanOrEqualTo(0),
39+
assertThat(0.0f).isLessThanOrEqualTo(0),
4040
assertThat(0.0).isLessThanOrEqualTo(0),
4141
assertThat(BigInteger.ZERO).isLessThanOrEqualTo(BigInteger.ZERO),
4242
assertThat(BigInteger.ZERO).isLessThan(BigInteger.valueOf(1)),
@@ -53,7 +53,7 @@ final class AssertJNumberRulesTest implements RefasterRuleCollectionTestCase {
5353
assertThat(0).isLessThanOrEqualTo(-1),
5454
assertThat(0L).isLessThan(0),
5555
assertThat(0L).isLessThanOrEqualTo(-1),
56-
assertThat(0.0F).isLessThan(0),
56+
assertThat(0.0f).isLessThan(0),
5757
assertThat(0.0).isLessThan(0),
5858
assertThat(BigInteger.ZERO).isLessThan(BigInteger.ZERO),
5959
assertThat(BigInteger.ZERO).isLessThanOrEqualTo(BigInteger.valueOf(-1)),
@@ -70,7 +70,7 @@ final class AssertJNumberRulesTest implements RefasterRuleCollectionTestCase {
7070
assertThat(0).isGreaterThan(-1),
7171
assertThat(0L).isGreaterThanOrEqualTo(0),
7272
assertThat(0L).isGreaterThan(-1),
73-
assertThat(0.0F).isGreaterThanOrEqualTo(0),
73+
assertThat(0.0f).isGreaterThanOrEqualTo(0),
7474
assertThat(0.0).isGreaterThanOrEqualTo(0),
7575
assertThat(BigInteger.ZERO).isGreaterThanOrEqualTo(BigInteger.ZERO),
7676
assertThat(BigInteger.ZERO).isGreaterThan(BigInteger.valueOf(-1)),

‎error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/AssertJNumberRulesTestOutput.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ final class AssertJNumberRulesTest implements RefasterRuleCollectionTestCase {
1919
assertThat(0).isPositive(),
2020
assertThat(0L).isPositive(),
2121
assertThat(0L).isPositive(),
22-
assertThat(0.0F).isPositive(),
22+
assertThat(0.0f).isPositive(),
2323
assertThat(0.0).isPositive(),
2424
assertThat(BigInteger.ZERO).isPositive(),
2525
assertThat(BigInteger.ZERO).isPositive(),
@@ -36,7 +36,7 @@ final class AssertJNumberRulesTest implements RefasterRuleCollectionTestCase {
3636
assertThat(0).isNotPositive(),
3737
assertThat(0L).isNotPositive(),
3838
assertThat(0L).isNotPositive(),
39-
assertThat(0.0F).isNotPositive(),
39+
assertThat(0.0f).isNotPositive(),
4040
assertThat(0.0).isNotPositive(),
4141
assertThat(BigInteger.ZERO).isNotPositive(),
4242
assertThat(BigInteger.ZERO).isNotPositive(),
@@ -53,7 +53,7 @@ final class AssertJNumberRulesTest implements RefasterRuleCollectionTestCase {
5353
assertThat(0).isNegative(),
5454
assertThat(0L).isNegative(),
5555
assertThat(0L).isNegative(),
56-
assertThat(0.0F).isNegative(),
56+
assertThat(0.0f).isNegative(),
5757
assertThat(0.0).isNegative(),
5858
assertThat(BigInteger.ZERO).isNegative(),
5959
assertThat(BigInteger.ZERO).isNegative(),
@@ -70,7 +70,7 @@ final class AssertJNumberRulesTest implements RefasterRuleCollectionTestCase {
7070
assertThat(0).isNotNegative(),
7171
assertThat(0L).isNotNegative(),
7272
assertThat(0L).isNotNegative(),
73-
assertThat(0.0F).isNotNegative(),
73+
assertThat(0.0f).isNotNegative(),
7474
assertThat(0.0).isNotNegative(),
7575
assertThat(BigInteger.ZERO).isNotNegative(),
7676
assertThat(BigInteger.ZERO).isNotNegative(),

‎error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/AssertJPrimitiveRulesTestInput.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ final class AssertJPrimitiveRulesTest implements RefasterRuleCollectionTestCase
2121
assertThat(1).isSameAs(2),
2222
assertThat(1L).isSameAs(2L),
2323
assertThat(1L).isSameAs(2L),
24-
assertThat(1F).isSameAs(2F),
25-
assertThat(1F).isSameAs(2F),
24+
assertThat(1f).isSameAs(2f),
25+
assertThat(1f).isSameAs(2f),
2626
assertThat(1.0).isSameAs(2.0),
2727
assertThat(1.0).isSameAs(2.0));
2828
}
@@ -41,8 +41,8 @@ final class AssertJPrimitiveRulesTest implements RefasterRuleCollectionTestCase
4141
assertThat(1).isNotSameAs(2),
4242
assertThat(1L).isNotSameAs(2L),
4343
assertThat(1L).isNotSameAs(2L),
44-
assertThat(1F).isNotSameAs(2F),
45-
assertThat(1F).isNotSameAs(2F),
44+
assertThat(1f).isNotSameAs(2f),
45+
assertThat(1f).isNotSameAs(2f),
4646
assertThat(1.0).isNotSameAs(2.0),
4747
assertThat(1.0).isNotSameAs(2.0));
4848
}
@@ -59,8 +59,8 @@ final class AssertJPrimitiveRulesTest implements RefasterRuleCollectionTestCase
5959
assertThat(1 >= 2).isFalse(),
6060
assertThat(1L < 2L).isTrue(),
6161
assertThat(1L >= 2L).isFalse(),
62-
assertThat(1F < 2F).isTrue(),
63-
assertThat(1F >= 2F).isFalse(),
62+
assertThat(1f < 2f).isTrue(),
63+
assertThat(1f >= 2f).isFalse(),
6464
assertThat(1.0 < 2.0).isTrue(),
6565
assertThat(1.0 >= 2.0).isFalse());
6666
}
@@ -77,8 +77,8 @@ final class AssertJPrimitiveRulesTest implements RefasterRuleCollectionTestCase
7777
assertThat(1 > 2).isFalse(),
7878
assertThat(1L <= 2L).isTrue(),
7979
assertThat(1L > 2L).isFalse(),
80-
assertThat(1F <= 2F).isTrue(),
81-
assertThat(1F > 2F).isFalse(),
80+
assertThat(1f <= 2f).isTrue(),
81+
assertThat(1f > 2f).isFalse(),
8282
assertThat(1.0 <= 2.0).isTrue(),
8383
assertThat(1.0 > 2.0).isFalse());
8484
}
@@ -95,8 +95,8 @@ final class AssertJPrimitiveRulesTest implements RefasterRuleCollectionTestCase
9595
assertThat(1 <= 2).isFalse(),
9696
assertThat(1L > 2L).isTrue(),
9797
assertThat(1L <= 2L).isFalse(),
98-
assertThat(1F > 2F).isTrue(),
99-
assertThat(1F <= 2F).isFalse(),
98+
assertThat(1f > 2f).isTrue(),
99+
assertThat(1f <= 2f).isFalse(),
100100
assertThat(1.0 > 2.0).isTrue(),
101101
assertThat(1.0 <= 2.0).isFalse());
102102
}
@@ -113,8 +113,8 @@ final class AssertJPrimitiveRulesTest implements RefasterRuleCollectionTestCase
113113
assertThat(1 < 2).isFalse(),
114114
assertThat(1L >= 2L).isTrue(),
115115
assertThat(1L < 2L).isFalse(),
116-
assertThat(1F >= 2F).isTrue(),
117-
assertThat(1F < 2F).isFalse(),
116+
assertThat(1f >= 2f).isTrue(),
117+
assertThat(1f < 2f).isFalse(),
118118
assertThat(1.0 >= 2.0).isTrue(),
119119
assertThat(1.0 < 2.0).isFalse());
120120
}

‎error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/AssertJPrimitiveRulesTestOutput.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ final class AssertJPrimitiveRulesTest implements RefasterRuleCollectionTestCase
2121
assertThat(1).isEqualTo(2),
2222
assertThat(1L).isEqualTo(2L),
2323
assertThat(1L).isEqualTo(2L),
24-
assertThat(1F).isEqualTo(2F),
25-
assertThat(1F).isEqualTo(2F),
24+
assertThat(1f).isEqualTo(2f),
25+
assertThat(1f).isEqualTo(2f),
2626
assertThat(1.0).isEqualTo(2.0),
2727
assertThat(1.0).isEqualTo(2.0));
2828
}
@@ -41,8 +41,8 @@ final class AssertJPrimitiveRulesTest implements RefasterRuleCollectionTestCase
4141
assertThat(1).isNotEqualTo(2),
4242
assertThat(1L).isNotEqualTo(2L),
4343
assertThat(1L).isNotEqualTo(2L),
44-
assertThat(1F).isNotEqualTo(2F),
45-
assertThat(1F).isNotEqualTo(2F),
44+
assertThat(1f).isNotEqualTo(2f),
45+
assertThat(1f).isNotEqualTo(2f),
4646
assertThat(1.0).isNotEqualTo(2.0),
4747
assertThat(1.0).isNotEqualTo(2.0));
4848
}
@@ -59,8 +59,8 @@ final class AssertJPrimitiveRulesTest implements RefasterRuleCollectionTestCase
5959
assertThat(1).isLessThan(2),
6060
assertThat(1L).isLessThan(2L),
6161
assertThat(1L).isLessThan(2L),
62-
assertThat(1F).isLessThan(2F),
63-
assertThat(1F).isLessThan(2F),
62+
assertThat(1f).isLessThan(2f),
63+
assertThat(1f).isLessThan(2f),
6464
assertThat(1.0).isLessThan(2.0),
6565
assertThat(1.0).isLessThan(2.0));
6666
}
@@ -77,8 +77,8 @@ final class AssertJPrimitiveRulesTest implements RefasterRuleCollectionTestCase
7777
assertThat(1).isLessThanOrEqualTo(2),
7878
assertThat(1L).isLessThanOrEqualTo(2L),
7979
assertThat(1L).isLessThanOrEqualTo(2L),
80-
assertThat(1F).isLessThanOrEqualTo(2F),
81-
assertThat(1F).isLessThanOrEqualTo(2F),
80+
assertThat(1f).isLessThanOrEqualTo(2f),
81+
assertThat(1f).isLessThanOrEqualTo(2f),
8282
assertThat(1.0).isLessThanOrEqualTo(2.0),
8383
assertThat(1.0).isLessThanOrEqualTo(2.0));
8484
}
@@ -95,8 +95,8 @@ final class AssertJPrimitiveRulesTest implements RefasterRuleCollectionTestCase
9595
assertThat(1).isGreaterThan(2),
9696
assertThat(1L).isGreaterThan(2L),
9797
assertThat(1L).isGreaterThan(2L),
98-
assertThat(1F).isGreaterThan(2F),
99-
assertThat(1F).isGreaterThan(2F),
98+
assertThat(1f).isGreaterThan(2f),
99+
assertThat(1f).isGreaterThan(2f),
100100
assertThat(1.0).isGreaterThan(2.0),
101101
assertThat(1.0).isGreaterThan(2.0));
102102
}
@@ -113,8 +113,8 @@ final class AssertJPrimitiveRulesTest implements RefasterRuleCollectionTestCase
113113
assertThat(1).isGreaterThanOrEqualTo(2),
114114
assertThat(1L).isGreaterThanOrEqualTo(2L),
115115
assertThat(1L).isGreaterThanOrEqualTo(2L),
116-
assertThat(1F).isGreaterThanOrEqualTo(2F),
117-
assertThat(1F).isGreaterThanOrEqualTo(2F),
116+
assertThat(1f).isGreaterThanOrEqualTo(2f),
117+
assertThat(1f).isGreaterThanOrEqualTo(2f),
118118
assertThat(1.0).isGreaterThanOrEqualTo(2.0),
119119
assertThat(1.0).isGreaterThanOrEqualTo(2.0));
120120
}

‎error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/EqualityRulesTestInput.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ ImmutableSet<Boolean> testNegation() {
5252
!((short) 3 == (short) 4),
5353
!(3 == 4),
5454
!(3L == 4L),
55-
!(3F == 4F),
55+
!(3f == 4f),
5656
!(3.0 == 4.0),
5757
!(BoundType.OPEN == BoundType.CLOSED));
5858
}
@@ -67,7 +67,7 @@ ImmutableSet<Boolean> testIndirectDoubleNegation() {
6767
!((short) 3 != (short) 4),
6868
!(3 != 4),
6969
!(3L != 4L),
70-
!(3F != 4F),
70+
!(3f != 4f),
7171
!(3.0 != 4.0),
7272
!(BoundType.OPEN != BoundType.CLOSED));
7373
}

‎error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/EqualityRulesTestOutput.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ ImmutableSet<Boolean> testNegation() {
5252
(short) 3 != (short) 4,
5353
3 != 4,
5454
3L != 4L,
55-
3F != 4F,
55+
3f != 4f,
5656
3.0 != 4.0,
5757
BoundType.OPEN != BoundType.CLOSED);
5858
}
@@ -67,7 +67,7 @@ ImmutableSet<Boolean> testIndirectDoubleNegation() {
6767
(short) 3 == (short) 4,
6868
3 == 4,
6969
3L == 4L,
70-
3F == 4F,
70+
3f == 4f,
7171
3.0 == 4.0,
7272
BoundType.OPEN == BoundType.CLOSED);
7373
}

‎error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestInput.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,27 +109,27 @@ void testAssertThatLongArrayWithFailMessageSupplierContainsExactly() {
109109
}
110110

111111
void testAssertThatFloatArrayContainsExactly() {
112-
assertArrayEquals(new float[] {1.0F}, new float[] {2.0F});
112+
assertArrayEquals(new float[] {1.0f}, new float[] {2.0f});
113113
}
114114

115115
void testAssertThatFloatArrayWithFailMessageContainsExactly() {
116-
assertArrayEquals(new float[] {1.0F}, new float[] {2.0F}, "foo");
116+
assertArrayEquals(new float[] {1.0f}, new float[] {2.0f}, "foo");
117117
}
118118

119119
void testAssertThatFloatArrayWithFailMessageSupplierContainsExactly() {
120-
assertArrayEquals(new float[] {1.0F}, new float[] {2.0F}, () -> "foo");
120+
assertArrayEquals(new float[] {1.0f}, new float[] {2.0f}, () -> "foo");
121121
}
122122

123123
void testAssertThatFloatArrayContainsExactlyWithOffset() {
124-
assertArrayEquals(new float[] {1.0F}, new float[] {2.0F}, 0.1f);
124+
assertArrayEquals(new float[] {1.0f}, new float[] {2.0f}, 0.1f);
125125
}
126126

127127
void testAssertThatFloatArrayWithFailMessageContainsExactlyWithOffset() {
128-
assertArrayEquals(new float[] {1.0F}, new float[] {2.0F}, 0.1f, "foo");
128+
assertArrayEquals(new float[] {1.0f}, new float[] {2.0f}, 0.1f, "foo");
129129
}
130130

131131
void testAssertThatFloatArrayWithFailMessageSupplierContainsExactlyWithOffset() {
132-
assertArrayEquals(new float[] {1.0F}, new float[] {2.0F}, 0.1f, () -> "foo");
132+
assertArrayEquals(new float[] {1.0f}, new float[] {2.0f}, 0.1f, () -> "foo");
133133
}
134134

135135
void testAssertThatDoubleArrayContainsExactly() {

0 commit comments

Comments
 (0)