You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2017/09/09 10:36:01 UTC
svn commit: r1807877 [4/4] - in
/maven/plugins/trunk/maven-dependency-plugin/src:
main/java/org/apache/maven/plugins/dependency/
main/java/org/apache/maven/plugins/dependency/analyze/
main/java/org/apache/maven/plugins/dependency/fromConfiguration/ mai...
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DependencyProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DependencyProjectStub.java?rev=1807877&r1=1807876&r2=1807877&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DependencyProjectStub.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DependencyProjectStub.java Sat Sep 9 10:35:59 2017
@@ -60,8 +60,7 @@ import org.codehaus.plexus.PlexusTestCas
import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
- * very simple stub of maven project, going to take a lot of work to make it
- * useful as a stub though
+ * very simple stub of maven project, going to take a lot of work to make it useful as a stub though
*/
public class DependencyProjectStub
extends MavenProject
@@ -157,7 +156,7 @@ public class DependencyProjectStub
private String defaultGoal;
private Set artifacts;
-
+
private Properties properties;
public DependencyProjectStub()
@@ -192,7 +191,8 @@ public class DependencyProjectStub
ArtifactHandler ah = new DefaultArtifactHandlerStub( "jar", null );
VersionRange vr = VersionRange.createFromVersion( "1.0" );
- Artifact art = new DefaultArtifact( "group", "artifact", vr, Artifact.SCOPE_COMPILE, "jar", null, ah, false );
+ Artifact art =
+ new DefaultArtifact( "group", "artifact", vr, Artifact.SCOPE_COMPILE, "jar", null, ah, false );
setArtifact( art );
}
return artifact;
@@ -262,10 +262,11 @@ public class DependencyProjectStub
return dependencies;
}
- public void setDependencyManagement(DependencyManagement depMgt)
+ public void setDependencyManagement( DependencyManagement depMgt )
{
this.dependencyManagement = depMgt;
}
+
public DependencyManagement getDependencyManagement()
{
if ( dependencyManagement == null )
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DuplicateDependencies2ProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DuplicateDependencies2ProjectStub.java?rev=1807877&r1=1807876&r2=1807877&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DuplicateDependencies2ProjectStub.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DuplicateDependencies2ProjectStub.java Sat Sep 9 10:35:59 2017
@@ -27,8 +27,7 @@ import org.apache.maven.model.io.xpp3.Ma
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
/**
- * very simple stub of maven project, going to take a lot of work to make it
- * useful as a stub though
+ * very simple stub of maven project, going to take a lot of work to make it useful as a stub though
*/
public class DuplicateDependencies2ProjectStub
extends MavenProjectStub
@@ -58,7 +57,6 @@ public class DuplicateDependencies2Proje
setFile( pom );
}
-
/**
* @see org.apache.maven.plugin.testing.stubs.MavenProjectStub#getBasedir()
*/
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DuplicateDependenciesProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DuplicateDependenciesProjectStub.java?rev=1807877&r1=1807876&r2=1807877&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DuplicateDependenciesProjectStub.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DuplicateDependenciesProjectStub.java Sat Sep 9 10:35:59 2017
@@ -27,8 +27,7 @@ import org.apache.maven.model.io.xpp3.Ma
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
/**
- * very simple stub of maven project, going to take a lot of work to make it
- * useful as a stub though
+ * very simple stub of maven project, going to take a lot of work to make it useful as a stub though
*/
public class DuplicateDependenciesProjectStub
extends MavenProjectStub
@@ -58,7 +57,6 @@ public class DuplicateDependenciesProjec
setFile( pom );
}
-
/**
* @see org.apache.maven.plugin.testing.stubs.MavenProjectStub#getBasedir()
*/
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/StubUnpackFileMarkerHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/StubUnpackFileMarkerHandler.java?rev=1807877&r1=1807876&r2=1807877&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/StubUnpackFileMarkerHandler.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/StubUnpackFileMarkerHandler.java Sat Sep 9 10:35:59 2017
@@ -26,39 +26,40 @@ import org.apache.maven.plugins.dependen
import org.codehaus.plexus.util.StringUtils;
public class StubUnpackFileMarkerHandler
- extends UnpackFileMarkerHandler
+ extends UnpackFileMarkerHandler
{
- public StubUnpackFileMarkerHandler( ArtifactItem artifactItem, File markerFilesDirectory )
+ public StubUnpackFileMarkerHandler( ArtifactItem artifactItem, File markerFilesDirectory )
{
super( artifactItem, markerFilesDirectory );
}
-
- protected File getMarkerFile()
+
+ protected File getMarkerFile()
{
- File markerFile;
- if ( this.artifactItem == null
- || ( StringUtils.isEmpty( this.artifactItem.getIncludes() )
- && StringUtils.isEmpty( this.artifactItem.getExcludes() ) ) )
- {
- markerFile = new StubMarkerFile( this.markerFilesDirectory, this.artifact.getId().replace( ':', '-' ) + ".marker" );
- }
- else
- {
- int includeExcludeHash = 0;
-
- if ( StringUtils.isNotEmpty( this.artifactItem.getIncludes() ) )
- {
- includeExcludeHash += this.artifactItem.getIncludes().hashCode();
- }
-
- if ( StringUtils.isNotEmpty( this.artifactItem.getExcludes() ) )
- {
- includeExcludeHash += this.artifactItem.getExcludes().hashCode();
- }
-
- markerFile = new StubMarkerFile( this.markerFilesDirectory, this.artifact.getId().replace( ':', '-' ) + includeExcludeHash );
- }
-
- return markerFile;
+ File markerFile;
+ if ( this.artifactItem == null || ( StringUtils.isEmpty( this.artifactItem.getIncludes() )
+ && StringUtils.isEmpty( this.artifactItem.getExcludes() ) ) )
+ {
+ markerFile =
+ new StubMarkerFile( this.markerFilesDirectory, this.artifact.getId().replace( ':', '-' ) + ".marker" );
+ }
+ else
+ {
+ int includeExcludeHash = 0;
+
+ if ( StringUtils.isNotEmpty( this.artifactItem.getIncludes() ) )
+ {
+ includeExcludeHash += this.artifactItem.getIncludes().hashCode();
+ }
+
+ if ( StringUtils.isNotEmpty( this.artifactItem.getExcludes() ) )
+ {
+ includeExcludeHash += this.artifactItem.getExcludes().hashCode();
+ }
+
+ markerFile = new StubMarkerFile( this.markerFilesDirectory,
+ this.artifact.getId().replace( ':', '-' ) + includeExcludeHash );
+ }
+
+ return markerFile;
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java?rev=1807877&r1=1807876&r2=1807877&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java Sat Sep 9 10:35:59 2017
@@ -64,7 +64,7 @@ public class TestTreeMojo
/**
* Tests the proper discovery and configuration of the mojo.
*
- * @throws Exception
+ * @throws Exception in case of an error.
*/
public void _testTreeTestEnvironment()
throws Exception
@@ -96,7 +96,7 @@ public class TestTreeMojo
/**
* Test the DOT format serialization
*
- * @throws Exception
+ * @throws Exception in case of an error.
*/
public void _testTreeDotSerializing()
throws Exception
@@ -111,8 +111,8 @@ public class TestTreeMojo
/**
* Test the GraphML format serialization
- *
- * @throws Exception
+ *
+ * @throws Exception in case of an error.
*/
public void _testTreeGraphMLSerializing()
throws Exception
@@ -121,7 +121,8 @@ public class TestTreeMojo
assertTrue( findString( contents, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" ) );
assertTrue( findString( contents, "<y:NodeLabel>testGroupId:project:jar:1.0:compile</y:NodeLabel>" ) );
- assertTrue( findString( contents, "<y:NodeLabel>testGroupId:snapshot:jar:2.0-SNAPSHOT:compile</y:NodeLabel>" ) );
+ assertTrue( findString( contents,
+ "<y:NodeLabel>testGroupId:snapshot:jar:2.0-SNAPSHOT:compile</y:NodeLabel>" ) );
assertTrue( findString( contents, "<y:NodeLabel>testGroupId:release:jar:1.0:compile</y:NodeLabel>" ) );
assertTrue( findString( contents, "<key for=\"node\" id=\"d0\" yfiles.type=\"nodegraphics\"/>" ) );
assertTrue( findString( contents, "<key for=\"edge\" id=\"d1\" yfiles.type=\"edgegraphics\"/>" ) );
@@ -129,8 +130,8 @@ public class TestTreeMojo
/**
* Test the TGF format serialization
- *
- * @throws Exception
+ *
+ * @throws Exception in case of an error.
*/
public void _testTreeTGFSerializing()
throws Exception
@@ -143,12 +144,14 @@ public class TestTreeMojo
/**
* Help finding content in the given list of string
- * @param outputFile
- * @param format
+ *
+ * @param outputFile the outputFile.
+ * @param format The format.
+ * @throws Exception in case of an error.
* @return list of strings in the output file
*/
private List<String> runTreeMojo( String outputFile, String format )
- throws Exception
+ throws Exception
{
File testPom = new File( getBasedir(), "target/test-classes/unit/tree-test/plugin-config.xml" );
String outputFileName = testDir.getAbsolutePath() + outputFile;
@@ -180,19 +183,20 @@ public class TestTreeMojo
}
fp1.close();
- return contents ;
+ return contents;
}
/**
* Help finding content in the given list of string
- * @param contents
- * @param str
+ *
+ * @param contents The contents.
+ * @param str The content which should be checked for.
*/
private boolean findString( List<String> contents, String str )
{
for ( String line : contents )
{
- if (line.contains(str))
+ if ( line.contains( str ) )
{
// if match then return here
return true;
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyStatusSets.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyStatusSets.java?rev=1807877&r1=1807876&r2=1807877&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyStatusSets.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyStatusSets.java Sat Sep 9 10:35:59 2017
@@ -39,8 +39,8 @@ public class TestDependencyStatusSets
* set ); assertSame( set, dss.getResolvedDependencies() ); set = new HashSet(); dss.setUnResolvedDependencies(
* set ); assertSame( set, dss.getUnResolvedDependencies() ); set = new HashSet(); dss.setSkippedDependencies(
* set ); assertSame( set, dss.getSkippedDependencies() ); assertNotSame( dss.getResolvedDependencies(),
- * dss.getSkippedDependencies() ); assertNotSame( dss.getResolvedDependencies(), dss.getUnResolvedDependencies() );
- * assertNotSame( dss.getSkippedDependencies(), dss.getUnResolvedDependencies() );
+ * dss.getSkippedDependencies() ); assertNotSame( dss.getResolvedDependencies(), dss.getUnResolvedDependencies()
+ * ); assertNotSame( dss.getSkippedDependencies(), dss.getUnResolvedDependencies() );
*/
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyUtil.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyUtil.java?rev=1807877&r1=1807876&r2=1807877&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyUtil.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyUtil.java Sat Sep 9 10:35:59 2017
@@ -38,7 +38,6 @@ import org.codehaus.plexus.util.StringUt
/**
* @author brianf
- *
*/
public class TestDependencyUtil
extends TestCase
@@ -74,7 +73,8 @@ public class TestDependencyUtil
ah = new DefaultArtifactHandlerStub( "war", null );
vr = VersionRange.createFromVersion( "1.1-SNAPSHOT" );
- snapResolvedVersion = new DefaultArtifact( "test", "three", vr, Artifact.SCOPE_PROVIDED, "war", null, ah, false );
+ snapResolvedVersion =
+ new DefaultArtifact( "test", "three", vr, Artifact.SCOPE_PROVIDED, "war", null, ah, false );
snapResolvedVersion.setResolvedVersion( "1.1-20121003.035531-117" );
artifacts.add( snapResolvedVersion );
@@ -108,13 +108,13 @@ public class TestDependencyUtil
+ File.separatorChar + "1.1";
assertTrue( expectedResult.equalsIgnoreCase( name.getAbsolutePath() ) );
- name = DependencyUtil.getFormattedOutputDirectory( false, true, false, false, false, folder, artifact );
+ name = DependencyUtil.getFormattedOutputDirectory( false, true, false, false, false, folder, artifact );
expectedResult = folder.getAbsolutePath() + File.separatorChar + "jars";
assertTrue( expectedResult.equalsIgnoreCase( name.getAbsolutePath() ) );
- name = DependencyUtil.getFormattedOutputDirectory( true, false, false, false, false, folder, artifact );
+ name = DependencyUtil.getFormattedOutputDirectory( true, false, false, false, false, folder, artifact );
expectedResult = folder.getAbsolutePath() + File.separatorChar + "compile";
- assertEquals( expectedResult, name.getAbsolutePath() );
+ assertEquals( expectedResult, name.getAbsolutePath() );
assertTrue( expectedResult.equalsIgnoreCase( name.getAbsolutePath() ) );
name = DependencyUtil.getFormattedOutputDirectory( false, false, true, false, false, folder, artifact );
@@ -126,18 +126,18 @@ public class TestDependencyUtil
assertEquals( expectedResult, name.getAbsolutePath() );
name = DependencyUtil.getFormattedOutputDirectory( false, true, true, false, false, folder, artifact );
- expectedResult = folder.getAbsolutePath() + File.separatorChar + "jars" + File.separatorChar
- + "one-1.1-sources-jar";
+ expectedResult =
+ folder.getAbsolutePath() + File.separatorChar + "jars" + File.separatorChar + "one-1.1-sources-jar";
assertEquals( expectedResult, name.getAbsolutePath() );
name = DependencyUtil.getFormattedOutputDirectory( false, true, true, false, true, folder, artifact );
- expectedResult = folder.getAbsolutePath() + File.separatorChar + "jars" + File.separatorChar
- + "one-sources-jar";
+ expectedResult =
+ folder.getAbsolutePath() + File.separatorChar + "jars" + File.separatorChar + "one-sources-jar";
assertEquals( expectedResult, name.getAbsolutePath() );
name = DependencyUtil.getFormattedOutputDirectory( true, false, true, false, true, folder, artifact );
- expectedResult = folder.getAbsolutePath() + File.separatorChar + "compile" + File.separatorChar
- + "one-sources-jar";
+ expectedResult =
+ folder.getAbsolutePath() + File.separatorChar + "compile" + File.separatorChar + "one-sources-jar";
assertEquals( expectedResult, name.getAbsolutePath() );
}
@@ -164,8 +164,8 @@ public class TestDependencyUtil
assertEquals( expectedResult, name.getAbsolutePath() );
name = DependencyUtil.getFormattedOutputDirectory( false, true, true, false, false, folder, artifact );
- expectedResult = folder.getAbsolutePath() + File.separatorChar + "wars" + File.separatorChar
- + "two-1.1-SNAPSHOT-war";
+ expectedResult =
+ folder.getAbsolutePath() + File.separatorChar + "wars" + File.separatorChar + "two-1.1-SNAPSHOT-war";
assertEquals( expectedResult, name.getAbsolutePath() );
name = DependencyUtil.getFormattedOutputDirectory( false, false, true, false, true, folder, artifact );
@@ -220,8 +220,8 @@ public class TestDependencyUtil
{
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 );
+ Artifact artifact =
+ new DefaultArtifact( "test", "two", vr, Artifact.SCOPE_PROVIDED, "test-jar", null, ah, false );
String name = DependencyUtil.getFormattedFileName( artifact, false );
String expectedResult = "two-1.1-SNAPSHOT.jar";
@@ -234,8 +234,8 @@ public class TestDependencyUtil
{
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 );
+ Artifact artifact =
+ new DefaultArtifact( "test", "two", vr, Artifact.SCOPE_PROVIDED, "jar", "sources", ah, false );
String name = DependencyUtil.getFormattedFileName( artifact, false );
String expectedResult = "two-1.1-SNAPSHOT-sources.jar";
@@ -244,11 +244,11 @@ public class TestDependencyUtil
name = DependencyUtil.getFormattedFileName( artifact, true );
expectedResult = "two-sources.jar";
assertEquals( expectedResult, name );
-
- name = DependencyUtil.getFormattedFileName(artifact, false, false, false, true);
+
+ name = DependencyUtil.getFormattedFileName( artifact, false, false, false, true );
expectedResult = "two-1.1-SNAPSHOT.jar";
assertEquals( expectedResult, name );
-
+
ah = new DefaultArtifactHandlerStub( "war", null );
artifact = new DefaultArtifact( "test", "two", vr, Artifact.SCOPE_PROVIDED, "war", "", ah, false );
name = DependencyUtil.getFormattedFileName( artifact, true );
@@ -265,8 +265,8 @@ public class TestDependencyUtil
// 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 );
+ 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 );
@@ -277,11 +277,11 @@ public class TestDependencyUtil
name = DependencyUtil.getFormattedFileName( artifact, false, false, false, true );
expectedResult = "two-1.1-SNAPSHOT.war";
assertEquals( expectedResult, name );
-
+
name = DependencyUtil.getFormattedFileName( artifact, true );
expectedResult = "two-sources.war";
assertEquals( expectedResult, name );
-
+
artifact = new DefaultArtifact( "test", "two", vr, Artifact.SCOPE_PROVIDED, "war", "", ah, false );
name = DependencyUtil.getFormattedFileName( artifact, true );
expectedResult = "two.war";
@@ -295,20 +295,20 @@ public class TestDependencyUtil
assertEquals( expectedResult, name );
}
-
+
public void testTokenizer()
{
- String [] tokens = DependencyUtil.tokenizer( " alpha,bravo, charlie , delta kappa, theta" );
+ String[] tokens = DependencyUtil.tokenizer( " alpha,bravo, charlie , delta kappa, theta" );
String[] expected = new String[] { "alpha", "bravo", "charlie", "delta kappa", "theta" };
// easier to see in the JUnit reports
assertEquals( StringUtils.join( expected, ", " ), StringUtils.join( tokens, ", " ) );
assertEquals( expected.length, tokens.length );
-
+
tokens = DependencyUtil.tokenizer( " \r\n a, \t \n \r b \t \n \r" );
assertEquals( 2, tokens.length );
assertEquals( "a", tokens[0] );
assertEquals( "b", tokens[1] );
-
+
tokens = DependencyUtil.tokenizer( null );
assertEquals( 0, tokens.length );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestDestFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestDestFileFilter.java?rev=1807877&r1=1807876&r2=1807877&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestDestFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestDestFileFilter.java Sat Sep 9 10:35:59 2017
@@ -37,7 +37,6 @@ import org.apache.maven.shared.artifact.
/**
* @author brianf
- *
*/
public class TestDestFileFilter
extends TestCase
@@ -76,42 +75,44 @@ public class TestDestFileFilter
}
public File createFile( Artifact artifact, boolean useSubDirectoryPerArtifact, boolean useSubDirectoryPerType,
- boolean removeVersion)
+ boolean removeVersion )
throws IOException
{
- return createFile(artifact, useSubDirectoryPerArtifact, useSubDirectoryPerType, removeVersion, false);
+ return createFile( artifact, useSubDirectoryPerArtifact, useSubDirectoryPerType, removeVersion, false );
}
-
- public File createFile(Artifact artifact, boolean useSubDirectoryPerArtifact, boolean useSubDirectoryPerType,
- boolean removeVersion, boolean removeClassifier)
- throws IOException
+
+ public File createFile( Artifact artifact, boolean useSubDirectoryPerArtifact, boolean useSubDirectoryPerType,
+ boolean removeVersion, boolean removeClassifier )
+ throws IOException
{
File destFolder =
- DependencyUtil.getFormattedOutputDirectory(false, useSubDirectoryPerType, useSubDirectoryPerArtifact,
- false, false, outputFolder, artifact);
- File destFile = new File(destFolder, DependencyUtil.getFormattedFileName(artifact, removeVersion, false, false, removeClassifier));
+ DependencyUtil.getFormattedOutputDirectory( false, useSubDirectoryPerType, useSubDirectoryPerArtifact,
+ false, false, outputFolder, artifact );
+ File destFile =
+ new File( destFolder,
+ DependencyUtil.getFormattedFileName( artifact, removeVersion, false, false, removeClassifier ) );
destFile.getParentFile().mkdirs();
- assertTrue(destFile.createNewFile());
+ assertTrue( destFile.createNewFile() );
return destFile;
}
public void testDestFileRelease()
- throws IOException, ArtifactFilterException
+ throws IOException, ArtifactFilterException
{
DestFileFilter filter = new DestFileFilter( outputFolder );
Artifact artifact = fact.getReleaseArtifact();
assertTrue( filter.isArtifactIncluded( artifact ) );
createFile( artifact );
- assertFalse( filter.isArtifactIncluded( artifact) );
+ assertFalse( filter.isArtifactIncluded( artifact ) );
filter.setOverWriteReleases( true );
assertTrue( filter.isArtifactIncluded( artifact ) );
}
public void testDestFileSnapshot()
- throws IOException, ArtifactFilterException
+ throws IOException, ArtifactFilterException
{
DestFileFilter filter = new DestFileFilter( outputFolder );
Artifact artifact = fact.getSnapshotArtifact();
@@ -125,13 +126,13 @@ public class TestDestFileFilter
}
public void testDestFileStripVersion()
- throws IOException, ArtifactFilterException
+ throws IOException, ArtifactFilterException
{
DestFileFilter filter = new DestFileFilter( outputFolder );
Artifact artifact = fact.getSnapshotArtifact();
filter.setRemoveVersion( true );
- assertTrue( filter.isArtifactIncluded( artifact) );
+ assertTrue( filter.isArtifactIncluded( artifact ) );
createFile( artifact, false, false, true );
assertFalse( filter.isArtifactIncluded( artifact ) );
@@ -140,22 +141,22 @@ public class TestDestFileFilter
}
public void testDestFileStripClassifier()
- throws IOException, ArtifactFilterException
+ throws IOException, ArtifactFilterException
{
- DestFileFilter filter = new DestFileFilter(outputFolder);
+ DestFileFilter filter = new DestFileFilter( outputFolder );
Artifact artifact = fact.getSnapshotArtifact();
- filter.setRemoveClassifier(true);
+ filter.setRemoveClassifier( true );
- assertTrue(filter.isArtifactIncluded(artifact));
- createFile(artifact, false, false, false, true);
- assertFalse(filter.isArtifactIncluded(artifact));
+ assertTrue( filter.isArtifactIncluded( artifact ) );
+ createFile( artifact, false, false, false, true );
+ assertFalse( filter.isArtifactIncluded( artifact ) );
- filter.setOverWriteSnapshots(true);
- assertTrue(filter.isArtifactIncluded(artifact));
+ filter.setOverWriteSnapshots( true );
+ assertTrue( filter.isArtifactIncluded( artifact ) );
}
-
+
public void testDestFileSubPerArtifact()
- throws IOException, ArtifactFilterException
+ throws IOException, ArtifactFilterException
{
DestFileFilter filter = new DestFileFilter( outputFolder );
Artifact artifact = fact.getSnapshotArtifact();
@@ -176,7 +177,7 @@ public class TestDestFileFilter
Artifact artifact = fact.getSnapshotArtifact();
filter.setUseSubDirectoryPerType( true );
- assertTrue( filter.isArtifactIncluded( artifact) );
+ assertTrue( filter.isArtifactIncluded( artifact ) );
createFile( artifact, false, true, false );
assertFalse( filter.isArtifactIncluded( artifact ) );
@@ -196,7 +197,7 @@ public class TestDestFileFilter
filter.setOverWriteIfNewer( true );
// should pass because the file doesn't exist yet.
- assertTrue( filter.isArtifactIncluded( artifact) );
+ assertTrue( filter.isArtifactIncluded( artifact ) );
// create the file in the destination
File destFile = createFile( artifact, false, false, false );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestMarkerFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestMarkerFileFilter.java?rev=1807877&r1=1807876&r2=1807877&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestMarkerFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestMarkerFileFilter.java Sat Sep 9 10:35:59 2017
@@ -37,7 +37,6 @@ import org.apache.maven.shared.artifact.
/**
* @author brianf
- *
*/
public class TestMarkerFileFilter
extends TestCase
@@ -69,10 +68,12 @@ public class TestMarkerFileFilter
DependencyTestUtils.removeDirectory( outputFolder );
}
- public void testMarkerFile() throws ArtifactFilterException
-
+ public void testMarkerFile()
+ throws ArtifactFilterException
+
{
- MarkerFileFilter filter = new MarkerFileFilter( true, true, false, new DefaultFileMarkerHandler( outputFolder ) );
+ MarkerFileFilter filter =
+ new MarkerFileFilter( true, true, false, new DefaultFileMarkerHandler( outputFolder ) );
Set<Artifact> result = filter.filter( artifacts );
assertEquals( 2, result.size() );
@@ -82,13 +83,15 @@ public class TestMarkerFileFilter
assertEquals( 2, result.size() );
}
- public void testMarkerSnapshots() throws ArtifactFilterException, MojoExecutionException, IOException
-
+ public void testMarkerSnapshots()
+ throws ArtifactFilterException, MojoExecutionException, IOException
+
{
DefaultFileMarkerHandler handler = new DefaultFileMarkerHandler( fact.getSnapshotArtifact(), outputFolder );
handler.setMarker();
- MarkerFileFilter filter = new MarkerFileFilter( true, false, false, new DefaultFileMarkerHandler( outputFolder ) );
+ MarkerFileFilter filter =
+ new MarkerFileFilter( true, false, false, new DefaultFileMarkerHandler( outputFolder ) );
Set<Artifact> result = filter.filter( artifacts );
assertEquals( 1, result.size() );
@@ -106,13 +109,13 @@ public class TestMarkerFileFilter
DefaultFileMarkerHandler handler = new DefaultFileMarkerHandler( fact.getReleaseArtifact(), outputFolder );
handler.setMarker();
- MarkerFileFilter filter = new MarkerFileFilter( false, false, false,
- new DefaultFileMarkerHandler( outputFolder ) );
+ MarkerFileFilter filter =
+ new MarkerFileFilter( false, false, false, new DefaultFileMarkerHandler( outputFolder ) );
Set<Artifact> result = filter.filter( artifacts );
assertEquals( 1, result.size() );
filter.setOverWriteReleases( true );
- result = filter.filter( artifacts);
+ result = filter.filter( artifacts );
assertEquals( 2, result.size() );
assertTrue( handler.clearMarker() );
@@ -134,7 +137,8 @@ public class TestMarkerFileFilter
DefaultFileMarkerHandler handler = new DefaultFileMarkerHandler( snap, outputFolder );
handler.setMarker();
assertTrue( snap.getFile().setLastModified( snap.getFile().lastModified() + 1500 ) );
- MarkerFileFilter filter = new MarkerFileFilter( false, false, true, new DefaultFileMarkerHandler( outputFolder ) );
+ MarkerFileFilter filter =
+ new MarkerFileFilter( false, false, true, new DefaultFileMarkerHandler( outputFolder ) );
Set<Artifact> result = filter.filter( tempArtifacts );
assertEquals( 2, result.size() );
@@ -142,7 +146,7 @@ public class TestMarkerFileFilter
handler.setMarker();
result = filter.filter( tempArtifacts );
assertEquals( 1, result.size() );
-
+
// filter won't include snapshot because it is older than marker
assertTrue( snap.getFile().setLastModified( snap.getFile().lastModified() - 10000 ) );
@@ -159,7 +163,8 @@ public class TestMarkerFileFilter
public void testGettersSetters()
{
- MarkerFileFilter filter = new MarkerFileFilter( true, false, true, new DefaultFileMarkerHandler( outputFolder ) );
+ MarkerFileFilter filter =
+ new MarkerFileFilter( true, false, true, new DefaultFileMarkerHandler( outputFolder ) );
assertEquals( true, filter.isOverWriteReleases() );
assertEquals( false, filter.isOverWriteSnapshots() );
assertEquals( true, filter.isOverWriteIfNewer() );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestResolveMarkerFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestResolveMarkerFileFilter.java?rev=1807877&r1=1807876&r2=1807877&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestResolveMarkerFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestResolveMarkerFileFilter.java Sat Sep 9 10:35:59 2017
@@ -40,7 +40,6 @@ import org.apache.maven.shared.artifact.
/**
* @author brianf
- *
*/
public class TestResolveMarkerFileFilter
extends TestCase
@@ -73,7 +72,7 @@ public class TestResolveMarkerFileFilter
}
public void testResolveFile()
- throws IOException, ArtifactFilterException, MojoExecutionException
+ throws IOException, ArtifactFilterException, MojoExecutionException
{
SourcesFileMarkerHandler handler = new SourcesFileMarkerHandler( outputFolder );
@@ -82,9 +81,9 @@ public class TestResolveMarkerFileFilter
ResolveFileFilter filter = new ResolveFileFilter( handler );
- assertTrue( filter.isArtifactIncluded( artifact) );
+ assertTrue( filter.isArtifactIncluded( artifact ) );
handler.setMarker();
- assertFalse( filter.isArtifactIncluded( artifact) );
+ assertFalse( filter.isArtifactIncluded( artifact ) );
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestDefaultMarkerFileHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestDefaultMarkerFileHandler.java?rev=1807877&r1=1807876&r2=1807877&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestDefaultMarkerFileHandler.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestDefaultMarkerFileHandler.java Sat Sep 9 10:35:59 2017
@@ -39,7 +39,6 @@ import org.apache.maven.plugin.testing.S
/**
* @author brianf
- *
*/
public class TestDefaultMarkerFileHandler
extends TestCase
@@ -80,8 +79,7 @@ public class TestDefaultMarkerFileHandle
public void testSetMarker()
throws MojoExecutionException
{
- DefaultFileMarkerHandler handler = new DefaultFileMarkerHandler( artifacts.get( 0 ),
- this.outputFolder );
+ DefaultFileMarkerHandler handler = new DefaultFileMarkerHandler( artifacts.get( 0 ), this.outputFolder );
assertFalse( handler.isMarkerSet() );
handler.setMarker();
assertTrue( handler.isMarkerSet() );
@@ -102,8 +100,7 @@ public class TestDefaultMarkerFileHandle
public void testMarkerFile()
throws MojoExecutionException, IOException
{
- DefaultFileMarkerHandler handler = new DefaultFileMarkerHandler( artifacts.get( 0 ),
- this.outputFolder );
+ DefaultFileMarkerHandler handler = new DefaultFileMarkerHandler( artifacts.get( 0 ), this.outputFolder );
File handle = handler.getMarkerFile();
assertFalse( handle.exists() );
@@ -150,8 +147,8 @@ public class TestDefaultMarkerFileHandle
public void testMarkerFileException()
{
// this stub wraps the file with an object to throw exceptions
- StubDefaultFileMarkerHandler handler = new StubDefaultFileMarkerHandler( artifacts.get( 0 ),
- this.outputFolder );
+ StubDefaultFileMarkerHandler handler =
+ new StubDefaultFileMarkerHandler( artifacts.get( 0 ), this.outputFolder );
try
{
handler.setMarker();
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestSourcesMarkerFileHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestSourcesMarkerFileHandler.java?rev=1807877&r1=1807876&r2=1807877&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestSourcesMarkerFileHandler.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestSourcesMarkerFileHandler.java Sat Sep 9 10:35:59 2017
@@ -39,7 +39,6 @@ import org.apache.maven.plugin.testing.S
/**
* @author brianf
- *
*/
public class TestSourcesMarkerFileHandler
extends TestCase
@@ -81,8 +80,7 @@ public class TestSourcesMarkerFileHandle
public void testSetMarkerResolved()
throws MojoExecutionException
{
- DefaultFileMarkerHandler handler = new SourcesFileMarkerHandler( artifacts.get( 0 ),
- this.outputFolder, true );
+ DefaultFileMarkerHandler handler = new SourcesFileMarkerHandler( artifacts.get( 0 ), this.outputFolder, true );
assertFalse( handler.isMarkerSet() );
handler.setMarker();
assertTrue( handler.isMarkerSet() );
@@ -102,8 +100,7 @@ public class TestSourcesMarkerFileHandle
public void testSetMarkerUnresolved()
throws MojoExecutionException
{
- DefaultFileMarkerHandler handler = new SourcesFileMarkerHandler( artifacts.get( 0 ),
- this.outputFolder, false );
+ DefaultFileMarkerHandler handler = new SourcesFileMarkerHandler( artifacts.get( 0 ), this.outputFolder, false );
assertFalse( handler.isMarkerSet() );
handler.setMarker();
assertTrue( handler.isMarkerSet() );
@@ -123,10 +120,9 @@ public class TestSourcesMarkerFileHandle
public void testBothMarkers()
throws MojoExecutionException
{
- DefaultFileMarkerHandler handler = new SourcesFileMarkerHandler( artifacts.get( 1 ),
- this.outputFolder, true );
- DefaultFileMarkerHandler handler2 = new SourcesFileMarkerHandler( artifacts.get( 1 ),
- this.outputFolder, false );
+ DefaultFileMarkerHandler handler = new SourcesFileMarkerHandler( artifacts.get( 1 ), this.outputFolder, true );
+ DefaultFileMarkerHandler handler2 =
+ new SourcesFileMarkerHandler( artifacts.get( 1 ), this.outputFolder, false );
handler.setMarker();
assertTrue( handler.isMarkerSet() );
@@ -142,10 +138,9 @@ public class TestSourcesMarkerFileHandle
public void testMarkerFile()
throws MojoExecutionException, IOException
{
- DefaultFileMarkerHandler handler = new SourcesFileMarkerHandler( artifacts.get( 0 ),
- this.outputFolder, true );
- DefaultFileMarkerHandler handler2 = new SourcesFileMarkerHandler( artifacts.get( 0 ),
- this.outputFolder, false );
+ DefaultFileMarkerHandler handler = new SourcesFileMarkerHandler( artifacts.get( 0 ), this.outputFolder, true );
+ DefaultFileMarkerHandler handler2 =
+ new SourcesFileMarkerHandler( artifacts.get( 0 ), this.outputFolder, false );
File handle = handler.getMarkerFile();
File handle2 = handler2.getMarkerFile();
@@ -218,10 +213,10 @@ public class TestSourcesMarkerFileHandle
theFile.createNewFile();
Artifact theArtifact = artifacts.get( 0 );
theArtifact.setFile( theFile );
- SourcesFileMarkerHandler resolvedHandler = new SourcesFileMarkerHandler( artifacts.get( 0 ),
- this.outputFolder, resolved );
- SourcesFileMarkerHandler unResolvedHandler = new SourcesFileMarkerHandler( artifacts.get( 0 ),
- this.outputFolder, !resolved );
+ SourcesFileMarkerHandler resolvedHandler =
+ new SourcesFileMarkerHandler( artifacts.get( 0 ), this.outputFolder, resolved );
+ SourcesFileMarkerHandler unResolvedHandler =
+ new SourcesFileMarkerHandler( artifacts.get( 0 ), this.outputFolder, !resolved );
assertFalse( resolvedHandler.isMarkerSet() );
assertFalse( unResolvedHandler.isMarkerSet() );
@@ -250,8 +245,8 @@ public class TestSourcesMarkerFileHandle
public void testMarkerFileException()
{
// this stub wraps the file with an object to throw exceptions
- StubSourcesFileMarkerHandler handler = new StubSourcesFileMarkerHandler( artifacts.get( 0 ),
- this.outputFolder, true );
+ StubSourcesFileMarkerHandler handler =
+ new StubSourcesFileMarkerHandler( artifacts.get( 0 ), this.outputFolder, true );
try
{
handler.setMarker();
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestUnpackMarkerFileHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestUnpackMarkerFileHandler.java?rev=1807877&r1=1807876&r2=1807877&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestUnpackMarkerFileHandler.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestUnpackMarkerFileHandler.java Sat Sep 9 10:35:59 2017
@@ -35,32 +35,32 @@ import org.apache.maven.plugin.testing.A
import org.apache.maven.plugin.testing.SilentLog;
public class TestUnpackMarkerFileHandler
- extends AbstractMojoTestCase
+ extends AbstractMojoTestCase
{
- List<ArtifactItem> artifactItems = new ArrayList<ArtifactItem>();
+ List<ArtifactItem> artifactItems = new ArrayList<ArtifactItem>();
Log log = new SilentLog();
File outputFolder;
-
+
protected File testDir;
-
+
protected DependencyArtifactStubFactory stubFactory;
protected void setUp()
throws Exception
{
super.setUp();
-
+
testDir = new File( getBasedir(), "target" + File.separatorChar + "unit-tests" + File.separatorChar
- + "unpack-markers" + File.separatorChar );
+ + "unpack-markers" + File.separatorChar );
DependencyTestUtils.removeDirectory( testDir );
assertFalse( testDir.exists() );
stubFactory = new DependencyArtifactStubFactory( this.testDir, false );
Artifact artifact = stubFactory.createArtifact( "test", "test", "1" );
ArtifactItem artifactItem;
- stubFactory.getArtifactItem(artifact);
+ stubFactory.getArtifactItem( artifact );
artifactItems.add( stubFactory.getArtifactItem( stubFactory.createArtifact( "test", "test", "1" ) ) );
artifact = stubFactory.createArtifact( "test2", "test2", "2" );
artifactItem = new ArtifactItem( artifact );
@@ -88,16 +88,14 @@ public class TestUnpackMarkerFileHandler
}
/**
+ * Assert that default functionality still exists
*
- * Assert that default functionallity still exists
- *
+ * @throws MojoExecutionException in case of an error.
*/
-
public void testSetMarker()
throws MojoExecutionException
{
- UnpackFileMarkerHandler handler = new UnpackFileMarkerHandler( artifactItems.get( 0 ),
- this.outputFolder );
+ UnpackFileMarkerHandler handler = new UnpackFileMarkerHandler( artifactItems.get( 0 ), this.outputFolder );
assertFalse( handler.isMarkerSet() );
handler.setMarker();
assertTrue( handler.isMarkerSet() );
@@ -118,8 +116,7 @@ public class TestUnpackMarkerFileHandler
public void testMarkerFile()
throws MojoExecutionException, IOException
{
- UnpackFileMarkerHandler handler = new UnpackFileMarkerHandler( artifactItems.get( 0 ),
- this.outputFolder );
+ UnpackFileMarkerHandler handler = new UnpackFileMarkerHandler( artifactItems.get( 0 ), this.outputFolder );
File handle = handler.getMarkerFile();
assertFalse( handle.exists() );
@@ -167,8 +164,8 @@ public class TestUnpackMarkerFileHandler
public void testMarkerFileException()
{
// this stub wraps the file with an object to throw exceptions
- StubUnpackFileMarkerHandler handler = new StubUnpackFileMarkerHandler( artifactItems.get( 0 ),
- this.outputFolder );
+ StubUnpackFileMarkerHandler handler =
+ new StubUnpackFileMarkerHandler( artifactItems.get( 0 ), this.outputFolder );
try
{
handler.setMarker();
@@ -200,27 +197,27 @@ public class TestUnpackMarkerFileHandler
// 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.
- UnpackFileMarkerHandler handler = new UnpackFileMarkerHandler( null, null );
+ UnpackFileMarkerHandler handler = new UnpackFileMarkerHandler( null, null );
handler.setArtifactItem( artifactItems.get( 0 ) );
handler.setMarker();
assertTrue( handler.isMarkerSet() );
handler.clearMarker();
assertFalse( handler.isMarkerSet() );
}
-
+
public void testIncludesMarker()
- throws MojoExecutionException, IOException
- {
- UnpackFileMarkerHandler handler = new UnpackFileMarkerHandler( artifactItems.get( 1 ), outputFolder );
- File handle = handler.getMarkerFile();
+ throws MojoExecutionException, IOException
+ {
+ UnpackFileMarkerHandler handler = new UnpackFileMarkerHandler( artifactItems.get( 1 ), outputFolder );
+ File handle = handler.getMarkerFile();
assertFalse( handle.exists() );
assertFalse( handler.isMarkerSet() );
handler.setMarker();
assertTrue( handler.isMarkerSet() );
assertTrue( handle.exists() );
- String hashCode = "" + ("**/*.xml".hashCode());
- assertTrue(handle.getName().contains(hashCode));
+ String hashCode = "" + ( "**/*.xml".hashCode() );
+ assertTrue( handle.getName().contains( hashCode ) );
handle.delete();
assertFalse( handler.isMarkerSet() );
@@ -230,55 +227,53 @@ public class TestUnpackMarkerFileHandler
handler.clearMarker();
assertFalse( handle.exists() );
- }
-
+ }
+
public void testExcludesMarker()
- throws MojoExecutionException, IOException
- {
- UnpackFileMarkerHandler handler = new UnpackFileMarkerHandler( artifactItems.get( 2 ), outputFolder );
- File handle = handler.getMarkerFile();
- assertFalse( handle.exists() );
- assertFalse( handler.isMarkerSet() );
-
- handler.setMarker();
- assertTrue( handler.isMarkerSet() );
- assertTrue( handle.exists() );
- String hashCode = "" + ("**/*.class".hashCode());
- assertTrue(handle.getName().contains(hashCode));
-
- handle.delete();
- assertFalse( handler.isMarkerSet() );
-
- handle.createNewFile();
- assertTrue( handler.isMarkerSet() );
-
- handler.clearMarker();
- assertFalse( handle.exists() );
- }
-
+ throws MojoExecutionException, IOException
+ {
+ UnpackFileMarkerHandler handler = new UnpackFileMarkerHandler( artifactItems.get( 2 ), outputFolder );
+ File handle = handler.getMarkerFile();
+ assertFalse( handle.exists() );
+ assertFalse( handler.isMarkerSet() );
+
+ handler.setMarker();
+ assertTrue( handler.isMarkerSet() );
+ assertTrue( handle.exists() );
+ String hashCode = "" + ( "**/*.class".hashCode() );
+ assertTrue( handle.getName().contains( hashCode ) );
+
+ handle.delete();
+ assertFalse( handler.isMarkerSet() );
+
+ handle.createNewFile();
+ assertTrue( handler.isMarkerSet() );
+
+ handler.clearMarker();
+ assertFalse( handle.exists() );
+ }
+
public void testIncludesExcludesMarker()
- throws MojoExecutionException, IOException
- {
- UnpackFileMarkerHandler handler = new UnpackFileMarkerHandler( artifactItems.get( 3 ), outputFolder );
- File handle = handler.getMarkerFile();
- assertFalse( handle.exists() );
- assertFalse( handler.isMarkerSet() );
-
- handler.setMarker();
- assertTrue( handler.isMarkerSet() );
- assertTrue( handle.exists() );
- String hashCode = "" + ( 0 + "**/*.class".hashCode() + "**/*.xml".hashCode() );
- assertTrue(handle.getName().contains(hashCode));
-
- handle.delete();
- assertFalse( handler.isMarkerSet() );
-
- handle.createNewFile();
- assertTrue( handler.isMarkerSet() );
-
- handler.clearMarker();
- assertFalse( handle.exists() );
- }
-}
+ throws MojoExecutionException, IOException
+ {
+ UnpackFileMarkerHandler handler = new UnpackFileMarkerHandler( artifactItems.get( 3 ), outputFolder );
+ File handle = handler.getMarkerFile();
+ assertFalse( handle.exists() );
+ assertFalse( handler.isMarkerSet() );
+ handler.setMarker();
+ assertTrue( handler.isMarkerSet() );
+ assertTrue( handle.exists() );
+ String hashCode = "" + ( 0 + "**/*.class".hashCode() + "**/*.xml".hashCode() );
+ assertTrue( handle.getName().contains( hashCode ) );
+
+ handle.delete();
+ assertFalse( handler.isMarkerSet() );
+
+ handle.createNewFile();
+ assertTrue( handler.isMarkerSet() );
+ handler.clearMarker();
+ assertFalse( handle.exists() );
+ }
+}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java?rev=1807877&r1=1807876&r2=1807877&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java Sat Sep 9 10:35:59 2017
@@ -45,7 +45,6 @@ import org.sonatype.aether.util.DefaultR
/**
* @author brianf
- *
*/
public class TestClassifierTypeTranslator
extends AbstractDependencyMojoTestCase
@@ -53,21 +52,21 @@ public class TestClassifierTypeTranslato
Set<Artifact> artifacts = new HashSet<Artifact>();
ArtifactFactory artifactFactory;
-
+
ArtifactRepository artifactRepository;
Log log = new SilentLog();
-
+
private RepositoryManager repoManager;
-
+
private ProjectBuildingRequest buildingRequest;
-
+
private ArtifactHandlerManager artifactHandlerManager;
protected void setUp()
throws Exception
{
- super.setUp( "classifiertype-translator", false);
+ super.setUp( "classifiertype-translator", false );
artifactHandlerManager = new DefaultArtifactHandlerManager();
this.setVariableValueToObject( artifactHandlerManager, "artifactHandlers", new HashMap() );
@@ -76,19 +75,18 @@ public class TestClassifierTypeTranslato
this.setVariableValueToObject( artifactFactory, "artifactHandlerManager", artifactHandlerManager );
artifactRepository = new StubArtifactRepository( null );
-
+
DependencyArtifactStubFactory factory = new DependencyArtifactStubFactory( null, false );
artifacts = factory.getMixedArtifacts();
-
+
repoManager = lookup( RepositoryManager.class );
-
- MavenSession session = newMavenSession( new MavenProjectStub() );
+
+ MavenSession session = newMavenSession( new MavenProjectStub() );
buildingRequest = session.getProjectBuildingRequest();
-
+
DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
-
}
public void testNullClassifier()
@@ -112,12 +110,12 @@ public class TestClassifierTypeTranslato
{
Iterator<ArtifactCoordinate> resultIter = results.iterator();
boolean found = false;
- while (resultIter.hasNext())
+ while ( resultIter.hasNext() )
{
ArtifactCoordinate translatedArtifact = resultIter.next();
- if (artifact.getArtifactId().equals(translatedArtifact.getArtifactId())
- && artifact.getGroupId().equals(translatedArtifact.getGroupId())
- /*&& artifact.getScope().equals(translatedArtifact.getScope())*/)
+ if ( artifact.getArtifactId().equals( translatedArtifact.getArtifactId() )
+ && artifact.getGroupId().equals( translatedArtifact.getGroupId() )
+ /* && artifact.getScope().equals(translatedArtifact.getScope()) */ )
{
// classifier is null, should be the same as the artifact
assertEquals( artifact.getClassifier(), translatedArtifact.getClassifier() );
@@ -157,7 +155,7 @@ public class TestClassifierTypeTranslato
ArtifactCoordinate translatedArtifact = resultIter.next();
if ( artifact.getArtifactId() == translatedArtifact.getArtifactId()
&& artifact.getGroupId() == translatedArtifact.getGroupId()
- /*&& artifact.getScope() == translatedArtifact.getScope()*/ )
+ /* && artifact.getScope() == translatedArtifact.getScope() */ )
{
// classifier is null, should be the same as the artifact
assertEquals( classifier, translatedArtifact.getClassifier() );
@@ -187,7 +185,7 @@ public class TestClassifierTypeTranslato
ArtifactCoordinate translatedArtifact = resultIter.next();
if ( artifact.getArtifactId() == translatedArtifact.getArtifactId()
&& artifact.getGroupId() == translatedArtifact.getGroupId()
- /*&& artifact.getScope() == translatedArtifact.getScope()*/ )
+ /* && artifact.getScope() == translatedArtifact.getScope() */ )
{
assertEquals( translatedArtifact.getClassifier(), classifier );
assertEquals( translatedArtifact.getExtension(), type );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/Interpolator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/Interpolator.java?rev=1807877&r1=1807876&r2=1807877&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/Interpolator.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/Interpolator.java Sat Sep 9 10:35:59 2017
@@ -19,11 +19,9 @@ package org.codehaus.plexus.util.interpo
* under the License.
*/
-
/**
- * COPIED FROM plexus-utils-1.5.15 TO SATISFY TESTS
- *
- * Interpolator interface. Based on existing RegexBasedInterpolator interface.
+ * COPIED FROM plexus-utils-1.5.15 TO SATISFY TESTS Interpolator interface. Based on existing RegexBasedInterpolator
+ * interface.
*
* @author cstamas
* @deprecated Use plexus-interpolation APIs instead.
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/RegexBasedInterpolator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/RegexBasedInterpolator.java?rev=1807877&r1=1807876&r2=1807877&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/RegexBasedInterpolator.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/RegexBasedInterpolator.java Sat Sep 9 10:35:59 2017
@@ -19,7 +19,6 @@ package org.codehaus.plexus.util.interpo
* under the License.
*/
-
import java.util.List;
/**
@@ -42,15 +41,12 @@ public class RegexBasedInterpolator
super( valueSources );
}
- public RegexBasedInterpolator( String startRegex,
- String endRegex,
- List valueSources )
+ public RegexBasedInterpolator( String startRegex, String endRegex, List valueSources )
{
super( startRegex, endRegex, valueSources );
}
- public RegexBasedInterpolator( String startRegex,
- String endRegex )
+ public RegexBasedInterpolator( String startRegex, String endRegex )
{
super( startRegex, endRegex );
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/ValueSource.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/ValueSource.java?rev=1807877&r1=1807876&r2=1807877&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/ValueSource.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/ValueSource.java Sat Sep 9 10:35:59 2017
@@ -19,7 +19,6 @@ package org.codehaus.plexus.util.interpo
* under the License.
*/
-
/**
* COPIED FROM plexus-utils-1.5.15 TO SATISFY TESTS
*
@@ -27,7 +26,8 @@ package org.codehaus.plexus.util.interpo
* @deprecated Use plexus-interpolation APIs instead.
* @version $Id: ValueSource.java 12174 2010-05-16 21:04:35Z rfscholte $
*/
-public interface ValueSource extends org.codehaus.plexus.interpolation.ValueSource
+public interface ValueSource
+ extends org.codehaus.plexus.interpolation.ValueSource
{
}