Skip to content

Switch the underlying xml implementation to the one from maven #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Switch the underlying xml implementation to the one from maven #236

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa24518
Fix Xpp3Dom#mergeIntoXpp3Dom to behave similar to Xpp3DomUtils#mergeI…
gnodet Feb 9, 2023
5fe1e75
Switch the underlying xml implementation to the one from maven
gnodet Feb 7, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix Xpp3Dom#mergeIntoXpp3Dom to behave similar to Xpp3DomUtils#mergeI… 
…ntoXpp3Dom
  • Loading branch information
@gnodet
gnodet committed Feb 9, 2023
commit fa24518f7dbf3087f295b46c2907c28b303172f0
6 changes: 0 additions & 6 deletions src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,12 +435,6 @@ private static void mergeIntoXpp3Dom( Xpp3Dom dominant, Xpp3Dom recessive, Boole

if ( mergeSelf )
{
if ( isEmpty( dominant.getValue() ) && !isEmpty( recessive.getValue() ) )
{
dominant.setValue( recessive.getValue() );
dominant.setInputLocation( recessive.getInputLocation() );
}

if ( recessive.attributes != null )
{
for ( String attr : recessive.attributes.keySet() )
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/org/codehaus/plexus/util/xml/Xpp3DomTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public void testShouldPerformSelfOverrideAtTopLevel()
* <p>testShouldMergeValuesAtTopLevelByDefault.</p>
*/
@Test
public void testShouldMergeValuesAtTopLevelByDefault()
public void testShouldNotMergeValuesAtTopLevelByDefault()
{
// create the dominant DOM
Xpp3Dom t1 = new Xpp3Dom( "top" );
Expand All @@ -166,15 +166,15 @@ public void testShouldMergeValuesAtTopLevelByDefault()
// this is still 2, since we're not using the merge-control attribute.
assertEquals( 2, result.getAttributeNames().length );

assertEquals( result.getValue(), t2.getValue() );
assertEquals( "t2top", result.getInputLocation() );
assertNull( result.getValue() );
assertEquals( "t1top", result.getInputLocation() );
}

/**
* <p>testShouldMergeValuesAtTopLevel.</p>
*/
@Test
public void testShouldMergeValuesAtTopLevel()
public void testShouldNotMergeValuesAtTopLevel()
{
// create the dominant DOM
Xpp3Dom t1 = new Xpp3Dom( "top" );
Expand All @@ -191,7 +191,7 @@ public void testShouldMergeValuesAtTopLevel()
Xpp3Dom result = Xpp3Dom.mergeXpp3Dom( t1, t2 );

assertEquals( 3, result.getAttributeNames().length );
assertEquals( result.getValue(), t2.getValue() );
assertNull( result.getValue() );
}

/**
Expand Down