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/09 18:25:14 UTC
svn commit: r1056982 -
/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: Sun Jan 9 17:25:13 2011
New Revision: 1056982
URL: http://svn.apache.org/viewvc?rev=1056982&view=rev
Log:
[SCM-591] Move to Java 1.5 : in diff result use CharSequence rather than a direct implementation fix junit compilation
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=1056982&r1=1056981&r2=1056982&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 Sun Jan 9 17:25:13 2011
@@ -80,10 +80,10 @@ public class GitDiffConsumerTest
testScmFile( (ScmFile) changedFiles.get( 0 ), "olamy.test", ScmFileStatus.MODIFIED );
- Map<String,StringBuilder> differences = consumer.getDifferences();
+ Map<String,CharSequence> differences = consumer.getDifferences();
assertNotNull( differences );
- StringBuilder readmeDiffs = differences.get( "olamy.test" );
+ StringBuilder readmeDiffs = new StringBuilder( differences.get( "olamy.test" ) );
assertNotNull( readmeDiffs );
assertTrue( readmeDiffs.indexOf( "+new line" ) >= 0 );
}
@@ -112,14 +112,14 @@ public class GitDiffConsumerTest
testScmFile( changedFiles.get( 1 ), "test.txt", ScmFileStatus.MODIFIED );
- Map<String,StringBuilder> differences = consumer.getDifferences();
+ Map<String,CharSequence> differences = consumer.getDifferences();
assertNotNull( differences );
- StringBuilder addDiffs = differences.get( "pom.xml" );
+ StringBuilder addDiffs = new StringBuilder( differences.get( "pom.xml" ) );
assertNotNull( addDiffs );
assertTrue( addDiffs.indexOf( "+ <!-- test -->" ) >= 0 );
- addDiffs = differences.get( "test.txt" );
+ addDiffs = new StringBuilder( differences.get( "test.txt" ) );
assertNotNull( addDiffs );
assertTrue( addDiffs.indexOf( "+maven-scm git provider works fine :-)" ) >= 0 );
}