[SCM-911] Skip tests if Git executable is not in PATH
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java
index e2e2330..ddb25fd 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java
@@ -93,6 +93,12 @@
File repo = getRepositoryRoot();
File checkedOutRepo = getWorkingCopy();
+ if ( !ScmTestCase.isSystemCmd( "git" ) )
+ {
+ System.out.println( "Skip test which requires Git native executable to be in PATH" );
+ return;
+ }
+
GitScmTestUtils.initRepo("src/test/resources/repository/", getRepositoryRoot(), getWorkingDirectory());
ScmRepository scmRepository = getScmManager().makeScmRepository(
@@ -110,12 +116,6 @@
File wineFile = new File(barDir.getAbsolutePath(), "wine.xml");
FileUtils.fileWrite( wineFile.getAbsolutePath(), "Lacoste castle" );
- if ( !ScmTestCase.isSystemCmd( "git" ) )
- {
- System.out.println( "Skip test which requires Git native executable to be in PATH" );
- return;
- }
-
// Adding and commiting file
AddScmResult addResult = getScmManager().add( scmRepository, new ScmFileSet( checkedOutRepo, new File( "foo/bar/wine.xml" ) ) );
assertResultIsSuccess( addResult );
@@ -143,6 +143,12 @@
File repo = getRepositoryRoot();
File checkedOutRepo = getWorkingCopy();
+ if ( !ScmTestCase.isSystemCmd( "git" ) )
+ {
+ System.out.println( "Skip test which requires Git native executable to be in PATH" );
+ return;
+ }
+
GitScmTestUtils.initRepo( "src/test/resources/repository/", getRepositoryRoot(), getWorkingDirectory() );
ScmRepository scmRepository = getScmManager().makeScmRepository(
@@ -158,12 +164,6 @@
File whiskeyFile = new File( checkedOutRepo.getAbsolutePath(), "whiskey.xml" );
FileUtils.fileWrite( whiskeyFile.getAbsolutePath(), "700 ml" );
- if ( !ScmTestCase.isSystemCmd( "git" ) )
- {
- System.out.println( "Skip test which requires Git native executable to be in PATH" );
- return;
- }
-
// Adding and commiting beer and whiskey
AddScmResult addResult = getScmManager().add( scmRepository, new ScmFileSet( checkedOutRepo, "beer.xml,whiskey.xml" ) );
assertResultIsSuccess( addResult );
