svn commit: r684371 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src: main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/ test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/

[olamy]

Author: olamy
Date: Sat Aug  9 15:28:59 2008
New Revision: 684371

URL: http://svn.apache.org/viewvc?rev=684371&view=rev
Log:
fix test which can depends on user settings

Modified:
    
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java
    
maven/scm/trunk/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

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java?rev=684371&r1=684370&r2=684371&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java
 Sat Aug  9 15:28:59 2008
@@ -196,10 +196,10 @@
                    GitCommandLineUtils.addTarget( cl, fileSet.getFileList() );
                }
                
-               if (GitUtil.getSettings().isCommitNoVerify())
-               {
-                   cl.createArg().setValue( "--no-verify" );
-               }
+               if ( GitUtil.getSettings().isCommitNoVerify() )
+        {
+            cl.createArg().setValue( "--no-verify" );
+        }
                
                return cl;
        }

Modified: 
maven/scm/trunk/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
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/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?rev=684371&r1=684370&r2=684371&view=diff
==============================================================================
--- 
maven/scm/trunk/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
 (original)
+++ 
maven/scm/trunk/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
 Sat Aug  9 15:28:59 2008
@@ -22,6 +22,7 @@
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmTestCase;
 import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
+import org.apache.maven.scm.provider.git.util.GitUtil;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.codehaus.plexus.util.cli.Commandline;
 
@@ -55,14 +56,29 @@
     public void testCommandLineWithoutTag()
         throws Exception
     {
-        testCommandLine( "scm:git:http://foo.com/git/trunk";, "git commit 
--verbose " + messageFileString + " -a" );
+        if ( GitUtil.getSettings().isCommitNoVerify() )
+        {
+            testCommandLine( "scm:git:http://foo.com/git/trunk";, "git commit 
--verbose " + messageFileString + " -a" + " --no-verify" );    
+        }
+        else
+        {
+            testCommandLine( "scm:git:http://foo.com/git/trunk";, "git commit 
--verbose " + messageFileString + " -a" );
+        }
     }
 
     public void testCommandLineWithUsername()
         throws Exception
     {
-        testCommandLine( "scm:git:http://[EMAIL PROTECTED]/git/trunk",
-                         "git commit --verbose " + messageFileString + " -a" );
+        if ( GitUtil.getSettings().isCommitNoVerify() )
+        {
+            testCommandLine( "scm:git:http://[EMAIL PROTECTED]/git/trunk", 
"git commit --verbose " + messageFileString
+                + " -a" + " --no-verify" );
+        }
+        else
+        {
+            testCommandLine( "scm:git:http://[EMAIL PROTECTED]/git/trunk", 
"git commit --verbose " + messageFileString
+                + " -a" );
+        }
     }
 
     // ----------------------------------------------------------------------