This is an automated email from the ASF dual-hosted git repository. mthmulders pushed a commit to branch MNG-6389-introduce-seperate-toolchain-artifact in repository https://gitbox.apache.org/repos/asf/maven.git
commit c26cfcedc3b7fdacd33bb4435d592a4feb0bfdc5 Author: Maarten Mulders <[email protected]> AuthorDate: Wed Oct 13 12:30:42 2021 +0200 [MNG-6389] Isolate test from model reading code --- .../maven/toolchain/DefaultToolchainTest.java | 48 +++++++++++++--------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java index 29f0fc6..f335003 100644 --- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java +++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java @@ -25,13 +25,11 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import java.io.InputStream; import java.util.Collections; import org.apache.maven.toolchain.java.DefaultJavaToolChain; -import org.apache.maven.toolchain.model.PersistedToolchains; import org.apache.maven.toolchain.model.ToolchainModel; -import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader; +import org.codehaus.plexus.util.xml.Xpp3Dom; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.MockitoAnnotations; @@ -41,8 +39,6 @@ public class DefaultToolchainTest { private final Logger logger = mock( Logger.class ); - private MavenToolchainsXpp3Reader reader = new MavenToolchainsXpp3Reader(); - @BeforeEach public void setUp() throws Exception @@ -129,21 +125,33 @@ public class DefaultToolchainTest @Test public void testEquals() - throws Exception { - try ( InputStream jdksIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" ); - InputStream jdksExtraIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks-extra.xml" ) ) - { - PersistedToolchains jdks = reader.read( jdksIS ); - PersistedToolchains jdksExtra = reader.read( jdksExtraIS ); - - DefaultToolchain tc1 = new DefaultJavaToolChain( jdks.getToolchains().get( 0 ), null ); - DefaultToolchain tc2 = new DefaultJavaToolChain( jdksExtra.getToolchains().get( 0 ), null ); - - assertEquals( tc1, tc1 ); - assertNotEquals( tc1, tc2 ); - assertNotEquals( tc2, tc1 ); - assertEquals( tc2, tc2 ); - } + ToolchainModel tm1 = new ToolchainModel(); + tm1.setType( "jdk" ); + tm1.addProvide( "version", "1.5" ); + tm1.addProvide( "vendor", "sun" ); + Xpp3Dom configuration1 = new Xpp3Dom("configuration"); + Xpp3Dom jdkHome1 = new Xpp3Dom( "jdkHome" ); + jdkHome1.setValue("${env.JAVA_HOME}"); + configuration1.addChild( jdkHome1 ); + tm1.setConfiguration( configuration1 ); + + ToolchainModel tm2 = new ToolchainModel(); + tm1.setType( "jdk" ); + tm1.addProvide( "version", "1.4" ); + tm1.addProvide( "vendor", "sun" ); + Xpp3Dom configuration2 = new Xpp3Dom("configuration"); + Xpp3Dom jdkHome2 = new Xpp3Dom( "jdkHome" ); + jdkHome2.setValue("${env.JAVA_HOME}"); + configuration2.addChild( jdkHome2 ); + tm2.setConfiguration( configuration2 ); + + DefaultToolchain tc1 = new DefaultJavaToolChain( tm1, null ); + DefaultToolchain tc2 = new DefaultJavaToolChain( tm2, null ); + + assertEquals( tc1, tc1 ); + assertNotEquals( tc1, tc2 ); + assertNotEquals( tc2, tc1 ); + assertEquals( tc2, tc2 ); } }
