This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch SUREFIRE-1570
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit bab07c01fbd4fe219dd796440959e9a1e1c629a3
Author: tibordigana <tibordig...@apache.org>
AuthorDate: Wed May 13 00:11:34 2020 +0200
renamed method matching two use cases
---
.../org/apache/maven/plugin/failsafe/IntegrationTestMojo.java | 6 +++---
.../apache/maven/plugin/failsafe/IntegrationTestMojoTest.java | 10 +++++-----
.../org/apache/maven/plugin/surefire/AbstractSurefireMojo.java | 6 +++---
.../maven/plugin/surefire/SurefireExecutionParameters.java | 4 ++--
.../plugin/surefire/AbstractSurefireMojoJava7PlusTest.java | 4 ++--
.../apache/maven/plugin/surefire/AbstractSurefireMojoTest.java | 8 ++++----
.../org/apache/maven/plugin/surefire/MojoMocklessTest.java | 4 ++--
.../java/org/apache/maven/plugin/surefire/SurefirePlugin.java | 6 +++---
8 files changed, 24 insertions(+), 24 deletions(-)
diff --git
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
index 0e6e26d..71c652b 100644
---
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
+++
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
@@ -614,7 +614,7 @@ public class IntegrationTestMojo
* used instead. See the resolution of {@link
#getClassLoaderConfiguration() ClassLoaderConfiguration}.
*/
@Override
- public File getClassesDirectory()
+ public File getMainBuildPath()
{
File artifact = getProject().getArtifact().getFile();
boolean isDefaultClsDir = classesDirectory == null;
@@ -622,9 +622,9 @@ public class IntegrationTestMojo
}
@Override
- public void setClassesDirectory( File classesDirectory )
+ public void setMainBuildPath( File mainBuildPath )
{
- this.classesDirectory = toAbsoluteCanonical( classesDirectory );
+ classesDirectory = toAbsoluteCanonical( mainBuildPath );
}
public void setDefaultClassesDirectory( File defaultClassesDirectory )
diff --git
a/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/IntegrationTestMojoTest.java
b/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/IntegrationTestMojoTest.java
index c605938..f5edf0b 100644
---
a/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/IntegrationTestMojoTest.java
+++
b/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/IntegrationTestMojoTest.java
@@ -58,25 +58,25 @@ public class IntegrationTestMojoTest
public void shouldBeJar()
{
mojo.setDefaultClassesDirectory( new File( "./target/classes" ) );
- File binaries = mojo.getClassesDirectory();
+ File binaries = mojo.getMainBuildPath();
assertThat( binaries.getName() ).isEqualTo( "a-1.0.jar" );
}
@Test
public void shouldBeAnotherJar()
{
- mojo.setClassesDirectory( new File( "./target/another-1.0.jar" ) );
+ mojo.setMainBuildPath( new File( "./target/another-1.0.jar" ) );
mojo.setDefaultClassesDirectory( new File( "./target/classes" ) );
- File binaries = mojo.getClassesDirectory();
+ File binaries = mojo.getMainBuildPath();
assertThat( binaries.getName() ).isEqualTo( "another-1.0.jar" );
}
@Test
public void shouldBeClasses()
{
- mojo.setClassesDirectory( new File( "./target/classes" ) );
+ mojo.setMainBuildPath( new File( "./target/classes" ) );
mojo.setDefaultClassesDirectory( new File( "./target/classes" ) );
- File binaries = mojo.getClassesDirectory();
+ File binaries = mojo.getMainBuildPath();
assertThat( binaries.getName() ).isEqualTo( "classes" );
}
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 9fa9d88..a45651c 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -1384,7 +1384,7 @@ public abstract class AbstractSurefireMojo
private File getModuleDescriptor()
{
- return new File( getClassesDirectory(), "module-info.class" );
+ return new File( getMainBuildPath(), "module-info.class" );
}
private boolean canExecuteProviderWithModularPath( Platform platform )
@@ -2621,7 +2621,7 @@ public abstract class AbstractSurefireMojo
checksum.add( isSkipExec() );
checksum.add( isSkip() );
checksum.add( getTestClassesDirectory() );
- checksum.add( getClassesDirectory() );
+ checksum.add( getMainBuildPath() );
checksum.add( getClasspathDependencyExcludes() );
checksum.add( getClasspathDependencyScopeExclude() );
checksum.add( getAdditionalClasspathElements() );
@@ -2741,7 +2741,7 @@ public abstract class AbstractSurefireMojo
classpathArtifacts = filterArtifacts( classpathArtifacts,
dependencyFilter );
}
- return new TestClassPath( classpathArtifacts, getClassesDirectory(),
+ return new TestClassPath( classpathArtifacts, getMainBuildPath(),
getTestClassesDirectory(), getAdditionalClasspathElements() );
}
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
index 4425ddc..e66a7dd 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
@@ -50,9 +50,9 @@ public interface SurefireExecutionParameters
void setTestClassesDirectory( File testClassesDirectory );
- File getClassesDirectory();
+ File getMainBuildPath();
- void setClassesDirectory( File classesDirectory );
+ void setMainBuildPath( File mainBuildPath );
File getReportsDirectory();
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
index abd896e..4db7aaa 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
@@ -347,13 +347,13 @@ public class AbstractSurefireMojoJava7PlusTest
}
@Override
- public File getClassesDirectory()
+ public File getMainBuildPath()
{
return null;
}
@Override
- public void setClassesDirectory( File classesDirectory )
+ public void setMainBuildPath( File mainBuildPath )
{
}
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
index 7ed96b3..3d366aa 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
@@ -249,7 +249,7 @@ public class AbstractSurefireMojoTest
{
AbstractSurefireMojo mojo = spy( this.mojo );
- when( mojo.getClassesDirectory() ).thenReturn( new File( "target" +
separatorChar + "classes" ) );
+ when( mojo.getMainBuildPath() ).thenReturn( new File( "target" +
separatorChar + "classes" ) );
when( mojo.getTestClassesDirectory() ).thenReturn( new File( "target"
+ separatorChar + "test-classes" ) );
when( mojo.getClasspathDependencyScopeExclude() ).thenReturn(
"runtime" );
when( mojo.getClasspathDependencyExcludes() ).thenReturn( new
String[]{ "g3:a3" } );
@@ -298,7 +298,7 @@ public class AbstractSurefireMojoTest
TestClassPath cp = invokeMethod( mojo, "generateTestClasspath" );
verifyPrivate( mojo, times( 1 ) ).invoke( "generateTestClasspath" );
- verify( mojo, times( 1 ) ).getClassesDirectory();
+ verify( mojo, times( 1 ) ).getMainBuildPath();
verify( mojo, times( 1 ) ).getTestClassesDirectory();
verify( mojo, times( 3 ) ).getClasspathDependencyScopeExclude();
verify( mojo, times( 2 ) ).getClasspathDependencyExcludes();
@@ -1901,13 +1901,13 @@ public class AbstractSurefireMojoTest
}
@Override
- public File getClassesDirectory()
+ public File getMainBuildPath()
{
return null;
}
@Override
- public void setClassesDirectory( File classesDirectory )
+ public void setMainBuildPath( File mainBuildPath )
{
}
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
index 835ce8e..dda40b3 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
@@ -452,13 +452,13 @@ public class MojoMocklessTest
}
@Override
- public File getClassesDirectory()
+ public File getMainBuildPath()
{
return null;
}
@Override
- public void setClassesDirectory( File classesDirectory )
+ public void setMainBuildPath( File mainBuildPath )
{
}
diff --git
a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
index b958f92..b63b0ef 100644
---
a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
+++
b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
@@ -566,15 +566,15 @@ public class SurefirePlugin
}
@Override
- public File getClassesDirectory()
+ public File getMainBuildPath()
{
return classesDirectory;
}
@Override
- public void setClassesDirectory( File classesDirectory )
+ public void setMainBuildPath( File mainBuildPath )
{
- this.classesDirectory = classesDirectory;
+ classesDirectory = mainBuildPath;
}
@Override
