You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2007/02/13 04:28:22 UTC
svn commit: r506840 [2/2] - in
/maven/plugins/trunk/maven-dependency-plugin/src:
main/java/org/apache/maven/plugin/dependency/
main/java/org/apache/maven/plugin/dependency/fromConfiguration/
main/java/org/apache/maven/plugin/dependency/resolvers/ main/...
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java?view=diff&rev=506840&r1=506839&r2=506840
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java Mon Feb 12 19:28:20 2007
@@ -53,22 +53,28 @@
Artifact snap;
Artifact release;
+
+ Artifact sources;
protected void setUp()
throws Exception
{
super.setUp();
- ArtifactHandler ah = new DefaultArtifactHandlerStub("jar",null);
+ ArtifactHandler ah = new DefaultArtifactHandlerStub( "jar", null );
VersionRange vr = VersionRange.createFromVersion( "1.1" );
release = new DefaultArtifact( "test", "one", vr, Artifact.SCOPE_COMPILE, "jar", "sources", ah, false );
artifacts.add( release );
- ah = new DefaultArtifactHandlerStub("war",null);
+ ah = new DefaultArtifactHandlerStub( "war", null );
vr = VersionRange.createFromVersion( "1.1-SNAPSHOT" );
snap = new DefaultArtifact( "test", "two", vr, Artifact.SCOPE_PROVIDED, "war", null, ah, false );
artifacts.add( snap );
+ ah = new DefaultArtifactHandlerStub( "war", null );
+ vr = VersionRange.createFromVersion( "1.1-SNAPSHOT" );
+ sources = new DefaultArtifact( "test", "two", vr, Artifact.SCOPE_PROVIDED, "sources", "sources", ah, false );
+
// pick random output location
Random a = new Random();
outputFolder = new File( "target/copy" + a.nextLong() + "/" );
@@ -85,21 +91,31 @@
throws MojoExecutionException
{
File folder = new File( "target/a" );
- File name = DependencyUtil.getFormattedOutputDirectory( false, false, folder, (Artifact) artifacts.get( 0 ) );
+ File name = DependencyUtil.getFormattedOutputDirectory( false, false, false, folder, (Artifact) artifacts
+ .get( 0 ) );
// object is the same.
assertEquals( folder, name );
- name = DependencyUtil.getFormattedOutputDirectory( true, false, folder, (Artifact) artifacts.get( 0 ) );
+ name = DependencyUtil.getFormattedOutputDirectory( true, false, false, folder, (Artifact) artifacts.get( 0 ) );
String expectedResult = folder.getAbsolutePath() + File.separatorChar + "jars";
assertTrue( expectedResult.equalsIgnoreCase( name.getAbsolutePath() ) );
- name = DependencyUtil.getFormattedOutputDirectory( false, true, folder, (Artifact) artifacts.get( 0 ) );
- expectedResult = folder.getAbsolutePath() + File.separatorChar + "test-one-jar-sources-1.1";
+ name = DependencyUtil.getFormattedOutputDirectory( false, true, false, folder, (Artifact) artifacts.get( 0 ) );
+ expectedResult = folder.getAbsolutePath() + File.separatorChar + "one-sources-1.1-jar";
assertEquals( expectedResult, name.getAbsolutePath() );
- name = DependencyUtil.getFormattedOutputDirectory( true, true, folder, (Artifact) artifacts.get( 0 ) );
+ name = DependencyUtil.getFormattedOutputDirectory( false, true, true, folder, (Artifact) artifacts.get( 0 ) );
+ expectedResult = folder.getAbsolutePath() + File.separatorChar + "one-sources-jar";
+ assertEquals( expectedResult, name.getAbsolutePath() );
+
+ name = DependencyUtil.getFormattedOutputDirectory( true, true, false, folder, (Artifact) artifacts.get( 0 ) );
+ expectedResult = folder.getAbsolutePath() + File.separatorChar + "jars" + File.separatorChar
+ + "one-sources-1.1-jar";
+ assertEquals( expectedResult, name.getAbsolutePath() );
+
+ name = DependencyUtil.getFormattedOutputDirectory( true, true, true, folder, (Artifact) artifacts.get( 0 ) );
expectedResult = folder.getAbsolutePath() + File.separatorChar + "jars" + File.separatorChar
- + "test-one-jar-sources-1.1";
+ + "one-sources-jar";
assertEquals( expectedResult, name.getAbsolutePath() );
}
@@ -107,23 +123,46 @@
throws MojoExecutionException
{
File folder = new File( "target/a" );
- File name = DependencyUtil.getFormattedOutputDirectory( false, false, folder, (Artifact) artifacts.get( 1 ) );
+ File name = DependencyUtil.getFormattedOutputDirectory( false, false, false, folder, (Artifact) artifacts
+ .get( 1 ) );
// object is the same.
assertEquals( folder, name );
- name = DependencyUtil.getFormattedOutputDirectory( true, false, folder, (Artifact) artifacts.get( 1 ) );
+ name = DependencyUtil.getFormattedOutputDirectory( true, false, false, folder, (Artifact) artifacts.get( 1 ) );
String expectedResult = folder.getAbsolutePath() + File.separatorChar + "wars";
assertEquals( expectedResult, name.getAbsolutePath() );
- name = DependencyUtil.getFormattedOutputDirectory( false, true, folder, (Artifact) artifacts.get( 1 ) );
- expectedResult = folder.getAbsolutePath() + File.separatorChar + "test-two-war-1.1-SNAPSHOT";
+ name = DependencyUtil.getFormattedOutputDirectory( false, true, false, folder, (Artifact) artifacts.get( 1 ) );
+ expectedResult = folder.getAbsolutePath() + File.separatorChar + "two-1.1-SNAPSHOT-war";
+ assertEquals( expectedResult, name.getAbsolutePath() );
+
+ name = DependencyUtil.getFormattedOutputDirectory( true, true, false, folder, (Artifact) artifacts.get( 1 ) );
+ expectedResult = folder.getAbsolutePath() + File.separatorChar + "wars" + File.separatorChar
+ + "two-1.1-SNAPSHOT-war";
+ assertEquals( expectedResult, name.getAbsolutePath() );
+
+ name = DependencyUtil.getFormattedOutputDirectory( false, true, true, folder, (Artifact) artifacts.get( 1 ) );
+ expectedResult = folder.getAbsolutePath() + File.separatorChar + "two-war";
assertEquals( expectedResult, name.getAbsolutePath() );
- name = DependencyUtil.getFormattedOutputDirectory( true, true, folder, (Artifact) artifacts.get( 1 ) );
+ name = DependencyUtil.getFormattedOutputDirectory( true, true, true, folder, (Artifact) artifacts.get( 1 ) );
expectedResult = folder.getAbsolutePath() + File.separatorChar + "wars" + File.separatorChar
- + "test-two-war-1.1-SNAPSHOT";
+ + "two-war";
assertEquals( expectedResult, name.getAbsolutePath() );
}
+
+ public void testDirectoryNameSources()
+ throws MojoExecutionException
+{
+ File folder = new File( "target/a" );
+ File name = DependencyUtil.getFormattedOutputDirectory( false, true, true, folder, sources );
+ String expectedResult = folder.getAbsolutePath() + File.separatorChar + "two-sources";
+ assertEquals( expectedResult, name.getAbsolutePath() );
+
+ name = DependencyUtil.getFormattedOutputDirectory( false, true, false, folder, sources );
+ expectedResult = folder.getAbsolutePath() + File.separatorChar + "two-sources-1.1-SNAPSHOT-sources";
+ assertEquals( expectedResult, name.getAbsolutePath() );
+}
public void testFileName()
throws MojoExecutionException
@@ -140,7 +179,7 @@
public void testTestJar()
{
- ArtifactHandler ah = new DefaultArtifactHandlerStub("test-jar",null);
+ ArtifactHandler ah = new DefaultArtifactHandlerStub( "test-jar", null );
VersionRange vr = VersionRange.createFromVersion( "1.1-SNAPSHOT" );
Artifact artifact = new DefaultArtifact( "test", "two", vr, Artifact.SCOPE_PROVIDED, "test-jar", null, ah,
false );
@@ -148,12 +187,13 @@
String name = DependencyUtil.getFormattedFileName( artifact, false );
String expectedResult = "two-1.1-SNAPSHOT.jar";
assertEquals( expectedResult, name );
-
+
}
+
public void testFileNameClassifier()
throws MojoExecutionException
{
- ArtifactHandler ah = new DefaultArtifactHandlerStub("jar","sources");
+ ArtifactHandler ah = new DefaultArtifactHandlerStub( "jar", "sources" );
VersionRange vr = VersionRange.createFromVersion( "1.1-SNAPSHOT" );
Artifact artifact = new DefaultArtifact( "test", "two", vr, Artifact.SCOPE_PROVIDED, "jar", "sources", ah,
false );
@@ -166,7 +206,7 @@
expectedResult = "two-sources.jar";
assertEquals( expectedResult, name );
- ah = new DefaultArtifactHandlerStub("war",null);
+ ah = new DefaultArtifactHandlerStub( "war", null );
artifact = new DefaultArtifact( "test", "two", vr, Artifact.SCOPE_PROVIDED, "war", "", ah, false );
name = DependencyUtil.getFormattedFileName( artifact, true );
expectedResult = "two.war";
@@ -177,14 +217,16 @@
public void testFileNameClassifierWithFile()
throws MojoExecutionException
{
- //specifically testing the default operation that getFormattedFileName returns
- //the actual name of the file if available unless remove version is set.
- ArtifactHandler ah = new DefaultArtifactHandlerStub("war","sources");
+ // specifically testing the default operation that getFormattedFileName
+ // returns
+ // the actual name of the file if available unless remove version is
+ // set.
+ ArtifactHandler ah = new DefaultArtifactHandlerStub( "war", "sources" );
VersionRange vr = VersionRange.createFromVersion( "1.1-SNAPSHOT" );
Artifact artifact = new DefaultArtifact( "test", "two", vr, Artifact.SCOPE_PROVIDED, "war", "sources", ah,
false );
- File file = new File("/target","test-file-name.jar");
- artifact.setFile(file);
+ File file = new File( "/target", "test-file-name.jar" );
+ artifact.setFile( file );
String name = DependencyUtil.getFormattedFileName( artifact, false );
String expectedResult = "test-file-name.jar";
@@ -199,12 +241,12 @@
expectedResult = "two.war";
assertEquals( expectedResult, name );
- //test that we pickup the correct extension in the file name if set.
- ah = new DefaultArtifactHandlerStub("jar",null);
+ // test that we pickup the correct extension in the file name if set.
+ ah = new DefaultArtifactHandlerStub( "jar", null );
artifact = new DefaultArtifact( "test", "two", vr, Artifact.SCOPE_PROVIDED, "war", "", ah, false );
name = DependencyUtil.getFormattedFileName( artifact, true );
expectedResult = "two.jar";
assertEquals( expectedResult, name );
-
+
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestSilentLog.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestSilentLog.java?view=diff&rev=506840&r1=506839&r2=506840
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestSilentLog.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestSilentLog.java Mon Feb 12 19:28:20 2007
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.dependency.utils;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestDestFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestDestFileFilter.java?view=diff&rev=506840&r1=506839&r2=506840
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestDestFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestDestFileFilter.java Mon Feb 12 19:28:20 2007
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.dependency.utils.filters;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -81,7 +82,7 @@
throws IOException
{
File destFolder = DependencyUtil.getFormattedOutputDirectory( useSubDirectoryPerType,
- useSubDirectoryPerArtifact, outputFolder,
+ useSubDirectoryPerArtifact, false, outputFolder,
artifact );
File destFile = new File( destFolder, DependencyUtil.getFormattedFileName( artifact, removeVersion ) );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestFilterArtifacts.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestFilterArtifacts.java?view=diff&rev=506840&r1=506839&r2=506840
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestFilterArtifacts.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestFilterArtifacts.java Mon Feb 12 19:28:20 2007
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.dependency.utils.filters;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestGroupIdFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestGroupIdFilter.java?view=diff&rev=506840&r1=506839&r2=506840
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestGroupIdFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestGroupIdFilter.java Mon Feb 12 19:28:20 2007
@@ -85,35 +85,35 @@
{
filtering3();
}
-
+
public void testFiltering4()
- throws Exception
+ throws Exception
{
- SilentLog log = new SilentLog();
- // include o* from groupIds one,two should leave one
- Set result = filtering();
- assertTrue(result.size()==2);
- GroupIdFilter filter = new GroupIdFilter("o",null);
- result = filter.filter(result, log);
- Iterator iter = result.iterator();
- while( iter.hasNext() )
- {
- Artifact artifact = (Artifact) iter.next();
- assertTrue(artifact.getGroupId().equals("one"));
-
- }
+ SilentLog log = new SilentLog();
+ // include o* from groupIds one,two should leave one
+ Set result = filtering();
+ assertTrue( result.size() == 2 );
+ GroupIdFilter filter = new GroupIdFilter( "o", null );
+ result = filter.filter( result, log );
+ Iterator iter = result.iterator();
+ while ( iter.hasNext() )
+ {
+ Artifact artifact = (Artifact) iter.next();
+ assertTrue( artifact.getGroupId().equals( "one" ) );
+
+ }
+
+ // exclude on* from groupIds one,two should leave two
+ result = filtering();
+ assertTrue( result.size() == 2 );
+ filter = new GroupIdFilter( null, "on" );
+ result = filter.filter( result, log );
+ iter = result.iterator();
+ while ( iter.hasNext() )
+ {
+ Artifact artifact = (Artifact) iter.next();
+ assertTrue( artifact.getGroupId().equals( "two" ) );
- // exclude on* from groupIds one,two should leave two
- result = filtering();
- assertTrue(result.size()==2);
- filter = new GroupIdFilter(null,"on");
- result = filter.filter(result, log);
- iter = result.iterator();
- while( iter.hasNext() )
- {
- Artifact artifact = (Artifact) iter.next();
- assertTrue(artifact.getGroupId().equals("two"));
-
- }
+ }
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java?view=diff&rev=506840&r1=506839&r2=506840
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java Mon Feb 12 19:28:20 2007
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.dependency.utils.filters;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestResolveMarkerFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestResolveMarkerFileFilter.java?view=diff&rev=506840&r1=506839&r2=506840
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestResolveMarkerFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestResolveMarkerFileFilter.java Mon Feb 12 19:28:20 2007
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.dependency.utils.filters;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestScopeFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestScopeFilter.java?view=diff&rev=506840&r1=506839&r2=506840
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestScopeFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestScopeFilter.java Mon Feb 12 19:28:20 2007
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.dependency.utils.filters;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -133,10 +134,10 @@
{
ScopeFilter filter = new ScopeFilter( "", Artifact.SCOPE_PROVIDED );
Set result = filter.filter( artifacts, log );
- assertNotNull(result);
+ assertNotNull( result );
assertTrue( result.size() > 0 );
Iterator iter = result.iterator();
- assertNotNull(result);
+ assertNotNull( result );
assertTrue( result.size() > 0 );
while ( iter.hasNext() )
{
@@ -151,7 +152,7 @@
ScopeFilter filter = new ScopeFilter( "", Artifact.SCOPE_SYSTEM );
Set result = filter.filter( artifacts, log );
Iterator iter = result.iterator();
- assertNotNull(result);
+ assertNotNull( result );
assertTrue( result.size() > 0 );
while ( iter.hasNext() )
{
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestTransitivityFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestTransitivityFilter.java?view=diff&rev=506840&r1=506839&r2=506840
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestTransitivityFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestTransitivityFilter.java Mon Feb 12 19:28:20 2007
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.dependency.utils.filters;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestTypeFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestTypeFilter.java?view=diff&rev=506840&r1=506839&r2=506840
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestTypeFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestTypeFilter.java Mon Feb 12 19:28:20 2007
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.dependency.utils.filters;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestDefaultMarkerFileHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestDefaultMarkerFileHandler.java?view=diff&rev=506840&r1=506839&r2=506840
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestDefaultMarkerFileHandler.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestDefaultMarkerFileHandler.java Mon Feb 12 19:28:20 2007
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.dependency.utils.markers;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -176,16 +177,18 @@
handler.setMarkerFilesDirectory( outputFolder );
assertSame( outputFolder, handler.getMarkerFilesDirectory() );
}
-
- public void testNullParent() throws MojoExecutionException
+
+ public void testNullParent()
+ throws MojoExecutionException
{
- //the parent isn't set so this will create the marker in the local folder. We must clear the
- //marker to avoid leaving test droppings in root.
- DefaultFileMarkerHandler handler = new DefaultFileMarkerHandler(null,null);
+ // the parent isn't set so this will create the marker in the local
+ // folder. We must clear the
+ // marker to avoid leaving test droppings in root.
+ DefaultFileMarkerHandler handler = new DefaultFileMarkerHandler( null, null );
handler.setArtifact( (Artifact) artifacts.get( 0 ) );
handler.setMarker();
- assertTrue(handler.isMarkerSet());
+ assertTrue( handler.isMarkerSet() );
handler.clearMarker();
- assertFalse(handler.isMarkerSet());
+ assertFalse( handler.isMarkerSet() );
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/translators/TestClassifierTypeTranslator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/translators/TestClassifierTypeTranslator.java?view=diff&rev=506840&r1=506839&r2=506840
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/translators/TestClassifierTypeTranslator.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/translators/TestClassifierTypeTranslator.java Mon Feb 12 19:28:20 2007
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.dependency.utils.translators;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file