You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by ev...@apache.org on 2006/02/27 15:46:10 UTC
svn commit: r381348 - in
/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command:
checkin/CheckInCommandTckTest.java diff/DiffCommandTckTest.java
status/StatusCommandTckTest.java update/UpdateCommandTckTest.java
Author: evenisse
Date: Mon Feb 27 06:46:02 2006
New Revision: 381348
URL: http://svn.apache.org/viewcvs?rev=381348&view=rev
Log:
Remove asserts on ScmResult.getProviderMessage and start using ScmFileStatus.isXXX methods
Submitted by Torbjørn EIkli Smørgrav
Modified:
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/diff/DiffCommandTckTest.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.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/tck/command/checkin/CheckInCommandTckTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java?rev=381348&r1=381347&r2=381348&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java Mon Feb 27 06:46:02 2006
@@ -72,10 +72,6 @@
assertResultIsSuccess( result );
- assertNull( "The provider message wasn't null", result.getProviderMessage() );
-
- assertNull( "The command output wasn't null", result.getCommandOutput() );
-
List files = result.getCheckedInFiles();
assertNotNull( files );
@@ -94,10 +90,6 @@
assertPath( "/test-repo/check-in/readme.txt", file2.getPath() );
- assertNull( result.getProviderMessage() );
-
- assertNull( result.getCommandOutput() );
-
CheckOutScmResult checkoutResult = getScmManager().getProviderByUrl( getScmUrl() )
.checkOut( getScmRepository(), new ScmFileSet( getAssertionCopy() ), null );
@@ -154,10 +146,6 @@
assertResultIsSuccess( result );
- assertNull( "The provider message wasn't null", result.getProviderMessage() );
-
- assertNull( "The command output wasn't null", result.getCommandOutput() );
-
List files = result.getCheckedInFiles();
assertNotNull( files );
@@ -169,10 +157,6 @@
assertEquals( ScmFileStatus.CHECKED_IN, file1.getStatus() );
assertPath( "/test-repo/check-in/Foo.java", file1.getPath() );
-
- assertNull( result.getProviderMessage() );
-
- assertNull( result.getCommandOutput() );
CheckOutScmResult checkoutResult = getScmManager().getProviderByUrl( getScmUrl() )
.checkOut( getScmRepository(), new ScmFileSet( getAssertionCopy() ), null );
Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/diff/DiffCommandTckTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/diff/DiffCommandTckTest.java?rev=381348&r1=381347&r2=381348&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/diff/DiffCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/diff/DiffCommandTckTest.java Mon Feb 27 06:46:02 2006
@@ -16,21 +16,20 @@
* limitations under the License.
*/
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+
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.command.diff.DiffScmResult;
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.repository.ScmRepository;
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeSet;
-
/**
* This test tests the diff command.
*
@@ -111,7 +110,7 @@
assertPath( "/src/main/java/org/Foo.java", file.getPath() );
- assertTrue( isDiff( file.getStatus() ) );
+ assertTrue( file.getStatus().isDiff());
String postRangeStr = "+/src/main/java/org/Foo.java\n\\ No newline at end of file\n";
String actualStr = differences.get( file.getPath() ).toString();
@@ -122,7 +121,7 @@
assertPath( "/readme.txt", file.getPath() );
- assertTrue( isDiff( file.getStatus() ) );
+ assertTrue( file.getStatus().isDiff() );
postRangeStr =
"-/readme.txt\n\\ No newline at end of file\n+changed readme.txt\n\\ No newline at end of file\n";
@@ -138,14 +137,6 @@
actualStr = differences.get( file.getPath() ).toString();
assertTrue( actualStr.endsWith( postRangeStr ) );
- assertTrue( isDiff( file.getStatus() ) );
- }
-
- /**
- * TODO refactor into ScmFileResult
- */
- private static boolean isDiff( ScmFileStatus status )
- {
- return status == ScmFileStatus.ADDED || status == ScmFileStatus.DELETED || status == ScmFileStatus.MODIFIED;
+ assertTrue( file.getStatus().isDiff() );
}
}
Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java?rev=381348&r1=381347&r2=381348&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java Mon Feb 27 06:46:02 2006
@@ -125,10 +125,6 @@
assertResultIsSuccess( result );
- assertNull( "The provider message wasn't null", result.getProviderMessage() );
-
- assertNull( "The command output wasn't null", result.getCommandOutput() );
-
List changedFiles = result.getChangedFiles();
assertEquals( "Expected 2 files in the updated files list " + changedFiles, 2, changedFiles.size() );
Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java?rev=381348&r1=381347&r2=381348&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 Mon Feb 27 06:46:02 2006
@@ -122,10 +122,6 @@
assertResultIsSuccess( result );
- assertNull( "The provider message wasn't null", result.getProviderMessage() );
-
- assertNull( "The command output wasn't null", result.getCommandOutput() );
-
List updatedFiles = result.getUpdatedFiles();
List changedFiles = result.getChanges();
@@ -142,29 +138,21 @@
Iterator files = new TreeSet( updatedFiles ).iterator();
+ //Foo.java
ScmFile file = (ScmFile) files.next();
-
assertPath( "/src/main/java/org/Foo.java", file.getPath() );
+ //TODO : Consolidate file status so that we can remove "|| ADDED" term
+ assertTrue( file.getStatus().isUpdate() || file.getStatus() == ScmFileStatus.ADDED);
- // Need to accommodate CVS' weirdness. TODO: Should the API hide this somehow?
- //assertEquals( ScmFileStatus.ADDED, file.getStatus() );
- assertTrue(
- ScmFileStatus.ADDED.equals( file.getStatus() ) || ScmFileStatus.UPDATED == file.getStatus() );
-
+ //readme.txt
file = (ScmFile) files.next();
-
assertPath( "/readme.txt", file.getPath() );
+ assertTrue( file.getStatus().isUpdate() );
- //assertEquals( ScmFileStatus.UPDATED, file.getStatus() );
- assertTrue(
- ScmFileStatus.PATCHED.equals( file.getStatus() ) || ScmFileStatus.UPDATED.equals( file.getStatus() ) );
-
+ //project.xml
file = (ScmFile) files.next();
-
assertPath( "/project.xml", file.getPath() );
-
- //assertEquals( ScmFileStatus.ADDED, file.getStatus() );
- assertTrue(
- ScmFileStatus.ADDED.equals( file.getStatus() ) || ScmFileStatus.UPDATED.equals( file.getStatus() ) );
+ //TODO : Consolidate file status so that we can remove "|| ADDED" term
+ assertTrue( file.getStatus().isUpdate() || file.getStatus() == ScmFileStatus.ADDED);
}
}