maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r685686 - in /maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm: ./ manager/ provider/ tck/command/changelog/ tck/command/list/ tck/command/update/
Date Wed, 13 Aug 2008 21:44:23 GMT
Author: olamy
Date: Wed Aug 13 14:44:22 2008
New Revision: 685686

URL: http://svn.apache.org/viewvc?rev=685686&view=rev
Log:
fix checkstyle issues

Modified:
    maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTckTestCase.java
    maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/manager/ScmManagerStub.java
    maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
    maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ChangeLogCommandTckTest.java
    maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/list/ListCommandTckTest.java
    maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java

Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTckTestCase.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTckTestCase.java?rev=685686&r1=685685&r2=685686&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTckTestCase.java
(original)
+++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTckTestCase.java
Wed Aug 13 14:44:22 2008
@@ -153,7 +153,7 @@
 
         List addedFiles = result.getAddedFiles();
 
-        if ( new File( workingDirectory, file.getPath()).isFile() )
+        if ( new File( workingDirectory, file.getPath() ).isFile() )
         {
             // Don't check directory add because some SCM tools ignore it
             assertEquals( "Expected 1 file in the added files list " + addedFiles, 1, addedFiles.size()
);

Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/manager/ScmManagerStub.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/manager/ScmManagerStub.java?rev=685686&r1=685685&r2=685686&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/manager/ScmManagerStub.java
(original)
+++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/manager/ScmManagerStub.java
Wed Aug 13 14:44:22 2008
@@ -50,7 +50,8 @@
 import java.util.List;
 
 /**
- * Stub implementation of ScmManager for unit testing purposes. It allows setting the expected
results that the different methods will return.
+ * Stub implementation of ScmManager for unit testing purposes. 
+ * It allows setting the expected results that the different methods will return.
  * More information about Stubs on <a href="http://martinfowler.com/bliki/TestDouble.html">Martin
Fowler's TestDouble</a>
  *
  * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>

Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java?rev=685686&r1=685685&r2=685686&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
(original)
+++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
Wed Aug 13 14:44:22 2008
@@ -49,7 +49,8 @@
 import java.util.List;
 
 /**
- * Stub implementation of ScmProvider for unit testing purposes. It allows setting the expected
results that the different methods will return.
+ * Stub implementation of ScmProvider for unit testing purposes. 
+ * It allows setting the expected results that the different methods will return.
  * More information about Stubs on <a href="http://martinfowler.com/bliki/TestDouble.html">Martin
Fowler's TestDouble</a>
  *
  * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>

Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ChangeLogCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ChangeLogCommandTckTest.java?rev=685686&r1=685685&r2=685686&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ChangeLogCommandTckTest.java
(original)
+++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ChangeLogCommandTckTest.java
Wed Aug 13 14:44:22 2008
@@ -76,7 +76,8 @@
 
         //Now only retrieve the changelog after timeBeforeSecondChangeLog
         Date currentTime = new Date();
-        result = provider.changeLog( getScmRepository(), fileSet, timeBeforeSecond, currentTime,
0, "" );
+        result = provider
+            .changeLog( getScmRepository(), fileSet, timeBeforeSecond, currentTime, 0, new
ScmBranch( "" ) );
 
         //Thorough assert of the last result
         assertTrue( result.isSuccess() );

Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/list/ListCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/list/ListCommandTckTest.java?rev=685686&r1=685685&r2=685686&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/list/ListCommandTckTest.java
(original)
+++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/list/ListCommandTckTest.java
Wed Aug 13 14:44:22 2008
@@ -76,8 +76,8 @@
 
         ListScmResult result = provider.list( getScmRepository(), fileSet, recursive, (ScmVersion)
null );
 
-        assertTrue( "SCM command failed: " + result.getCommandLine() + " : " + result.getProviderMessage()
+
-            ( result.getCommandOutput() == null ? "" : ": " + result.getCommandOutput() ),
result.isSuccess() );
+        assertTrue( "SCM command failed: " + result.getCommandLine() + " : " + result.getProviderMessage()
+            + ( result.getCommandOutput() == null ? "" : ": " + result.getCommandOutput()
), result.isSuccess() );
 
         return result.getFiles();
     }

Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java?rev=685686&r1=685685&r2=685686&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java
(original)
+++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java
Wed Aug 13 14:44:22 2008
@@ -19,25 +19,24 @@
  * under the License.
  */
 
+import java.io.File;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.TreeSet;
+
 import org.apache.maven.scm.ChangeSet;
 import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmFileStatus;
 import org.apache.maven.scm.ScmTckTestCase;
 import org.apache.maven.scm.ScmTestCase;
-import org.apache.maven.scm.ScmVersion;
 import org.apache.maven.scm.command.checkin.CheckInScmResult;
 import org.apache.maven.scm.command.update.UpdateScmResult;
 import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.codehaus.plexus.util.StringUtils;
 
-import java.io.File;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.TreeSet;
-
 /**
  * This test tests the update command.
  * <p/>



Mime
View raw message