You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/02/07 18:08:26 UTC
svn commit: r1241523 - in
/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command:
blame/ changelog/ checkin/ diff/ status/ update/
Author: hboutemy
Date: Tue Feb 7 17:08:26 2012
New Revision: 1241523
URL: http://svn.apache.org/viewvc?rev=1241523&view=rev
Log:
removed unnecessary casts now that generics are used
Modified:
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/blame/BlameCommandTckTest.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/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/blame/BlameCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/blame/BlameCommandTckTest.java?rev=1241523&r1=1241522&r2=1241523&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/blame/BlameCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/blame/BlameCommandTckTest.java Tue Feb 7 17:08:26 2012
@@ -55,7 +55,7 @@ public abstract class BlameCommandTckTes
assertNotNull( "The command returned a null result.", result );
assertResultIsSuccess( result );
assertEquals( "Expected 1 line in blame", 1, result.getLines().size() );
- line = (BlameLine) result.getLines().get( 0 );
+ line = result.getLines().get( 0 );
String initialRevision = line.getRevision();
//Make a timestamp that we know are after initial revision but before the second
@@ -77,7 +77,7 @@ public abstract class BlameCommandTckTes
assertResultIsSuccess( result );
assertEquals( "Expected 1 line in blame", 1, result.getLines().size() );
- line = (BlameLine) result.getLines().get( 0 );
+ line = result.getLines().get( 0 );
assertNotNull( "Expected not null author", line.getAuthor() );
assertNotNull( "Expected not null revision", line.getRevision() );
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=1241523&r1=1241522&r2=1241523&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 Tue Feb 7 17:08:26 2012
@@ -82,7 +82,7 @@ public abstract class ChangeLogCommandTc
//Thorough assert of the last result
assertTrue( result.getProviderMessage(), result.isSuccess() );
assertEquals( 1, result.getChangeLog().getChangeSets().size() );
- ChangeSet changeset = (ChangeSet) result.getChangeLog().getChangeSets().get( 0 );
+ ChangeSet changeset = result.getChangeLog().getChangeSets().get( 0 );
assertTrue( changeset.getDate().after( timeBeforeSecond ) );
assertEquals( COMMIT_MSG, changeset.getComment() );
}
Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java?rev=1241523&r1=1241522&r2=1241523&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 Tue Feb 7 17:08:26 2012
@@ -83,13 +83,13 @@ public abstract class CheckInCommandTckT
assertEquals( 2, files.size() );
- Map<String,ScmFile> fileMap = mapFilesByPath( files );
- ScmFile file1 = (ScmFile) fileMap.get( "src/main/java/Foo.java" );
+ Map<String, ScmFile> fileMap = mapFilesByPath( files );
+ ScmFile file1 = fileMap.get( "src/main/java/Foo.java" );
assertNotNull( file1 );
assertEquals( ScmFileStatus.CHECKED_IN, file1.getStatus() );
- ScmFile file2 = (ScmFile) fileMap.get( "readme.txt" );
+ ScmFile file2 = fileMap.get( "readme.txt" );
assertNotNull( file2 );
assertEquals( ScmFileStatus.CHECKED_IN, file2.getStatus() );
@@ -154,7 +154,7 @@ public abstract class CheckInCommandTckT
assertEquals( 1, files.size() );
- ScmFile file1 = (ScmFile) files.get( 0 );
+ ScmFile file1 = files.get( 0 );
assertEquals( ScmFileStatus.CHECKED_IN, file1.getStatus() );
Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/diff/DiffCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/diff/DiffCommandTckTest.java?rev=1241523&r1=1241522&r2=1241523&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 Tue Feb 7 17:08:26 2012
@@ -110,7 +110,7 @@ public abstract class DiffCommandTckTest
Iterator<ScmFile> files = new TreeSet<ScmFile>( changedFiles ).iterator();
//Check Foo.java
- ScmFile file = (ScmFile) files.next();
+ ScmFile file = files.next();
assertPath( "/src/main/java/org/Foo.java", file.getPath() );
@@ -121,7 +121,7 @@ public abstract class DiffCommandTckTest
assertTrue( actualStr.endsWith( postRangeStr ) );
//Check readme.txt
- file = (ScmFile) files.next();
+ file = files.next();
assertPath( "/readme.txt", file.getPath() );
@@ -133,7 +133,7 @@ public abstract class DiffCommandTckTest
assertTrue( actualStr.endsWith( postRangeStr ) );
//Check project.xml
- file = (ScmFile) files.next();
+ file = files.next();
assertPath( "/project.xml", file.getPath() );
Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java?rev=1241523&r1=1241522&r2=1241523&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 Tue Feb 7 17:08:26 2012
@@ -137,16 +137,12 @@ public abstract class StatusCommandTckTe
Iterator<ScmFile> files = new TreeSet<ScmFile>( changedFiles ).iterator();
- ScmFile file = (ScmFile) files.next();
-
+ ScmFile file = files.next();
assertPath( "/src/main/java/org/Foo.java", file.getPath() );
-
assertEquals( ScmFileStatus.ADDED, file.getStatus() );
- file = (ScmFile) files.next();
-
+ file = files.next();
assertPath( "/pom.xml", file.getPath() );
-
assertEquals( ScmFileStatus.MODIFIED, file.getStatus() );
assertFile( getUpdatingCopy(), "/readme.txt" );
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=1241523&r1=1241522&r2=1241523&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 Tue Feb 7 17:08:26 2012
@@ -152,9 +152,8 @@ public abstract class UpdateCommandTckTe
assertFalse( "The changed files list is empty ", changedSets.isEmpty() );
- for ( Iterator<ChangeSet> i = changedSets.iterator(); i.hasNext(); )
+ for ( ChangeSet changeSet : changedSets )
{
- ChangeSet changeSet = i.next();
System.out.println( changeSet.toXML() );
}
@@ -165,18 +164,18 @@ public abstract class UpdateCommandTckTe
Iterator<ScmFile> files = new TreeSet<ScmFile>( updatedFiles ).iterator();
//Foo.java
- ScmFile file = (ScmFile) files.next();
+ ScmFile file = 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 );
//readme.txt
- file = (ScmFile) files.next();
+ file = files.next();
assertPath( "/readme.txt", file.getPath() );
assertTrue( file.getStatus().isUpdate() );
//project.xml
- file = (ScmFile) files.next();
+ file = files.next();
assertPath( "/project.xml", file.getPath() );
//TODO : Consolidate file status so that we can remove "|| ADDED" term
assertTrue( file.getStatus().isUpdate() || file.getStatus() == ScmFileStatus.ADDED );