Author: olamy
Date: Tue Jan 4 11:47:10 2011
New Revision: 1054982
URL: http://svn.apache.org/viewvc?rev=1054982&view=rev
Log:
fix junits
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/add/AccuRevAddCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckOutCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumerTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java?rev=1054982&r1=1054981&r2=1054982&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java
Tue Jan 4 11:47:10 2011
@@ -40,7 +40,6 @@ public class ChangeSetMatcher
private Matcher<Iterable<ChangeFile>> changeFilesMatcher;
- @SuppressWarnings( "unchecked" )
public ChangeSetMatcher( String comment, String... fileNames )
{
this.comment = comment;
@@ -53,7 +52,6 @@ public class ChangeSetMatcher
this.changeFilesMatcher = allOf( hasItems( elementMatchers ), size(
fileNames.length, ChangeFile.class ) );
}
- @SuppressWarnings( "unchecked" )
@Override
public boolean matchesSafely( ChangeSet changeSet )
{
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/add/AccuRevAddCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/add/AccuRevAddCommandTest.java?rev=1054982&r1=1054981&r2=1054982&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/add/AccuRevAddCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/add/AccuRevAddCommandTest.java
Tue Jan 4 11:47:10 2011
@@ -41,7 +41,6 @@ public class AccuRevAddCommandTest
extends AbstractAccuRevCommandTest
{
- @SuppressWarnings( "unchecked" )
@Test
public void testAdd()
throws Exception
@@ -64,7 +63,6 @@ public class AccuRevAddCommandTest
assertHasScmFile( result.getAddedFiles(), "added/file",
ScmFileStatus.ADDED );
}
- @SuppressWarnings( "unchecked" )
@Test
public void testAddFailed()
throws Exception
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTest.java?rev=1054982&r1=1054981&r2=1054982&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTest.java
Tue Jan 4 11:47:10 2011
@@ -110,7 +110,6 @@ public class AccuRevChangeLogCommandTest
}
- @SuppressWarnings("unchecked")
@Test
public void testStandardCase()
throws Exception
@@ -199,7 +198,6 @@ public class AccuRevChangeLogCommandTest
assertThat( cs.containsFilename( "created/file" ), is( true ) );
}
- @SuppressWarnings("unchecked")
@Test
public void testWorkspaceChangelog()
throws Exception
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckOutCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckOutCommandTest.java?rev=1054982&r1=1054981&r2=1054982&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckOutCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckOutCommandTest.java
Tue Jan 4 11:47:10 2011
@@ -33,6 +33,7 @@ import java.util.List;
import org.apache.maven.scm.CommandParameter;
import org.apache.maven.scm.CommandParameters;
import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.ScmRevision;
@@ -54,7 +55,6 @@ public class AccuRevCheckOutCommandTest
extends AbstractAccuRevCommandTest
{
- @SuppressWarnings( "unchecked" )
@Test
public void testCheckout()
throws Exception
@@ -72,7 +72,7 @@ public class AccuRevCheckOutCommandTest
assertThat( result.isSuccess(), is( true ) );
assertThat( result.getRelativePathProjectDirectory(), is(
"/project/dir" ) );
- List checkedOutFiles = result.getCheckedOutFiles();
+ List<ScmFile> checkedOutFiles = result.getCheckedOutFiles();
assertThat( checkedOutFiles.size(), is( 1 ) );
assertHasScmFile( checkedOutFiles, "updated/file",
ScmFileStatus.CHECKED_OUT );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumerTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumerTest.java?rev=1054982&r1=1054981&r2=1054982&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumerTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumerTest.java
Tue Jan 4 11:47:10 2011
@@ -54,12 +54,12 @@ public class ClearCaseEditConsumerTest
s = in.readLine();
}
- Collection entries = consumer.getEditFiles();
+ Collection<ScmFile> entries = consumer.getEditFiles();
assertEquals( "Wrong number of entries returned", 1, entries.size() );
ScmFile scmFile = (ScmFile) entries.iterator().next();
assertEquals( "test.java", scmFile.getPath() );
- assertEquals( ScmFileStatus.UNKNOWN, scmFile.getStatus() );
+ assertEquals( ScmFileStatus.EDITED, scmFile.getStatus() );
}
}
