Repository: maven-scm Updated Branches: refs/heads/master 2e6768ec5 -> a0081dcb2
update code to avoid bug in JDK < 1.7 Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/a0081dcb Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/a0081dcb Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/a0081dcb Branch: refs/heads/master Commit: a0081dcb25f7dda048b12f4688011b9e1d6fcd2e Parents: 2e6768e Author: Hervé Boutemy <[email protected]> Authored: Sun Nov 23 16:22:24 2014 +0100 Committer: Hervé Boutemy <[email protected]> Committed: Sun Nov 23 16:22:24 2014 +0100 ---------------------------------------------------------------------- .../src/test/java/org/apache/maven/scm/ChangeSetMatcher.java | 5 +++-- .../src/test/java/org/apache/maven/scm/ScmFileMatcher.java | 6 +++--- .../maven/scm/provider/accurev/cli/HistoryConsumerTest.java | 5 +++-- .../command/changelog/AccuRevChangeLogCommandTckTest.java | 8 ++++---- .../accurev/command/status/AccuRevStatusCommandTest.java | 6 +++--- 5 files changed, 16 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a0081dcb/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java index 547b782..ecf5bff 100644 --- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java +++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java @@ -23,13 +23,13 @@ import static org.apache.maven.scm.ChangeFileMatcher.changeFile; import static org.apache.maven.scm.CollectionSizeMatcher.size; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.any; -import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.is; import java.util.List; import org.hamcrest.Description; import org.hamcrest.Matcher; +import org.hamcrest.Matchers; import org.hamcrest.TypeSafeMatcher; public class ChangeSetMatcher @@ -50,7 +50,8 @@ public class ChangeSetMatcher { elementMatchers[i] = changeFile( fileNames[i], any( String.class ) ); } - this.changeFilesMatcher = allOf( hasItems( elementMatchers ), size( fileNames.length, ChangeFile.class ) ); + this.changeFilesMatcher = + allOf( Matchers.<ChangeFile>hasItems( elementMatchers ), size( fileNames.length, ChangeFile.class ) ); } @Override http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a0081dcb/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ScmFileMatcher.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ScmFileMatcher.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ScmFileMatcher.java index ccae3cd..261bcd5 100644 --- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ScmFileMatcher.java +++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ScmFileMatcher.java @@ -13,13 +13,12 @@ package org.apache.maven.scm; * governing permissions and limitations under the License. */ -import static org.hamcrest.Matchers.hasItem; - import java.io.File; import java.util.List; import org.hamcrest.Description; import org.hamcrest.Matcher; +import org.hamcrest.Matchers; import org.hamcrest.TypeSafeMatcher; public class ScmFileMatcher @@ -34,7 +33,8 @@ public class ScmFileMatcher @SuppressWarnings( "unchecked" ) public static void assertHasScmFile( List<?> actualFiles, String fileName, ScmFileStatus status ) { - org.junit.Assert.assertThat( (List<ScmFile>) actualFiles, hasItem( scmFile( fileName, status ) ) ); + org.junit.Assert.assertThat( (List<ScmFile>) actualFiles, + Matchers.<ScmFile>hasItem( scmFile( fileName, status ) ) ); } private ScmFileStatus status; http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a0081dcb/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/HistoryConsumerTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/HistoryConsumerTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/HistoryConsumerTest.java index 0bf7ad7..f8e8629 100644 --- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/HistoryConsumerTest.java +++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/HistoryConsumerTest.java @@ -20,7 +20,6 @@ package org.apache.maven.scm.provider.accurev.cli; */ import static org.apache.maven.scm.provider.accurev.VersionMatcher.version; -import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; @@ -31,6 +30,7 @@ import java.util.List; import org.apache.maven.scm.log.DefaultLog; import org.apache.maven.scm.provider.accurev.Transaction; +import org.hamcrest.Matchers; import org.junit.Test; public class HistoryConsumerTest @@ -53,7 +53,8 @@ public class HistoryConsumerTest assertThat( t.getVersions().size(), is( 2 ) ); assertThat( t.getVersions(), - hasItem( version( 8L, "/./tcktests/src/main/java/Application.java", "1/1", "2/3" ) ) ); + Matchers.<Transaction.Version>hasItem( version( 8L, "/./tcktests/src/main/java/Application.java", + "1/1", "2/3" ) ) ); t = transactions.get( 1 ); assertThat( t.getComment(), is( "hpromoting" ) ); http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a0081dcb/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTckTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTckTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTckTest.java index 24aa50c..ae61f80 100644 --- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTckTest.java +++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTckTest.java @@ -20,7 +20,6 @@ package org.apache.maven.scm.provider.accurev.command.changelog; */ import static org.apache.maven.scm.ChangeSetMatcher.changeSet; -import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; @@ -42,6 +41,7 @@ import org.apache.maven.scm.provider.accurev.cli.AccuRevJUnitUtil; import org.apache.maven.scm.provider.accurev.command.AccuRevTckUtil; import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.scm.tck.command.changelog.ChangeLogCommandTckTest; +import org.hamcrest.Matchers; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -131,9 +131,9 @@ public class AccuRevChangeLogCommandTckTest List<ChangeSet> changeSets = result.getChangeLog().getChangeSets(); assertThat( changeSets.size(), is( 2 ) ); - assertThat( changeSets, hasItems( changeSet( "Upstream changes", "/readme.txt" ), - changeSet( "downstream workspace promote", "/./pom.xml", - "/./src/test/java/Test.java" ) ) ); + assertThat( changeSets, Matchers.<ChangeSet>hasItems( changeSet( "Upstream changes", "/readme.txt" ), + changeSet( "downstream workspace promote", "/./pom.xml", + "/./src/test/java/Test.java" ) ) ); // Changelog beforeUpstreamCheckin to beforeDownstreamCheckin should include just upstream change including // Test.java http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a0081dcb/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/status/AccuRevStatusCommandTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/status/AccuRevStatusCommandTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/status/AccuRevStatusCommandTest.java index c7cfd66..4777176 100644 --- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/status/AccuRevStatusCommandTest.java +++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/status/AccuRevStatusCommandTest.java @@ -21,7 +21,6 @@ package org.apache.maven.scm.provider.accurev.command.status; import static org.apache.maven.scm.ScmFileMatcher.assertHasScmFile; import static org.apache.maven.scm.ScmFileMatcher.scmFile; -import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; @@ -45,6 +44,7 @@ import org.apache.maven.scm.command.status.StatusScmResult; import org.apache.maven.scm.provider.accurev.AccuRevStat; import org.apache.maven.scm.provider.accurev.CategorisedElements; import org.apache.maven.scm.provider.accurev.command.AbstractAccuRevCommandTest; +import org.hamcrest.Matchers; import org.junit.Test; public class AccuRevStatusCommandTest @@ -101,8 +101,8 @@ public class AccuRevStatusCommandTest assertThat( result.isSuccess(), is( true ) ); assertThat( result.getChangedFiles().size(), is( 7 ) ); - assertThat( (List<ScmFile>) result.getChangedFiles(), not( hasItem( scmFile( "kept/defunct", - ScmFileStatus.MODIFIED ) ) ) ); + assertThat( (List<ScmFile>) result.getChangedFiles(), + not( Matchers.<ScmFile>hasItem( scmFile( "kept/defunct", ScmFileStatus.MODIFIED ) ) ) ); assertHasScmFile( result.getChangedFiles(), "kept/file", ScmFileStatus.MODIFIED ); assertHasScmFile( result.getChangedFiles(), "kept/added", ScmFileStatus.ADDED ); assertHasScmFile( result.getChangedFiles(), "kept/defunct", ScmFileStatus.DELETED );
