mirror of https://github.com/apache/maven.git
Removed unneeded system.out.println messages from unit tests.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696739 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
3caaba53ed
commit
e000c61519
|
@ -107,10 +107,6 @@ public class DefaultMavenProjectBuilderTest
|
||||||
File f1 = getTestFile( "src/test/resources/projects/duplicate-plugins-merged-pom.xml" );
|
File f1 = getTestFile( "src/test/resources/projects/duplicate-plugins-merged-pom.xml" );
|
||||||
|
|
||||||
MavenProject project = getProject( f1 );
|
MavenProject project = getProject( f1 );
|
||||||
Writer out = WriterFactory.newXmlWriter( System.out );
|
|
||||||
MavenXpp3Writer writer = new MavenXpp3Writer();
|
|
||||||
writer.write( out, project.getModel() );
|
|
||||||
out.close();
|
|
||||||
assertEquals( 2, ( (Plugin) project.getBuildPlugins().get( 0 ) ).getDependencies().size() );
|
assertEquals( 2, ( (Plugin) project.getBuildPlugins().get( 0 ) ).getDependencies().size() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -30,25 +30,7 @@ import java.util.List;
|
||||||
|
|
||||||
public class ModelMarshallerTest
|
public class ModelMarshallerTest
|
||||||
{
|
{
|
||||||
/*
|
|
||||||
@Test
|
|
||||||
public void aaa() throws IOException {
|
|
||||||
List<ModelProperty> properties =
|
|
||||||
ModelMarshaller.marshallXmlToModelProperties(
|
|
||||||
new FileInputStream("/home/shane/checkout/SI_MAVEN_2_1_A/maven-core-it-runner/target/it-working-folder/it0060/subproject/pom.xml"),
|
|
||||||
"http://apache.org/maven", null);
|
|
||||||
for(ModelProperty mp : properties) {
|
|
||||||
// System.out.println(mp);
|
|
||||||
}
|
|
||||||
ModelTransformerContext ctx = new ModelTransformerContext(new ArrayList());
|
|
||||||
|
|
||||||
|
|
||||||
for(ModelProperty mp : properties) {
|
|
||||||
System.out.println(mp);
|
|
||||||
}
|
|
||||||
System.out.println(ModelMarshaller.unmarshalModelPropertiesToXml(properties, "http://apache.org/maven"));
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
@Test
|
@Test
|
||||||
public void unmarshalWithEmptyCollectionTags()
|
public void unmarshalWithEmptyCollectionTags()
|
||||||
throws IOException
|
throws IOException
|
||||||
|
@ -57,7 +39,7 @@ public class ModelMarshallerTest
|
||||||
new ModelProperty( "http://apache.org/maven/project", null ),
|
new ModelProperty( "http://apache.org/maven/project", null ),
|
||||||
new ModelProperty( "http://apache.org/maven/project/dependencies#collection", null ) );
|
new ModelProperty( "http://apache.org/maven/project/dependencies#collection", null ) );
|
||||||
String xml = ModelMarshaller.unmarshalModelPropertiesToXml( modelProperties, "http://apache.org/maven" );
|
String xml = ModelMarshaller.unmarshalModelPropertiesToXml( modelProperties, "http://apache.org/maven" );
|
||||||
System.out.println( "COMPLETE:" + xml ); //TODO: Verify proper xml
|
// System.out.println( "COMPLETE:" + xml ); //TODO: Verify proper xml
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@ -68,7 +50,7 @@ public class ModelMarshallerTest
|
||||||
new ModelProperty( "http://apache.org/maven/project", null ),
|
new ModelProperty( "http://apache.org/maven/project", null ),
|
||||||
new ModelProperty( "http://apache.org/maven/project/modelVersion", "4.0.0" ) );
|
new ModelProperty( "http://apache.org/maven/project/modelVersion", "4.0.0" ) );
|
||||||
String xml = ModelMarshaller.unmarshalModelPropertiesToXml( modelProperties, "http://apache.org/maven" );
|
String xml = ModelMarshaller.unmarshalModelPropertiesToXml( modelProperties, "http://apache.org/maven" );
|
||||||
System.out.println( "COMPLETE:" + xml ); //TODO: Verify proper xml
|
// System.out.println( "COMPLETE:" + xml ); //TODO: Verify proper xml
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@ -81,7 +63,7 @@ public class ModelMarshallerTest
|
||||||
null );
|
null );
|
||||||
|
|
||||||
String xml = ModelMarshaller.unmarshalModelPropertiesToXml( modelProperties, "http://apache.org/maven" );
|
String xml = ModelMarshaller.unmarshalModelPropertiesToXml( modelProperties, "http://apache.org/maven" );
|
||||||
System.out.println( "COMPLETE:" + xml ); //TODO: Verify proper xml
|
// System.out.println( "COMPLETE:" + xml ); //TODO: Verify proper xml
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
|
@ -81,9 +81,9 @@ public class DefaultModelDataSourceTest
|
||||||
List<ModelProperty> mps = datasource.mergeModelContainers(
|
List<ModelProperty> mps = datasource.mergeModelContainers(
|
||||||
factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 3, 9 ) ) ),
|
factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 3, 9 ) ) ),
|
||||||
factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 9, 14 ) ) ) );
|
factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 9, 14 ) ) ) );
|
||||||
for(ModelProperty mp : mps) {
|
// for(ModelProperty mp : mps) {
|
||||||
System.out.println(mp);
|
// System.out.println(mp);
|
||||||
}
|
// }
|
||||||
assertTrue(mps.contains(dup6a));
|
assertTrue(mps.contains(dup6a));
|
||||||
assertTrue(mps.contains(dup11a));
|
assertTrue(mps.contains(dup11a));
|
||||||
}
|
}
|
||||||
|
@ -125,9 +125,6 @@ public class DefaultModelDataSourceTest
|
||||||
List<ModelProperty> mps = datasource.mergeModelContainers(
|
List<ModelProperty> mps = datasource.mergeModelContainers(
|
||||||
factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 4, 8 ) ) ),
|
factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 4, 8 ) ) ),
|
||||||
factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 8, 11 ) ) ) );
|
factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 8, 11 ) ) ) );
|
||||||
for(ModelProperty mp : mps) {
|
|
||||||
System.out.println(mp);
|
|
||||||
}
|
|
||||||
assertFalse(mps.contains(dup10));
|
assertFalse(mps.contains(dup10));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -263,21 +260,10 @@ public class DefaultModelDataSourceTest
|
||||||
factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 4, 8 ) ) ),
|
factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 4, 8 ) ) ),
|
||||||
factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 8, 12 ) ) ) );
|
factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 8, 12 ) ) ) );
|
||||||
|
|
||||||
for ( ModelProperty mp : joinedModelContainer.getProperties() )
|
|
||||||
{
|
|
||||||
System.out.println( "-" + mp );
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( !datasource.getModelProperties().containsAll( joinedModelContainer.getProperties() ) )
|
if ( !datasource.getModelProperties().containsAll( joinedModelContainer.getProperties() ) )
|
||||||
{
|
{
|
||||||
throw new IOException();
|
throw new IOException();
|
||||||
}
|
}
|
||||||
|
|
||||||
for ( ModelProperty mp : datasource.getModelProperties() )
|
|
||||||
{
|
|
||||||
System.out.println( "+" + mp );
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue