Author: brianf
Date: Mon Oct 9 20:17:43 2006
New Revision: 454592
URL: http://svn.apache.org/viewvc?view=rev&rev=454592
Log:
more tests
Added:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestDestFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestResolveMarkerFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/unpack-dependencies-test/
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/unpack-dependencies-test/plugin-config.xml
(with props)
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/AbstractDependencyMojoTestCase.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestResolveMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestDefaultMarkerFileHandler.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestSourcesMarkerFileHandler.java
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/copy-dependencies-test/plugin-config.xml
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java?view=diff&rev=454592&r1=454591&r2=454592
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
Mon Oct 9 20:17:43 2006
@@ -56,7 +56,7 @@
public void execute()
throws MojoExecutionException
{
- Set artifacts = getDependencies(true);
+ Set artifacts = getDependencies( true );
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
@@ -64,8 +64,9 @@
File destDir = DependencyUtil.getFormattedOutputDirectory(
this.useSubDirectoryPerType,
this.useSubDirectoryPerArtifact,
this.outputDirectory, artifact );
-// force overwrite for now. The filters should have removed anything
from the list that shouldn't
- //be overwritten.
+ // force overwrite for now. The filters should have removed
anything
+ // from the list that shouldn't
+ // be overwritten.
DependencyUtil.unpackFile( artifact, destDir,
this.markersDirectory, this.archiverManager, this.getLog(),
true );
}
@@ -73,6 +74,7 @@
protected ArtifactsFilter getMarkedArtifactFilter()
{
- return new
MarkerFileFilter(this.overWriteReleases,this.overWriteSnapshots,this.overWriteIfNewer,new
DefaultFileMarkerHandler(this.markersDirectory));
+ return new MarkerFileFilter( this.overWriteReleases,
this.overWriteSnapshots, this.overWriteIfNewer,
+ new DefaultFileMarkerHandler(
this.markersDirectory ) );
}
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java?view=diff&rev=454592&r1=454591&r2=454592
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
Mon Oct 9 20:17:43 2006
@@ -52,7 +52,7 @@
throws MojoExecutionException
{
// get sets of dependencies
- results = this.getDependencySets(false);
+ results = this.getDependencySets( false );
results.logStatus( getLog(), outputArtifactFilename );
}
@@ -67,6 +67,6 @@
protected ArtifactsFilter getMarkedArtifactFilter()
{
- return new ResolveFileFilter(new
SourcesFileMarkerHandler(this.markersDirectory));
+ return new ResolveFileFilter( new SourcesFileMarkerHandler(
this.markersDirectory ) );
}
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java?view=diff&rev=454592&r1=454591&r2=454592
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
Mon Oct 9 20:17:43 2006
@@ -50,6 +50,16 @@
File outputFileDirectory;
+ public DestFileFilter (File outputFileDirectory)
+ {
+ this.outputFileDirectory = outputFileDirectory;
+ overWriteReleases = false;
+ overWriteIfNewer = false;
+ overWriteSnapshots = false;
+ useSubDirectoryPerArtifact = false;
+ useSubDirectoryPerType = false;
+ removeVersion = false;
+ }
public DestFileFilter( boolean overWriteReleases, boolean
overWriteSnapshots, boolean overWriteIfNewer,
boolean useSubDirectoryPerArtifact, boolean
useSubDirectoryPerType, boolean removeVersion,
File outputFileDirectory )
@@ -79,7 +89,7 @@
while ( iter.hasNext() )
{
Artifact artifact = (Artifact) iter.next();
- if ( okToCopy( artifact ) )
+ if ( okToProcess( artifact ) )
{
result.add( artifact );
}
@@ -87,7 +97,7 @@
return result;
}
- public boolean okToCopy( Artifact artifact )
+ public boolean okToProcess( Artifact artifact )
throws MojoExecutionException
{
boolean overWrite = false;
@@ -162,5 +172,61 @@
public void setOverWriteIfNewer( boolean overWriteIfNewer )
{
this.overWriteIfNewer = overWriteIfNewer;
+ }
+ /**
+ * @return Returns the outputFileDirectory.
+ */
+ public File getOutputFileDirectory()
+ {
+ return this.outputFileDirectory;
+ }
+ /**
+ * @param outputFileDirectory The outputFileDirectory to set.
+ */
+ public void setOutputFileDirectory( File outputFileDirectory )
+ {
+ this.outputFileDirectory = outputFileDirectory;
+ }
+ /**
+ * @return Returns the removeVersion.
+ */
+ public boolean isRemoveVersion()
+ {
+ return this.removeVersion;
+ }
+ /**
+ * @param removeVersion The removeVersion to set.
+ */
+ public void setRemoveVersion( boolean removeVersion )
+ {
+ this.removeVersion = removeVersion;
+ }
+ /**
+ * @return Returns the useSubDirectoryPerArtifact.
+ */
+ public boolean isUseSubDirectoryPerArtifact()
+ {
+ return this.useSubDirectoryPerArtifact;
+ }
+ /**
+ * @param useSubDirectoryPerArtifact The useSubDirectoryPerArtifact to set.
+ */
+ public void setUseSubDirectoryPerArtifact( boolean
useSubDirectoryPerArtifact )
+ {
+ this.useSubDirectoryPerArtifact = useSubDirectoryPerArtifact;
+ }
+ /**
+ * @return Returns the useSubDirectoryPerType.
+ */
+ public boolean isUseSubDirectoryPerType()
+ {
+ return this.useSubDirectoryPerType;
+ }
+ /**
+ * @param useSubDirectoryPerType The useSubDirectoryPerType to set.
+ */
+ public void setUseSubDirectoryPerType( boolean useSubDirectoryPerType )
+ {
+ this.useSubDirectoryPerType = useSubDirectoryPerType;
}
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/AbstractDependencyMojoTestCase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/AbstractDependencyMojoTestCase.java?view=diff&rev=454592&r1=454591&r2=454592
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/AbstractDependencyMojoTestCase.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/AbstractDependencyMojoTestCase.java
Mon Oct 9 20:17:43 2006
@@ -5,6 +5,7 @@
import org.apache.maven.plugin.dependency.utils.ArtifactStubFactory;
import org.apache.maven.plugin.dependency.utils.DependencyTestUtils;
+import org.apache.maven.plugin.dependency.utils.DependencyUtil;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
public class AbstractDependencyMojoTestCase
@@ -27,7 +28,7 @@
super.setUp();
testDir = new File( getBasedir(), "target" + File.separatorChar +
"unit-tests" + File.separatorChar
+ testDirStr + File.separatorChar );
- testDir.delete();
+ DependencyTestUtils.removeDirectory(testDir);
assertFalse( testDir.exists() );
stubFactory = new ArtifactStubFactory( this.testDir, createFiles );
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java?view=diff&rev=454592&r1=454591&r2=454592
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java
Mon Oct 9 20:17:43 2006
@@ -452,7 +452,7 @@
File copiedFile = new File( mojo.outputDirectory,
DependencyUtil.getFormattedFileName( release, false ) );
- Thread.sleep( 100);
+ Thread.sleep( 100 );
long time = System.currentTimeMillis();
copiedFile.setLastModified( time );
Thread.sleep( 100 );
@@ -552,5 +552,10 @@
mojo.execute();
assertTrue( time < copiedFile.lastModified() );
+ }
+
+ public void testGetDependencies() throws MojoExecutionException
+ {
+
assertEquals(mojo.getDependencies(true).toString(),mojo.getDependencySets(true).getResolvedDependencies().toString());
}
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestResolveMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestResolveMojo.java?view=diff&rev=454592&r1=454591&r2=454592
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestResolveMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestResolveMojo.java
Mon Oct 9 20:17:43 2006
@@ -5,6 +5,7 @@
import org.apache.maven.plugin.dependency.resolvers.ResolveDependenciesMojo;
import org.apache.maven.plugin.dependency.utils.DependencyStatusSets;
+import org.apache.maven.plugin.dependency.utils.SilentLog;
import org.apache.maven.project.MavenProject;
public class TestResolveMojo
@@ -28,11 +29,10 @@
{
File testPom = new File( getBasedir(),
"target/test-classes/unit/resolve-test/plugin-config.xml" );
ResolveDependenciesMojo mojo = (ResolveDependenciesMojo) lookupMojo(
"resolve", testPom );
- mojo.silent = false;
assertNotNull( mojo );
assertNotNull( mojo.project );
MavenProject project = mojo.project;
-
+ mojo.silent = true;
Set artifacts = this.stubFactory.getScopedArtifacts();
Set directArtifacts =
this.stubFactory.getReleaseAndSnapshotArtifacts();
artifacts.addAll( directArtifacts );
@@ -52,6 +52,14 @@
assertNotNull( results );
assertEquals( directArtifacts.size(),
results.getResolvedDependencies().size() );
}
-
- //TODO: Test skipping artifacts.
+
+ public void testSilent()
+ throws Exception
+ {
+ File testPom = new File( getBasedir(),
"target/test-classes/unit/resolve-test/plugin-config.xml" );
+ ResolveDependenciesMojo mojo = (ResolveDependenciesMojo) lookupMojo(
"resolve", testPom );
+ mojo.silent = false;
+
+ assertFalse( mojo.getLog() instanceof SilentLog );
+ } // TODO: Test skipping artifacts.
}
Added:
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=auto&rev=454592
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestDestFileFilter.java
(added)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestDestFileFilter.java
Mon Oct 9 20:17:43 2006
@@ -0,0 +1,221 @@
+/*
+ * Copyright 2005-2006 Brian Fox ([EMAIL PROTECTED])
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ *
+ */
+package org.apache.maven.plugin.dependency.utils.filters;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.dependency.utils.ArtifactStubFactory;
+import org.apache.maven.plugin.dependency.utils.DependencyTestUtils;
+import org.apache.maven.plugin.dependency.utils.DependencyUtil;
+import org.apache.maven.plugin.dependency.utils.SilentLog;
+import org.apache.maven.plugin.logging.Log;
+
+/**
+ * @author brianf
+ *
+ */
+public class TestDestFileFilter
+ extends TestCase
+{
+ Set artifacts = new HashSet();
+
+ Log log = new SilentLog();
+
+ File outputFolder;
+
+ ArtifactStubFactory fact;
+
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+
+ outputFolder = new File( "target/markers/" );
+ DependencyTestUtils.removeDirectory( outputFolder );
+ assertFalse( outputFolder.exists() );
+
+ this.fact = new ArtifactStubFactory( outputFolder, false );
+ artifacts = fact.getReleaseAndSnapshotArtifacts();
+ }
+
+ protected void tearDown()
+ throws IOException
+ {
+ DependencyTestUtils.removeDirectory( outputFolder );
+ }
+
+ public File createFile( Artifact artifact )
+ throws IOException
+ {
+ return createFile( artifact, false, false, false );
+ }
+
+ public File createFile( Artifact artifact, boolean
useSubDirectoryPerArtifact, boolean useSubDirectoryPerType,
+ boolean removeVersion )
+ throws IOException
+ {
+ File destFolder = DependencyUtil.getFormattedOutputDirectory(
useSubDirectoryPerType,
+
useSubDirectoryPerArtifact, outputFolder,
+ artifact
);
+ File destFile = new File( destFolder,
DependencyUtil.getFormattedFileName( artifact, removeVersion ) );
+
+ destFile.getParentFile().mkdirs();
+ assertTrue( destFile.createNewFile() );
+ return destFile;
+ }
+
+ public void testDestFileRelease()
+ throws MojoExecutionException, IOException
+ {
+ DestFileFilter filter = new DestFileFilter( outputFolder );
+ Artifact artifact = fact.getReleaseArtifact();
+
+ assertTrue( filter.okToProcess( artifact ) );
+ createFile( artifact );
+ assertFalse( filter.okToProcess( artifact ) );
+
+ filter.overWriteReleases = true;
+ assertTrue( filter.okToProcess( artifact ) );
+ }
+
+ public void testDestFileSnapshot()
+ throws MojoExecutionException, IOException
+ {
+ DestFileFilter filter = new DestFileFilter( outputFolder );
+ Artifact artifact = fact.getSnapshotArtifact();
+
+ assertTrue( filter.okToProcess( artifact ) );
+ createFile( artifact );
+ assertFalse( filter.okToProcess( artifact ) );
+
+ filter.overWriteSnapshots = true;
+ assertTrue( filter.okToProcess( artifact ) );
+ }
+
+ public void testDestFileStripVersion()
+ throws MojoExecutionException, IOException
+ {
+ DestFileFilter filter = new DestFileFilter( outputFolder );
+ Artifact artifact = fact.getSnapshotArtifact();
+ filter.removeVersion = true;
+
+ assertTrue( filter.okToProcess( artifact ) );
+ createFile( artifact, false, false, true );
+ assertFalse( filter.okToProcess( artifact ) );
+
+ filter.overWriteSnapshots = true;
+ assertTrue( filter.okToProcess( artifact ) );
+ }
+
+ public void testDestFileSubPerArtifact()
+ throws MojoExecutionException, IOException
+ {
+ DestFileFilter filter = new DestFileFilter( outputFolder );
+ Artifact artifact = fact.getSnapshotArtifact();
+ filter.useSubDirectoryPerArtifact = true;
+
+ assertTrue( filter.okToProcess( artifact ) );
+ createFile( artifact, true, false, false );
+ assertFalse( filter.okToProcess( artifact ) );
+
+ filter.overWriteSnapshots = true;
+ assertTrue( filter.okToProcess( artifact ) );
+ }
+
+ public void testDestFileSubPerType()
+ throws MojoExecutionException, IOException
+ {
+ DestFileFilter filter = new DestFileFilter( outputFolder );
+ Artifact artifact = fact.getSnapshotArtifact();
+ filter.useSubDirectoryPerType = true;
+
+ assertTrue( filter.okToProcess( artifact ) );
+ createFile( artifact, false, true, false );
+ assertFalse( filter.okToProcess( artifact ) );
+
+ filter.overWriteSnapshots = true;
+ assertTrue( filter.okToProcess( artifact ) );
+ }
+
+ public void testDestFileOverwriteIfNewer()
+ throws MojoExecutionException, IOException
+ {
+ DestFileFilter filter = new DestFileFilter( outputFolder );
+
+ fact.setCreateFiles( true );
+ Artifact artifact = fact.getSnapshotArtifact();
+ File artifactFile = artifact.getFile();
+ artifactFile.setLastModified( artifactFile.lastModified() - 1000 );
+ filter.overWriteIfNewer = true;
+
+ assertTrue( filter.okToProcess( artifact ) );
+
+ File destFile = createFile( artifact, false, false, false );
+ assertTrue( filter.okToProcess( artifact ) );
+
+ destFile.setLastModified( destFile.lastModified() - 2000 );
+
+ assertFalse( filter.okToProcess( artifact ) );
+ }
+
+ public void testGettersSetters()
+ {
+ DestFileFilter filter = new DestFileFilter( null );
+ assertTrue( filter.getOutputFileDirectory() == null );
+ filter.setOutputFileDirectory( outputFolder );
+ assertSame( outputFolder, filter.getOutputFileDirectory() );
+
+ filter.setOverWriteIfNewer( true );
+ assertTrue( filter.isOverWriteIfNewer() );
+ filter.setOverWriteIfNewer( false );
+ assertFalse( filter.isOverWriteIfNewer() );
+
+ filter.setOverWriteReleases( true );
+ assertTrue( filter.isOverWriteReleases() );
+ filter.setOverWriteReleases( false );
+ assertFalse( filter.isOverWriteReleases() );
+
+ filter.setOverWriteSnapshots( true );
+ assertTrue( filter.isOverWriteSnapshots() );
+ filter.setOverWriteSnapshots( false );
+ assertFalse( filter.isOverWriteSnapshots() );
+
+ filter.setUseSubDirectoryPerArtifact( true );
+ assertTrue( filter.isUseSubDirectoryPerArtifact() );
+ filter.setUseSubDirectoryPerArtifact( false );
+ assertFalse( filter.isUseSubDirectoryPerArtifact() );
+
+ filter.setUseSubDirectoryPerType( true );
+ assertTrue( filter.isUseSubDirectoryPerType() );
+ filter.setUseSubDirectoryPerType( false );
+ assertFalse( filter.isUseSubDirectoryPerType() );
+
+ filter.setRemoveVersion( true );
+ assertTrue( filter.isRemoveVersion() );
+ filter.setRemoveVersion( false );
+ assertFalse( filter.isRemoveVersion() );
+ }
+}
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=454592&r1=454591&r2=454592
==============================================================================
---
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 Oct 9 20:17:43 2006
@@ -21,7 +21,6 @@
import java.io.File;
import java.io.IOException;
import java.util.HashSet;
-import java.util.Random;
import java.util.Set;
import junit.framework.TestCase;
@@ -54,9 +53,7 @@
{
super.setUp();
- // pick random output location
- Random a = new Random();
- outputFolder = new File( "target/markers" + a.nextLong() + "/" );
+ outputFolder = new File( "target/markers/" );
DependencyTestUtils.removeDirectory( outputFolder );
assertFalse( outputFolder.exists() );
@@ -64,9 +61,9 @@
artifacts = fact.getReleaseAndSnapshotArtifacts();
}
- protected void tearDown()
+ protected void tearDown() throws IOException
{
-
+ DependencyTestUtils.removeDirectory( outputFolder );
}
public void testMarkerFile()
Added:
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=auto&rev=454592
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestResolveMarkerFileFilter.java
(added)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestResolveMarkerFileFilter.java
Mon Oct 9 20:17:43 2006
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2005-2006 Brian Fox ([EMAIL PROTECTED])
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ *
+ */
+package org.apache.maven.plugin.dependency.utils.filters;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.dependency.utils.ArtifactStubFactory;
+import org.apache.maven.plugin.dependency.utils.DependencyTestUtils;
+import org.apache.maven.plugin.dependency.utils.SilentLog;
+import
org.apache.maven.plugin.dependency.utils.markers.SourcesFileMarkerHandler;
+import org.apache.maven.plugin.logging.Log;
+
+/**
+ * @author brianf
+ *
+ */
+public class TestResolveMarkerFileFilter
+ extends TestCase
+{
+ Set artifacts = new HashSet();
+
+ Log log = new SilentLog();
+
+ File outputFolder;
+
+ ArtifactStubFactory fact;
+
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+
+ outputFolder = new File( "target/markers/" );
+ DependencyTestUtils.removeDirectory( outputFolder );
+ assertFalse( outputFolder.exists() );
+
+ this.fact = new ArtifactStubFactory( outputFolder, false );
+ artifacts = fact.getReleaseAndSnapshotArtifacts();
+ }
+
+ protected void tearDown() throws IOException
+ {
+ DependencyTestUtils.removeDirectory( outputFolder );
+ }
+
+ public void testResolveFile()
+ throws MojoExecutionException
+ {
+ SourcesFileMarkerHandler handler = new SourcesFileMarkerHandler(
outputFolder );
+ ResolveFileFilter filter = new ResolveFileFilter( handler );
+
+ handler = new SourcesFileMarkerHandler( outputFolder );
+
+ Artifact artifact = fact.getReleaseArtifact();
+ handler.setArtifact( artifact );
+
+ assertTrue( filter.okToProcess( artifact ) );
+ handler.setMarker();
+ assertFalse( filter.okToProcess( artifact ) );
+ }
+
+}
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=454592&r1=454591&r2=454592
==============================================================================
---
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 Oct 9 20:17:43 2006
@@ -66,7 +66,7 @@
artifacts.add( artifact );
outputFolder = new File( "target/markers/" );
- outputFolder.delete();
+ DependencyTestUtils.removeDirectory( this.outputFolder );
assertFalse( outputFolder.exists() );
}
@@ -160,5 +160,17 @@
{
}
+ }
+
+ public void testGetterSetter()
+ {
+ DefaultFileMarkerHandler handler = new DefaultFileMarkerHandler( null,
null );
+ assertTrue( handler.getArtifact() == null );
+ handler.setArtifact( (Artifact) artifacts.get( 0 ) );
+ assertSame( artifacts.get( 0 ), handler.getArtifact() );
+
+ assertTrue( handler.getMarkerFilesDirectory() == null );
+ handler.setMarkerFilesDirectory( outputFolder );
+ assertSame( outputFolder, handler.getMarkerFilesDirectory() );
}
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestSourcesMarkerFileHandler.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestSourcesMarkerFileHandler.java?view=diff&rev=454592&r1=454591&r2=454592
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestSourcesMarkerFileHandler.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestSourcesMarkerFileHandler.java
Mon Oct 9 20:17:43 2006
@@ -260,4 +260,12 @@
{
}
}
+
+ public void testMarkerFileResolvedSetter()
+ {
+ SourcesFileMarkerHandler handler = new
SourcesFileMarkerHandler(null,null,true);
+ assertTrue(handler.isResolved());
+ handler.setResolved(false);
+ assertFalse(handler.isResolved());
+ }
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/copy-dependencies-test/plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/copy-dependencies-test/plugin-config.xml?view=diff&rev=454592&r1=454591&r2=454592
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/copy-dependencies-test/plugin-config.xml
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/copy-dependencies-test/plugin-config.xml
Mon Oct 9 20:17:43 2006
@@ -10,11 +10,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0.4</version>
- </dependency>
- </dependencies>
</project>
Added:
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/unpack-dependencies-test/plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/unpack-dependencies-test/plugin-config.xml?view=auto&rev=454592
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/unpack-dependencies-test/plugin-config.xml
(added)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/unpack-dependencies-test/plugin-config.xml
Mon Oct 9 20:17:43 2006
@@ -0,0 +1,13 @@
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <project
implementation="org.apache.maven.plugin.dependency.stubs.DependencyProjectStub"/>
+ <silent>true</silent>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/unpack-dependencies-test/plugin-config.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
