Author: jvanzyl
Date: Wed May 13 20:27:13 2009
New Revision: 774515
URL: http://svn.apache.org/viewvc?rev=774515&view=rev
Log:
o bunch more patches from Igor to keep the heap down. junit is just not letting
go.
Modified:
maven/components/branches/MNG-2766/build.xml
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/MavenTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulatorTest.java
maven/components/branches/MNG-2766/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
Modified: maven/components/branches/MNG-2766/build.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/build.xml?rev=774515&r1=774514&r2=774515&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/build.xml (original)
+++ maven/components/branches/MNG-2766/build.xml Wed May 13 20:27:13 2009
@@ -65,7 +65,7 @@
<property name="maven.assembly"
location="apache-maven/target/${maven.home.basename.expected}-bin.zip"/>
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
<property name="maven.debug" value="-e"/>
- <property name="maven.test.skip" value="true"/> <!-- TODO: Change this
default back to false once we're done -->
+ <property name="maven.test.skip" value="false"/> <!-- TODO: Change this
default back to false once we're done -->
<property name="surefire.useFile" value="true"/>
<echo>maven.home = ${maven.home.effective}</echo>
<echo>maven.repo.local = ${maven.repo.local}</echo>
@@ -199,6 +199,8 @@
<classpath refid="maven.classpath"/>
<arg value="${maven.debug}"/>
<arg value="-B"/>
+ <arg value="-X"/>
+ <arg value="-e"/>
<arg value="clean"/>
<arg value="install"/>
<arg value="-Dmaven.test.skip=${maven.test.skip}"/>
Modified:
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java?rev=774515&r1=774514&r2=774515&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
Wed May 13 20:27:13 2009
@@ -73,6 +73,13 @@
artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
}
+ @Override
+ protected void tearDown() throws Exception {
+ wagonManager = null;
+ artifactFactory = null;
+ super.tearDown();
+ }
+
public void testAvailableProtocols()
throws Exception
{
Modified:
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java?rev=774515&r1=774514&r2=774515&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
Wed May 13 20:27:13 2009
@@ -61,6 +61,13 @@
projectArtifact = createLocalArtifact( "project", "3.0" );
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ artifactFactory = null;
+ projectArtifact = null;
+ super.tearDown();
+ }
@Override
protected String component()
Modified:
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java?rev=774515&r1=774514&r2=774515&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
Wed May 13 20:27:13 2009
@@ -78,6 +78,13 @@
projectArtifact = createArtifactSpec( "project", "1.0", null );
}
+ @Override
+ protected void tearDown() throws Exception {
+ artifactCollector = null;
+ artifactFactory = null;
+ super.tearDown();
+ }
+
// works, but we don't fail on cycles presently
public void disabledtestCircularDependencyNotIncludingCurrentProject()
throws ArtifactResolutionException,
InvalidVersionSpecificationException
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java?rev=774515&r1=774514&r2=774515&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
Wed May 13 20:27:13 2009
@@ -37,6 +37,13 @@
projectBuilder = lookup( MavenProjectBuilder.class );
}
+ @Override
+ protected void tearDown() throws Exception {
+ repositorySystem = null;
+ projectBuilder = null;
+ super.tearDown();
+ }
+
abstract protected String getProjectsDirectory();
protected File getProject( String name )
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/MavenTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/MavenTest.java?rev=774515&r1=774514&r2=774515&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/MavenTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/MavenTest.java
Wed May 13 20:27:13 2009
@@ -25,6 +25,14 @@
maven = lookup( Maven.class );
exceptionHandler = lookup( ExceptionHandler.class );
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ maven = null;
+ exceptionHandler = null;
+
+ super.tearDown();
+ }
protected String getProjectsDirectory()
{
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java?rev=774515&r1=774514&r2=774515&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
Wed May 13 20:27:13 2009
@@ -27,6 +27,12 @@
lifecycleExecutor = (DefaultLifecycleExecutor) lookup(
LifecycleExecutor.class );
lookup( ExceptionHandler.class );
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ lifecycleExecutor = null;
+ super.tearDown();
+ }
protected String getProjectsDirectory()
{
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java?rev=774515&r1=774514&r2=774515&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
Wed May 13 20:27:13 2009
@@ -22,6 +22,12 @@
super.setUp();
pluginManager = lookup( PluginManager.class );
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ pluginManager = null;
+ super.tearDown();
+ }
protected String getProjectsDirectory()
{
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java?rev=774515&r1=774514&r2=774515&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
Wed May 13 20:27:13 2009
@@ -70,6 +70,12 @@
factory = lookup( ArtifactFactory.class );
}
+ @Override
+ protected void tearDown() throws Exception {
+ factory = null;
+ super.tearDown();
+ }
+
public void testPluginDescriptorExpressionReference()
throws Exception
{
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java?rev=774515&r1=774514&r2=774515&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
Wed May 13 20:27:13 2009
@@ -55,6 +55,13 @@
projectBuilder = lookup( MavenProjectBuilder.class );
}
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ projectBuilder = null;
+
+ super.tearDown();
+ }
@Override
protected void tearDown()
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=774515&r1=774514&r2=774515&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
Wed May 13 20:27:13 2009
@@ -68,6 +68,13 @@
super.tearDown();
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ mavenProjectBuilder = null;
+
+ super.tearDown();
+ }
/**
* Will throw exception if url is empty. MNG-4050
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java?rev=774515&r1=774514&r2=774515&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
Wed May 13 20:27:13 2009
@@ -19,22 +19,6 @@
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.DependencyManagement;
-import org.apache.maven.model.Exclusion;
-import org.apache.maven.model.Model;
-import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.PlexusTestCase;
@@ -50,6 +34,12 @@
repositorySystem = lookup( RepositorySystem.class );
}
+ @Override
+ protected void tearDown() throws Exception {
+ repositorySystem = null;
+ super.tearDown();
+ }
+
public void testShouldNotCarryExclusionsOverFromDependencyToDependency()
throws Exception
{
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java?rev=774515&r1=774514&r2=774515&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
Wed May 13 20:27:13 2009
@@ -39,6 +39,13 @@
testDirectory = new File( getBasedir(), BASE_POM_DIR );
mavenProjectBuilder = (DefaultMavenProjectBuilder) lookup(
MavenProjectBuilder.class );
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ mavenProjectBuilder = null;
+
+ super.tearDown();
+ }
public void testSettingsNoPom() throws Exception
{
Modified:
maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulatorTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulatorTest.java?rev=774515&r1=774514&r2=774515&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulatorTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulatorTest.java
Wed May 13 20:27:13 2009
@@ -18,6 +18,12 @@
populator = (MavenExecutionRequestPopulator) lookup(
MavenExecutionRequestPopulator.class );
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ populator = null;
+ super.tearDown();
+ }
public void testWagonManagerOfflineFlagIsPopulatedFromSettings()
throws MavenEmbedderException
Modified:
maven/components/branches/MNG-2766/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java?rev=774515&r1=774514&r2=774515&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
Wed May 13 20:27:13 2009
@@ -17,6 +17,12 @@
mirrorBuilder.clearMirrors();
}
+ @Override
+ protected void tearDown() throws Exception {
+ mirrorBuilder = null;
+ super.tearDown();
+ }
+
public void testAddMirrorWithNullRepositoryId()
{
mirrorBuilder.addMirror( null, "test", "http://www.nowhere.com/"; );
