diff --git a/baseline-refaster-rules/src/main/java/com/palantir/baseline/refaster/AssertjCollectionHasSameSizeAsArray.java b/baseline-refaster-rules/src/main/java/com/palantir/baseline/refaster/AssertjCollectionHasSameSizeAsArray.java new file mode 100644 index 000000000..5cdc6f09c --- /dev/null +++ b/baseline-refaster-rules/src/main/java/com/palantir/baseline/refaster/AssertjCollectionHasSameSizeAsArray.java @@ -0,0 +1,44 @@ +/* + * (c) Copyright 2019 Palantir Technologies Inc. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.palantir.baseline.refaster; + +import com.google.errorprone.refaster.ImportPolicy; +import com.google.errorprone.refaster.annotation.AfterTemplate; +import com.google.errorprone.refaster.annotation.BeforeTemplate; +import com.google.errorprone.refaster.annotation.UseImportPolicy; +import org.assertj.core.api.IterableAssert; +import org.assertj.core.api.ListAssert; + + +public final class AssertjCollectionHasSameSizeAsArray { + + @BeforeTemplate + IterableAssert before(IterableAssert assertInProgress, U[] expected) { + return assertInProgress.hasSize(expected.length); + } + + @BeforeTemplate + ListAssert before(ListAssert assertInProgress, U[] expected) { + return assertInProgress.hasSize(expected.length); + } + + @AfterTemplate + @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS) + IterableAssert after(IterableAssert assertInProgress, U[] expected) { + return assertInProgress.hasSameSizeAs(expected); + } +} diff --git a/baseline-refaster-rules/src/test/java/com/palantir/baseline/refaster/AssertjCollectionHasSameSizeAsTest.java b/baseline-refaster-rules/src/test/java/com/palantir/baseline/refaster/AssertjCollectionHasSameSizeAsTest.java index c91b8164c..aeaadadfd 100644 --- a/baseline-refaster-rules/src/test/java/com/palantir/baseline/refaster/AssertjCollectionHasSameSizeAsTest.java +++ b/baseline-refaster-rules/src/test/java/com/palantir/baseline/refaster/AssertjCollectionHasSameSizeAsTest.java @@ -59,4 +59,42 @@ public void test() { " }", "}"); } + + @Test + public void testArray() { + assumeThat(System.getProperty("java.specification.version")) + .describedAs("Refaster does not currently support fluent refactors on java 11") + .isEqualTo("1.8"); + RefasterTestHelper + .forRefactoring(AssertjCollectionHasSameSizeAsArray.class) + .withInputLines( + "Test", + "import static org.assertj.core.api.Assertions.assertThat;", + "import java.util.List;", + "import java.util.Collection;", + "public class Test {", + " void f(List a, Collection b, Iterable c, String[] target) {", + " assertThat(a).hasSize(target.length);", + " assertThat(b).hasSize(target.length);", + " assertThat(c).hasSize(target.length);", + " assertThat(a).describedAs(\"desc\").hasSize(target.length);", + " assertThat(b).describedAs(\"desc\").hasSize(target.length);", + " assertThat(c).describedAs(\"desc\").hasSize(target.length);", + " }", + "}") + .hasOutputLines( + "import static org.assertj.core.api.Assertions.assertThat;", + "import java.util.List;", + "import java.util.Collection;", + "public class Test {", + " void f(List a, Collection b, Iterable c, String[] target) {", + " assertThat(a).hasSameSizeAs(target);", + " assertThat(b).hasSameSizeAs(target);", + " assertThat(c).hasSameSizeAs(target);", + " assertThat(a).describedAs(\"desc\").hasSameSizeAs(target);", + " assertThat(b).describedAs(\"desc\").hasSameSizeAs(target);", + " assertThat(c).describedAs(\"desc\").hasSameSizeAs(target);", + " }", + "}"); + } } diff --git a/changelog/@unreleased/pr-922.v2.yml b/changelog/@unreleased/pr-922.v2.yml new file mode 100644 index 000000000..4bba88514 --- /dev/null +++ b/changelog/@unreleased/pr-922.v2.yml @@ -0,0 +1,5 @@ +type: improvement +improvement: + description: Implement AssertjCollectionHasSameSizeAsArray + links: + - https://github.com/palantir/gradle-baseline/pull/922