From e000c61519a3df4e57b18a2755ef2af4c7bfbaaa Mon Sep 17 00:00:00 2001 From: Britton Isbell Date: Thu, 18 Sep 2008 17:42:40 +0000 Subject: [PATCH] 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 --- .../DefaultMavenProjectBuilderTest.java | 4 ---- .../shared/model/ModelMarshallerTest.java | 24 +++---------------- .../impl/DefaultModelDataSourceTest.java | 20 +++------------- 3 files changed, 6 insertions(+), 42 deletions(-) diff --git a/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java index 68089aaf88..0206c74f47 100644 --- a/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java +++ b/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java @@ -107,10 +107,6 @@ public class DefaultMavenProjectBuilderTest File f1 = getTestFile( "src/test/resources/projects/duplicate-plugins-merged-pom.xml" ); 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() ); } diff --git a/maven-shared-model/src/test/java/org/apache/maven/shared/model/ModelMarshallerTest.java b/maven-shared-model/src/test/java/org/apache/maven/shared/model/ModelMarshallerTest.java index 4edc9509d5..bc1f86e6ab 100644 --- a/maven-shared-model/src/test/java/org/apache/maven/shared/model/ModelMarshallerTest.java +++ b/maven-shared-model/src/test/java/org/apache/maven/shared/model/ModelMarshallerTest.java @@ -30,25 +30,7 @@ import java.util.List; public class ModelMarshallerTest { - /* - @Test - public void aaa() throws IOException { - List 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 public void unmarshalWithEmptyCollectionTags() throws IOException @@ -57,7 +39,7 @@ public class ModelMarshallerTest new ModelProperty( "http://apache.org/maven/project", null ), new ModelProperty( "http://apache.org/maven/project/dependencies#collection", null ) ); 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 @@ -68,7 +50,7 @@ public class ModelMarshallerTest new ModelProperty( "http://apache.org/maven/project", null ), new ModelProperty( "http://apache.org/maven/project/modelVersion", "4.0.0" ) ); 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 @@ -81,7 +63,7 @@ public class ModelMarshallerTest null ); 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 diff --git a/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java b/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java index 9462bca8bf..384533d373 100644 --- a/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java +++ b/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java @@ -81,9 +81,9 @@ public class DefaultModelDataSourceTest List mps = datasource.mergeModelContainers( factory.create( new ArrayList( modelProperties.subList( 3, 9 ) ) ), factory.create( new ArrayList( modelProperties.subList( 9, 14 ) ) ) ); - for(ModelProperty mp : mps) { - System.out.println(mp); - } + // for(ModelProperty mp : mps) { + // System.out.println(mp); + // } assertTrue(mps.contains(dup6a)); assertTrue(mps.contains(dup11a)); } @@ -125,9 +125,6 @@ public class DefaultModelDataSourceTest List mps = datasource.mergeModelContainers( factory.create( new ArrayList( modelProperties.subList( 4, 8 ) ) ), factory.create( new ArrayList( modelProperties.subList( 8, 11 ) ) ) ); - for(ModelProperty mp : mps) { - System.out.println(mp); - } assertFalse(mps.contains(dup10)); } @@ -263,21 +260,10 @@ public class DefaultModelDataSourceTest factory.create( new ArrayList( modelProperties.subList( 4, 8 ) ) ), factory.create( new ArrayList( modelProperties.subList( 8, 12 ) ) ) ); - for ( ModelProperty mp : joinedModelContainer.getProperties() ) - { - System.out.println( "-" + mp ); - } - if ( !datasource.getModelProperties().containsAll( joinedModelContainer.getProperties() ) ) { throw new IOException(); } - - for ( ModelProperty mp : datasource.getModelProperties() ) - { - System.out.println( "+" + mp ); - } - }