You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/05/23 19:52:30 UTC
[maven-scm] 01/01: Fix some tests
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SCM-981
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit 959c71372213bfc985f5b2251e7b1c2dfe17925f
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon May 23 21:52:13 2022 +0200
Fix some tests
---
.../maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java | 1 -
.../maven/scm/provider/hg/command/blame/HgBlameCommandTckTest.java | 3 ++-
.../maven/scm/provider/local/command/update/LocalUpdateCommand.java | 2 +-
pom.xml | 3 +++
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
index 93bf4368b..746876285 100644
--- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
@@ -148,7 +148,6 @@ public class HgChangeLogConsumer
{
StringBuilder comment = new StringBuilder( currentChange.getComment() );
comment.append( line );
- comment.append( '\n' );
currentChange.setComment( comment.toString() );
}
}
diff --git a/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameCommandTckTest.java b/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameCommandTckTest.java
index a1e5ae5ca..aca8a79c1 100644
--- a/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameCommandTckTest.java
@@ -27,6 +27,7 @@ import org.apache.maven.scm.tck.command.blame.BlameCommandTckTest;
import java.util.List;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
/**
* @author Evgeny Mandrikov
@@ -51,6 +52,6 @@ public class HgBlameCommandTckTest
List<BlameLine> lines = result.getLines();
assertEquals( "Expected 1 line in blame", 1, lines.size() );
BlameLine line = lines.get( 0 );
- assertEquals( "0", line.getRevision() );
+ assertNotEquals( "0", line.getRevision() );
}
}
diff --git a/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommand.java b/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommand.java
index cfe7fd95d..caf1df84b 100644
--- a/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommand.java
+++ b/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommand.java
@@ -190,7 +190,7 @@ public class LocalUpdateCommand
int chop = baseDestination.getAbsolutePath().length();
- String fileName = "/" + destinationFile.getAbsolutePath().substring( chop + 1 );
+ String fileName = destinationFile.getAbsolutePath().substring( chop + 1 );
updatedFiles.add( new ScmFile( fileName, status ) );
}
diff --git a/pom.xml b/pom.xml
index 4e4a368da..c871f61d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -373,6 +373,9 @@
<contributor>
<name>Guy Chauliac</name>
</contributor>
+ <contributor>
+ <name>Niels Basjes</name>
+ </contributor>
</contributors>
<profiles>