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/22 20:28:44 UTC
[maven-scm] branch SCM-986 created (now e6e87c0e4)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch SCM-986
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
at e6e87c0e4 [SCM-986] SvnExe's SvnRemoteInfoCommand incorrectly implemented
This branch includes the following new commits:
new e6e87c0e4 [SCM-986] SvnExe's SvnRemoteInfoCommand incorrectly implemented
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-scm] 01/01: [SCM-986] SvnExe's SvnRemoteInfoCommand incorrectly implemented
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SCM-986
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit e6e87c0e48e0ff81c77321b152c17d02ccfdf8e7
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun May 22 22:11:06 2022 +0200
[SCM-986] SvnExe's SvnRemoteInfoCommand incorrectly implemented
Extend TCK test
---
...a => AbstractSvnExeRemoteInfoCommandTckTest.java} | 20 ++++++++------------
.../remoteinfo/SvnExeRemoteInfoCommandTckTest.java | 14 ++------------
...SvnExeRemoteInfoCommandTrailingSlashTckTest.java} | 18 ++++--------------
3 files changed, 14 insertions(+), 38 deletions(-)
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnExeRemoteInfoCommandTckTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/AbstractSvnExeRemoteInfoCommandTckTest.java
similarity index 72%
copy from maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnExeRemoteInfoCommandTckTest.java
copy to maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/AbstractSvnExeRemoteInfoCommandTckTest.java
index 117a0070f..6011d41c3 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnExeRemoteInfoCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/AbstractSvnExeRemoteInfoCommandTckTest.java
@@ -20,30 +20,26 @@ package org.apache.maven.scm.provider.svn.svnexe.command.remoteinfo;
*/
import org.apache.maven.scm.command.remoteinfo.RemoteInfoScmResult;
-import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.svn.command.remoteinfo.AbstractSvnRemoteInfoCommandTckTest;
-import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
import static org.junit.Assert.assertTrue;
/**
* @author Bertrand Paquet
*/
-public class SvnExeRemoteInfoCommandTckTest
+public abstract class AbstractSvnExeRemoteInfoCommandTckTest
extends AbstractSvnRemoteInfoCommandTckTest
{
@Override
protected void checkResult( RemoteInfoScmResult result )
{
- assertTrue( result.getTags().keySet().contains( "maven-3.0" ) );
+ assertTrue( result.getTags().containsKey( "maven-3.0" ) );
+ String tagUrl = result.getTags().get( "maven-3.0" );
+ assertTrue( tagUrl.endsWith( "/tags/maven-3.0/" ) );
+ assertTrue( result.getBranches().containsKey( "MNG-3004" ) );
+ String branchUrl = result.getBranches().get( "MNG-3004" );
+ assertTrue( branchUrl.endsWith( "/branches/MNG-3004/" ) );
}
- @Override
- protected ScmProviderRepository getScmProviderRepository()
- throws Exception
- {
- return new SvnScmProviderRepository( "http://svn.apache.org/repos/asf/maven/maven-3/trunk" );
- }
-
-}
\ No newline at end of file
+}
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnExeRemoteInfoCommandTckTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnExeRemoteInfoCommandTckTest.java
index 117a0070f..458c70fc8 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnExeRemoteInfoCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnExeRemoteInfoCommandTckTest.java
@@ -19,26 +19,16 @@ package org.apache.maven.scm.provider.svn.svnexe.command.remoteinfo;
* under the License.
*/
-import org.apache.maven.scm.command.remoteinfo.RemoteInfoScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.maven.scm.provider.svn.command.remoteinfo.AbstractSvnRemoteInfoCommandTckTest;
import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
-import static org.junit.Assert.assertTrue;
-
/**
* @author Bertrand Paquet
*/
public class SvnExeRemoteInfoCommandTckTest
- extends AbstractSvnRemoteInfoCommandTckTest
+ extends AbstractSvnExeRemoteInfoCommandTckTest
{
- @Override
- protected void checkResult( RemoteInfoScmResult result )
- {
- assertTrue( result.getTags().keySet().contains( "maven-3.0" ) );
- }
-
@Override
protected ScmProviderRepository getScmProviderRepository()
throws Exception
@@ -46,4 +36,4 @@ public class SvnExeRemoteInfoCommandTckTest
return new SvnScmProviderRepository( "http://svn.apache.org/repos/asf/maven/maven-3/trunk" );
}
-}
\ No newline at end of file
+}
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnExeRemoteInfoCommandTckTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnExeRemoteInfoCommandTrailingSlashTckTest.java
similarity index 71%
copy from maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnExeRemoteInfoCommandTckTest.java
copy to maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnExeRemoteInfoCommandTrailingSlashTckTest.java
index 117a0070f..70bfd965a 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnExeRemoteInfoCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnExeRemoteInfoCommandTrailingSlashTckTest.java
@@ -19,31 +19,21 @@ package org.apache.maven.scm.provider.svn.svnexe.command.remoteinfo;
* under the License.
*/
-import org.apache.maven.scm.command.remoteinfo.RemoteInfoScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.maven.scm.provider.svn.command.remoteinfo.AbstractSvnRemoteInfoCommandTckTest;
import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
-import static org.junit.Assert.assertTrue;
-
/**
* @author Bertrand Paquet
*/
-public class SvnExeRemoteInfoCommandTckTest
- extends AbstractSvnRemoteInfoCommandTckTest
+public class SvnExeRemoteInfoCommandTrailingSlashTckTest
+ extends AbstractSvnExeRemoteInfoCommandTckTest
{
- @Override
- protected void checkResult( RemoteInfoScmResult result )
- {
- assertTrue( result.getTags().keySet().contains( "maven-3.0" ) );
- }
-
@Override
protected ScmProviderRepository getScmProviderRepository()
throws Exception
{
- return new SvnScmProviderRepository( "http://svn.apache.org/repos/asf/maven/maven-3/trunk" );
+ return new SvnScmProviderRepository( "http://svn.apache.org/repos/asf/maven/maven-3/trunk/" );
}
-}
\ No newline at end of file
+}