jlengrand/error-prone-support
1
0
Fork 0
mirror of https://github.com/jlengrand/error-prone-support.git synced 2026-03-10 08:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve Refaster template naming and test inconsistencies (#109)

Browse Source
This commit is contained in:
Rick Ossendrijver
2022-05-31 13:54:17 +02:00
committed by GitHub
parent b9a3840e25
commit 362518b0f4
14 changed files with 29 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/AssertJNumberTemplates.java
View File

@@ -22,7 +22,7 @@ import org.assertj.core.api.NumberAssert;
final class AssertJNumberTemplates {
private AssertJNumberTemplates() {}
static final class NumberIsPositive {
static final class NumberAssertIsPositive {
@BeforeTemplate
AbstractByteAssert<?> before(AbstractByteAssert<?> numberAssert) {
return Refaster.anyOf(
@@ -73,7 +73,7 @@ final class AssertJNumberTemplates {
}
}
static final class NumberIsNotPositive {
static final class NumberAssertIsNotPositive {
@BeforeTemplate
AbstractByteAssert<?> before(AbstractByteAssert<?> numberAssert) {
return Refaster.anyOf(
@@ -124,7 +124,7 @@ final class AssertJNumberTemplates {
}
}
static final class NumberIsNegative {
static final class NumberAssertIsNegative {
@BeforeTemplate
AbstractByteAssert<?> before(AbstractByteAssert<?> numberAssert) {
return Refaster.anyOf(
@@ -175,7 +175,7 @@ final class AssertJNumberTemplates {
}
}
static final class NumberIsNotNegative {
static final class NumberAssertIsNotNegative {
@BeforeTemplate
AbstractByteAssert<?> before(AbstractByteAssert<?> numberAssert) {
return Refaster.anyOf(

2
error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/CollectionTemplates.java
View File

@@ -187,7 +187,7 @@ final class CollectionTemplates {
* Don't call {@link ImmutableCollection#asList()} if the result is going to be streamed; stream
* directly.
*/
static final class ImmutableCollectionAsListToStream<T> {
static final class ImmutableCollectionStream<T> {
@BeforeTemplate
Stream<T> before(ImmutableCollection<T> collection) {
return collection.asList().stream();

5
error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/AssertJCharSequenceTemplatesTestInput.java
View File

@@ -6,11 +6,8 @@ import com.google.common.collect.ImmutableSet;
import org.assertj.core.api.AbstractAssert;
final class AssertJCharSequenceTemplatesTest implements RefasterTemplateTestCase {
void testAssertThatCharSequenceIsEmpty1() {
void testAssertThatCharSequenceIsEmpty() {
assertThat("foo".length()).isEqualTo(0L);
}
void testAssertThatCharSequenceIsEmpty2() {
assertThat("foo".length()).isNotPositive();
}

5
error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/AssertJCharSequenceTemplatesTestOutput.java
View File

@@ -6,11 +6,8 @@ import com.google.common.collect.ImmutableSet;
import org.assertj.core.api.AbstractAssert;
final class AssertJCharSequenceTemplatesTest implements RefasterTemplateTestCase {
void testAssertThatCharSequenceIsEmpty1() {
void testAssertThatCharSequenceIsEmpty() {
assertThat("foo").isEmpty();
}
void testAssertThatCharSequenceIsEmpty2() {
assertThat("foo").isEmpty();
}

8
error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/AssertJEnumerableTemplatesTestInput.java
View File

@@ -12,15 +12,9 @@ final class AssertJEnumableTemplatesTest implements RefasterTemplateTestCase {
return ImmutableSet.of(Iterables.class);
}
void testEnumerableAssertIsEmpty1() {
void testEnumerableAssertIsEmpty() {
assertThat(ImmutableSet.of()).hasSize(0);
}
void testEnumerableAssertIsEmpty2() {
assertThat(ImmutableSet.of()).hasSizeLessThanOrEqualTo(0);
}
void testEnumerableAssertIsEmpty3() {
assertThat(ImmutableSet.of()).hasSizeLessThan(1);
}

8
error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/AssertJEnumerableTemplatesTestOutput.java
View File

@@ -12,15 +12,9 @@ final class AssertJEnumableTemplatesTest implements RefasterTemplateTestCase {
return ImmutableSet.of(Iterables.class);
}
void testEnumerableAssertIsEmpty1() {
void testEnumerableAssertIsEmpty() {
assertThat(ImmutableSet.of()).isEmpty();
}
void testEnumerableAssertIsEmpty2() {
assertThat(ImmutableSet.of()).isEmpty();
}
void testEnumerableAssertIsEmpty3() {
assertThat(ImmutableSet.of()).isEmpty();
}

8
error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/AssertJNumberTemplatesTestInput.java
View File

@@ -8,7 +8,7 @@ import java.math.BigInteger;
import org.assertj.core.api.NumberAssert;
final class AssertJNumberTemplatesTest implements RefasterTemplateTestCase {
ImmutableSet<NumberAssert<?, ?>> testAbstractIntegerAssertIsPositive() {
ImmutableSet<NumberAssert<?, ?>> testNumberAssertIsPositive() {
return ImmutableSet.of(
assertThat((byte) 0).isGreaterThan((byte) 0),
assertThat((byte) 0).isGreaterThanOrEqualTo((byte) 1),
@@ -25,7 +25,7 @@ final class AssertJNumberTemplatesTest implements RefasterTemplateTestCase {
assertThat(BigDecimal.ZERO).isGreaterThan(BigDecimal.ZERO));
}
ImmutableSet<NumberAssert<?, ?>> testAbstractIntegerAssertIsNotPositive() {
ImmutableSet<NumberAssert<?, ?>> testNumberAssertIsNotPositive() {
return ImmutableSet.of(
assertThat((byte) 0).isLessThanOrEqualTo((byte) 0),
assertThat((byte) 0).isLessThan((byte) 1),
@@ -42,7 +42,7 @@ final class AssertJNumberTemplatesTest implements RefasterTemplateTestCase {
assertThat(BigDecimal.ZERO).isLessThanOrEqualTo(BigDecimal.ZERO));
}
ImmutableSet<NumberAssert<?, ?>> testAbstractIntegerAssertIsNegative() {
ImmutableSet<NumberAssert<?, ?>> testNumberAssertIsNegative() {
return ImmutableSet.of(
assertThat((byte) 0).isLessThan((byte) 0),
assertThat((byte) 0).isLessThanOrEqualTo((byte) -1),
@@ -59,7 +59,7 @@ final class AssertJNumberTemplatesTest implements RefasterTemplateTestCase {
assertThat(BigDecimal.ZERO).isLessThan(BigDecimal.ZERO));
}
ImmutableSet<NumberAssert<?, ?>> testAbstractIntegerAssertIsNotNegative() {
ImmutableSet<NumberAssert<?, ?>> testNumberAssertIsNotNegative() {
return ImmutableSet.of(
assertThat((byte) 0).isGreaterThanOrEqualTo((byte) 0),
assertThat((byte) 0).isGreaterThan((byte) -1),

8
error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/AssertJNumberTemplatesTestOutput.java
View File

@@ -8,7 +8,7 @@ import java.math.BigInteger;
import org.assertj.core.api.NumberAssert;
final class AssertJNumberTemplatesTest implements RefasterTemplateTestCase {
ImmutableSet<NumberAssert<?, ?>> testAbstractIntegerAssertIsPositive() {
ImmutableSet<NumberAssert<?, ?>> testNumberAssertIsPositive() {
return ImmutableSet.of(
assertThat((byte) 0).isPositive(),
assertThat((byte) 0).isPositive(),
@@ -25,7 +25,7 @@ final class AssertJNumberTemplatesTest implements RefasterTemplateTestCase {
assertThat(BigDecimal.ZERO).isPositive());
}
ImmutableSet<NumberAssert<?, ?>> testAbstractIntegerAssertIsNotPositive() {
ImmutableSet<NumberAssert<?, ?>> testNumberAssertIsNotPositive() {
return ImmutableSet.of(
assertThat((byte) 0).isNotPositive(),
assertThat((byte) 0).isNotPositive(),
@@ -42,7 +42,7 @@ final class AssertJNumberTemplatesTest implements RefasterTemplateTestCase {
assertThat(BigDecimal.ZERO).isNotPositive());
}
ImmutableSet<NumberAssert<?, ?>> testAbstractIntegerAssertIsNegative() {
ImmutableSet<NumberAssert<?, ?>> testNumberAssertIsNegative() {
return ImmutableSet.of(
assertThat((byte) 0).isNegative(),
assertThat((byte) 0).isNegative(),
@@ -59,7 +59,7 @@ final class AssertJNumberTemplatesTest implements RefasterTemplateTestCase {
assertThat(BigDecimal.ZERO).isNegative());
}
ImmutableSet<NumberAssert<?, ?>> testAbstractIntegerAssertIsNotNegative() {
ImmutableSet<NumberAssert<?, ?>> testNumberAssertIsNotNegative() {
return ImmutableSet.of(
assertThat((byte) 0).isNotNegative(),
assertThat((byte) 0).isNotNegative(),

2
error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/CollectionTemplatesTestInput.java
View File

@@ -126,7 +126,7 @@ final class CollectionTemplatesTest implements RefasterTemplateTestCase {
ImmutableSet<Optional<String>> testOptionalFirstQueueElement() {
return ImmutableSet.of(
new LinkedList<String>().stream().findAny(),
new LinkedList<String>().stream().findFirst(),
new LinkedList<String>().isEmpty()
? Optional.empty()
: Optional.of(new LinkedList<String>().peek()),

2
error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/CollectionTemplatesTestOutput.java
View File

@@ -108,7 +108,7 @@ final class CollectionTemplatesTest implements RefasterTemplateTestCase {
ImmutableSet<Optional<String>> testOptionalFirstQueueElement() {
return ImmutableSet.of(
new LinkedList<String>().stream().findFirst(),
Optional.ofNullable(new LinkedList<String>().peek()),
Optional.ofNullable(new LinkedList<String>().peek()),
Optional.ofNullable(new LinkedList<String>().peek()),
Optional.ofNullable(new LinkedList<String>().peek()),

12
error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/OptionalTemplatesTestInput.java
View File

@@ -44,16 +44,12 @@ final class OptionalTemplatesTest implements RefasterTemplateTestCase {
: Optional.of(ImmutableSet.of("foo").iterator().next()));
}
ImmutableSet<Optional<String>> testTernaryOperatorOptionalPositiveFiltering() {
return ImmutableSet.of(
"foo".length() > 5 ? Optional.of("foo") : Optional.empty(),
!"bar".contains("baz") ? Optional.of("bar") : Optional.empty());
Optional<String> testTernaryOperatorOptionalPositiveFiltering() {
return "foo".length() > 5 ? Optional.of("foo") : Optional.empty();
}
ImmutableSet<Optional<String>> testTernaryOperatorOptionalNegativeFiltering() {
return ImmutableSet.of(
"foo".length() > 5 ? Optional.empty() : Optional.of("foo"),
!"bar".contains("baz") ? Optional.empty() : Optional.of("bar"));
Optional<String> testTernaryOperatorOptionalNegativeFiltering() {
return "foo".length() > 5 ? Optional.empty() : Optional.of("foo");
}
ImmutableSet<Boolean> testMapOptionalToBoolean() {

18
error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/OptionalTemplatesTestOutput.java
View File

@@ -40,20 +40,14 @@ final class OptionalTemplatesTest implements RefasterTemplateTestCase {
stream(ImmutableSet.of("foo").iterator()).findFirst());
}
ImmutableSet<Optional<String>> testTernaryOperatorOptionalPositiveFiltering() {
return ImmutableSet.of(
/* Or Optional.ofNullable (can't auto-infer). */ Optional.of("foo")
.filter(v -> v.length() > 5),
/* Or Optional.ofNullable (can't auto-infer). */ Optional.of("bar")
.filter(v -> !v.contains("baz")));
Optional<String> testTernaryOperatorOptionalPositiveFiltering() {
return /* Or Optional.ofNullable (can't auto-infer). */ Optional.of("foo")
.filter(v -> v.length() > 5);
}
ImmutableSet<Optional<String>> testTernaryOperatorOptionalNegativeFiltering() {
return ImmutableSet.of(
/* Or Optional.ofNullable (can't auto-infer). */ Optional.of("foo")
.filter(v -> v.length() <= 5),
/* Or Optional.ofNullable (can't auto-infer). */ Optional.of("bar")
.filter(v -> v.contains("baz")));
Optional<String> testTernaryOperatorOptionalNegativeFiltering() {
return /* Or Optional.ofNullable (can't auto-infer). */ Optional.of("foo")
.filter(v -> v.length() <= 5);
}
ImmutableSet<Boolean> testMapOptionalToBoolean() {

1
error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/TestNGToAssertJTemplatesTestInput.java
View File

@@ -105,7 +105,6 @@ final class TestNGToAssertJTemplatesTest implements RefasterTemplateTestCase {
assertEquals(0.0, 0.0);
assertEquals(new Object(), new Object());
assertEquals("actual", "expected");
assertEquals(ImmutableSet.of(), ImmutableSet.of());
assertEquals(ImmutableMap.of(), ImmutableMap.of());
}

1
error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/TestNGToAssertJTemplatesTestOutput.java
View File

@@ -110,7 +110,6 @@ final class TestNGToAssertJTemplatesTest implements RefasterTemplateTestCase {
assertThat(0.0).isEqualTo(0.0);
assertThat(new Object()).isEqualTo(new Object());
assertThat("actual").isEqualTo("expected");
assertThat(ImmutableSet.of()).hasSameElementsAs(ImmutableSet.of());
assertThat(ImmutableMap.of()).isEqualTo(ImmutableMap.of());
}