This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MODELTESTS_IMPROVEMENT in repository https://gitbox.apache.org/repos/asf/maven.git
commit 656b81a57c8e99f78ab34450748939b156508e21 Author: Karl Heinz Marbaise <[email protected]> AuthorDate: Mon Aug 30 15:14:51 2021 +0200 Improved code. --- .../maven/model/transform/CiFriendlyXMLFilterTest.java | 13 +++---------- .../maven/model/transform/ConsumerPomXMLFilterTest.java | 2 +- maven-model/pom.xml | 2 +- .../java/org/apache/maven/model/ModelTestInterface.java | 10 +++++----- pom.xml | 15 +++++++++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/maven-model-transform/src/test/java/org/apache/maven/model/transform/CiFriendlyXMLFilterTest.java b/maven-model-transform/src/test/java/org/apache/maven/model/transform/CiFriendlyXMLFilterTest.java index 80cf84d..09245c6 100644 --- a/maven-model-transform/src/test/java/org/apache/maven/model/transform/CiFriendlyXMLFilterTest.java +++ b/maven-model-transform/src/test/java/org/apache/maven/model/transform/CiFriendlyXMLFilterTest.java @@ -19,16 +19,11 @@ package org.apache.maven.model.transform; * under the License. */ -import static org.junit.jupiter.api.Assertions.assertEquals; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.TransformerException; - -import org.junit.jupiter.api.Test; import org.apache.maven.model.transform.sax.AbstractSAXFilter; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import org.xml.sax.SAXException; +import static org.junit.jupiter.api.Assertions.assertEquals; public class CiFriendlyXMLFilterTest extends AbstractXMLFilterTests { @@ -42,9 +37,7 @@ public class CiFriendlyXMLFilterTest extends AbstractXMLFilterTests } @Override - protected AbstractSAXFilter getFilter() - throws TransformerException, SAXException, ParserConfigurationException - { + protected AbstractSAXFilter getFilter() { return filter; } diff --git a/maven-model-transform/src/test/java/org/apache/maven/model/transform/ConsumerPomXMLFilterTest.java b/maven-model-transform/src/test/java/org/apache/maven/model/transform/ConsumerPomXMLFilterTest.java index 4fe2c19..b1912ed 100644 --- a/maven-model-transform/src/test/java/org/apache/maven/model/transform/ConsumerPomXMLFilterTest.java +++ b/maven-model-transform/src/test/java/org/apache/maven/model/transform/ConsumerPomXMLFilterTest.java @@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; import org.xml.sax.ext.LexicalHandler; -public class ConsumerPomXMLFilterTest extends AbstractXMLFilterTests +class ConsumerPomXMLFilterTest extends AbstractXMLFilterTests { @Override protected String omitXmlDeclaration() diff --git a/maven-model/pom.xml b/maven-model/pom.xml index 39984d9..631b0b8 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -46,7 +46,7 @@ under the License. </dependency> <dependency> <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> + <artifactId>junit-jupiter-api</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/maven-model/src/test/java/org/apache/maven/model/ModelTestInterface.java b/maven-model/src/test/java/org/apache/maven/model/ModelTestInterface.java index 75828ed..0f5c662 100644 --- a/maven-model/src/test/java/org/apache/maven/model/ModelTestInterface.java +++ b/maven-model/src/test/java/org/apache/maven/model/ModelTestInterface.java @@ -49,7 +49,7 @@ interface ModelTestInterface< T > @DisplayName( "equals should not fail with null." ) default void equalsNullSafe() throws ReflectiveOperationException { - T newInstance = createValue().newInstance(); + T newInstance = createValue().getDeclaredConstructor().newInstance(); assertThat( newInstance.equals( null ) ).isFalse(); } @@ -57,16 +57,16 @@ interface ModelTestInterface< T > @DisplayName( "equals should result in false for two different instances." ) default void equalsSameToBeFalse() throws ReflectiveOperationException { - T firstInstance = createValue().newInstance(); - T secondInstance = createValue().newInstance(); - assertThat( firstInstance.equals( secondInstance ) ).isFalse(); + T firstInstance = createValue().getDeclaredConstructor().newInstance(); + T secondInstance = createValue().getDeclaredConstructor().newInstance(); + assertThat(firstInstance).isNotSameAs(secondInstance); } @Test @DisplayName( "toString should not be null." ) default void toStringNullSafe() throws ReflectiveOperationException { - assertThat( createValue().newInstance().toString() ).isNotNull(); + assertThat( createValue().getDeclaredConstructor().newInstance().toString() ).isNotNull(); } /** diff --git a/pom.xml b/pom.xml index c1bb303..28be543 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ under the License. <classWorldsVersion>2.6.0</classWorldsVersion> <commonsCliVersion>1.4</commonsCliVersion> <commonsLangVersion>3.12.0</commonsLangVersion> - <junitVersion>5.7.0</junitVersion> + <junitVersion>5.7.2</junitVersion> <mockitoVersion>3.2.0</mockitoVersion> <plexusVersion>2.1.0</plexusVersion> <plexusInterpolationVersion>1.26</plexusInterpolationVersion> @@ -448,10 +448,16 @@ under the License. <scope>test</scope> </dependency> <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-params</artifactId> + <groupId>org.junit</groupId> + <artifactId>junit-bom</artifactId> <version>${junitVersion}</version> - <scope>test</scope> + <scope>import</scope> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>3.20.2</version> </dependency> </dependencies> <!--bootstrap-start-comment--> @@ -534,6 +540,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>2.22.2</version> <configuration> <argLine>-Xmx256m</argLine> <environmentVariables>
