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 ol...@apache.org on 2011/01/04 13:24:59 UTC
svn commit: r1054993 -
/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java
Author: olamy
Date: Tue Jan 4 12:24:59 2011
New Revision: 1054993
URL: http://svn.apache.org/viewvc?rev=1054993&view=rev
Log:
fix junit due to 1.5 move
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java?rev=1054993&r1=1054992&r2=1054993&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java Tue Jan 4 12:24:59 2011
@@ -53,7 +53,7 @@ public class GitDiffConsumerTest
consumer.consumeLine( line );
}
- List changedFiles = consumer.getChangedFiles();
+ List<ScmFile> changedFiles = consumer.getChangedFiles();
assertEquals( 0, changedFiles.size() );
}
@@ -74,16 +74,16 @@ public class GitDiffConsumerTest
consumer.consumeLine( line );
}
- List changedFiles = consumer.getChangedFiles();
+ List<ScmFile> changedFiles = consumer.getChangedFiles();
assertEquals( 1, changedFiles.size() );
testScmFile( (ScmFile) changedFiles.get( 0 ), "olamy.test", ScmFileStatus.MODIFIED );
- Map differences = consumer.getDifferences();
+ Map<String,StringBuilder> differences = consumer.getDifferences();
assertNotNull( differences );
- StringBuffer readmeDiffs = (StringBuffer) differences.get( "olamy.test" );
+ StringBuilder readmeDiffs = differences.get( "olamy.test" );
assertNotNull( readmeDiffs );
assertTrue( readmeDiffs.indexOf( "+new line" ) >= 0 );
}
@@ -104,22 +104,22 @@ public class GitDiffConsumerTest
consumer.consumeLine( line );
}
- List changedFiles = consumer.getChangedFiles();
+ List<ScmFile> changedFiles = consumer.getChangedFiles();
assertEquals( 2, changedFiles.size() );
- testScmFile( (ScmFile) changedFiles.get( 0 ), "pom.xml", ScmFileStatus.MODIFIED );
+ testScmFile( changedFiles.get( 0 ), "pom.xml", ScmFileStatus.MODIFIED );
- testScmFile( (ScmFile) changedFiles.get( 1 ), "test.txt", ScmFileStatus.MODIFIED );
+ testScmFile( changedFiles.get( 1 ), "test.txt", ScmFileStatus.MODIFIED );
- Map differences = consumer.getDifferences();
+ Map<String,StringBuilder> differences = consumer.getDifferences();
assertNotNull( differences );
- StringBuffer addDiffs = (StringBuffer) differences.get( "pom.xml" );
+ StringBuilder addDiffs = differences.get( "pom.xml" );
assertNotNull( addDiffs );
assertTrue( addDiffs.indexOf( "+ <!-- test -->" ) >= 0 );
- addDiffs = (StringBuffer) differences.get( "test.txt" );
+ addDiffs = differences.get( "test.txt" );
assertNotNull( addDiffs );
assertTrue( addDiffs.indexOf( "+maven-scm git provider works fine :-)" ) >= 0 );
}