This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch fix
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit 7c6b1293f4e37f7b5d8b7a25c7d3411613ed5871
Author: Elliotte Rusty Harold <elh...@ibiblio.org>
AuthorDate: Tue May 12 08:53:37 2020 -0400
fix path tests
---
.../scm/provider/git/jgit/command/diff/JGitDiffCommandTckTest.java | 4 +---
.../provider/git/jgit/command/status/JGitStatusCommandTckTest.java | 4 +---
maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java | 4 ++--
.../apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java | 2 +-
.../org/apache/maven/scm/tck/command/diff/DiffCommandTckTest.java | 6 +++---
.../apache/maven/scm/tck/command/status/StatusCommandTckTest.java | 4 ++--
6 files changed, 10 insertions(+), 14 deletions(-)
diff --git
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommandTckTest.java
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommandTckTest.java
index 7a6a702..2afddfa 100644
---
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommandTckTest.java
+++
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommandTckTest.java
@@ -29,9 +29,7 @@ import org.eclipse.jgit.util.FileUtils;
public class JGitDiffCommandTckTest
extends GitDiffCommandTckTest
{
- /**
- * {@inheritDoc}
- */
+
public String getScmUrl()
throws Exception
{
diff --git
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommandTckTest.java
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommandTckTest.java
index 1801c64..3f83709 100644
---
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommandTckTest.java
+++
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommandTckTest.java
@@ -32,9 +32,7 @@ import org.eclipse.jgit.util.FileUtils;
public class JGitStatusCommandTckTest
extends GitStatusCommandTckTest
{
- /**
- * {@inheritDoc}
- */
+
public String getScmUrl()
throws Exception
{
diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
b/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
index f43d82a..ed6568f 100644
--- a/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
+++ b/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
@@ -38,7 +38,7 @@ import java.util.Date;
import java.util.TimeZone;
/**
- * Base class for all scm tests. Consumers will typically
+ * Base class for all SCM tests. Consumers will typically
* extend this class while tck test would extend ScmTckTestCase.
* <br>
* This class basically defines default locations for the
@@ -176,7 +176,7 @@ public abstract class ScmTestCase
public void assertPath( String expectedPath, String actualPath )
throws Exception
{
- assertEquals( StringUtils.replace( expectedPath, "\\", "/" ),
StringUtils.replace( expectedPath, "\\", "/" ) );
+ assertEquals( expectedPath.replace( '\\', '/' ), actualPath.replace(
'\\', '/' ) );
}
protected void assertFile( File root, String fileName )
diff --git
a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java
b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java
index da7fd4b..0b053b9 100644
---
a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java
+++
b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java
@@ -158,7 +158,7 @@ public abstract class CheckInCommandTckTest
assertEquals( ScmFileStatus.CHECKED_IN, file1.getStatus() );
- assertPath( "/test-repo/check-in/Foo.java", file1.getPath() );
+ assertPath( "src/main/java/Foo.java", file1.getPath() );
CheckOutScmResult checkoutResult =
getScmManager().checkOut( getScmRepository(), new ScmFileSet(
getAssertionCopy() ) );
diff --git
a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/diff/DiffCommandTckTest.java
b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/diff/DiffCommandTckTest.java
index f2e9377..62666d7 100644
---
a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/diff/DiffCommandTckTest.java
+++
b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/diff/DiffCommandTckTest.java
@@ -112,7 +112,7 @@ public abstract class DiffCommandTckTest
//Check Foo.java
ScmFile file = files.next();
- assertPath( "/src/main/java/org/Foo.java", file.getPath() );
+ assertPath( "src/main/java/org/Foo.java", file.getPath() );
assertTrue( file.getStatus().isDiff() );
@@ -123,7 +123,7 @@ public abstract class DiffCommandTckTest
//Check readme.txt
file = files.next();
- assertPath( "/readme.txt", file.getPath() );
+ assertPath( "readme.txt", file.getPath() );
assertTrue( file.getStatus().isDiff() );
@@ -135,7 +135,7 @@ public abstract class DiffCommandTckTest
//Check project.xml
file = files.next();
- assertPath( "/project.xml", file.getPath() );
+ assertPath( "project.xml", file.getPath() );
postRangeStr = "+changed project.xml\n\\ No newline at end of file\n";
actualStr = differences.get( file.getPath() ).toString();
diff --git
a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java
b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java
index 642bdf4..8329ed5 100644
---
a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java
+++
b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java
@@ -151,11 +151,11 @@ public abstract class StatusCommandTckTest
Iterator<ScmFile> files = new TreeSet<ScmFile>( changedFiles
).iterator();
ScmFile file = files.next();
- assertPath( "/src/main/java/org/Foo.java", file.getPath() );
+ assertPath( "src/main/java/org/Foo.java", file.getPath() );
assertEquals( ScmFileStatus.ADDED, file.getStatus() );
file = files.next();
- assertPath( "/pom.xml", file.getPath() );
+ assertPath( "pom.xml", file.getPath() );
assertEquals( ScmFileStatus.MODIFIED, file.getStatus() );
assertFile( getUpdatingCopy(), "/readme.txt" );
