You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/05/21 15:11:24 UTC
[maven-scm] branch master updated (c1b545d -> da2a3c5)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm.git.
from c1b545d update plexus-utils
new c5e4ad6 remove getModule method
new da2a3c5 if and only if
The 2 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.
Summary of changes:
.../scm/provider/local/repository/LocalRepositoryTest.java | 7 -------
.../cvslib/command/changelog/CvsChangeLogConsumerTest.java | 3 ++-
.../cvslib/repository/CvsScmProviderRepositoryTest.java | 5 +++--
.../maven/scm/provider/cvslib/AbstractCvsScmTest.java | 2 +-
.../cvslib/command/update/CvsUpdateCommandTest.java | 8 ++------
.../src/main/java/org/apache/maven/scm/ScmTestCase.java | 13 +------------
6 files changed, 9 insertions(+), 29 deletions(-)
[maven-scm] 02/02: if and only if
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit da2a3c5a1305ba1905c5002241c591c1101b8d42
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Thu May 21 10:55:41 2020 -0400
if and only if
---
maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
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 283fd16..d354de4 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
@@ -162,10 +162,6 @@ public abstract class ScmTestCase
return getScmManager().makeScmRepository( scmUrl );
}
- /**
- * TODO This method is bogus. ActualPath is not used and if used, it breaks
- * some unit tests.
- */
public void assertPath( String expectedPath, String actualPath )
throws Exception
{
@@ -362,7 +358,7 @@ public abstract class ScmTestCase
/**
* @param cmd the executable to run, not null.
- * @return true iff the command is on the path
+ * @return true if and only if the command is on the path
*/
public static boolean isSystemCmd( String cmd )
{
[maven-scm] 01/02: remove getModule method
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit c5e4ad65c052280bdcf7a1896731b03ff9b3280b
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Mon May 11 13:57:41 2020 -0400
remove getModule method
---
.../scm/provider/local/repository/LocalRepositoryTest.java | 7 -------
.../cvslib/command/changelog/CvsChangeLogConsumerTest.java | 3 ++-
.../cvslib/repository/CvsScmProviderRepositoryTest.java | 5 +++--
.../apache/maven/scm/provider/cvslib/AbstractCvsScmTest.java | 2 +-
.../provider/cvslib/command/update/CvsUpdateCommandTest.java | 8 ++------
.../src/main/java/org/apache/maven/scm/ScmTestCase.java | 11 ++---------
6 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/repository/LocalRepositoryTest.java b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/repository/LocalRepositoryTest.java
index 53ffceb..98c2cca 100644
--- a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/repository/LocalRepositoryTest.java
+++ b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/repository/LocalRepositoryTest.java
@@ -49,8 +49,6 @@ public class LocalRepositoryTest
assertEquals( "local", repository.getProvider() );
-// assertEquals( "src/test/repositories:test-repo", repository.getScmSpecificUrl() );
-
ScmProviderRepository providerRepository = repository.getProviderRepository();
assertNotNull( providerRepository );
@@ -135,9 +133,4 @@ public class LocalRepositoryTest
// expected
}
}
-
- protected String getScmUrl()
- {
- return "scm:local|" + getRepository() + "|" + getModule();
- }
}
diff --git a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java
index 2e98e8b..379801f 100644
--- a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java
+++ b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java
@@ -20,6 +20,7 @@ package org.apache.maven.scm.provider.cvslib.command.changelog;
*/
import org.apache.maven.scm.ChangeSet;
+import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.log.DefaultLog;
import org.apache.maven.scm.provider.cvslib.AbstractCvsScmTest;
import org.apache.maven.scm.util.ConsumerUtils;
@@ -34,7 +35,7 @@ import java.util.Iterator;
*
*/
public class CvsChangeLogConsumerTest
- extends AbstractCvsScmTest
+ extends ScmTestCase
{
/**
* file with test results to check against
diff --git a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java
index e941fa2..cd656c2 100644
--- a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java
+++ b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java
@@ -1,5 +1,7 @@
package org.apache.maven.scm.provider.cvslib.repository;
+import org.apache.maven.scm.ScmTestCase;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,7 +22,6 @@ package org.apache.maven.scm.provider.cvslib.repository;
*/
import org.apache.maven.scm.manager.ScmManager;
-import org.apache.maven.scm.provider.cvslib.AbstractCvsScmTest;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
@@ -30,7 +31,7 @@ import org.apache.maven.scm.repository.ScmRepositoryException;
*
*/
public class CvsScmProviderRepositoryTest
- extends AbstractCvsScmTest
+ extends ScmTestCase
{
private ScmManager scmManager;
diff --git a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmTest.java b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmTest.java
index 2d6e420..36bb850 100644
--- a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmTest.java
+++ b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmTest.java
@@ -44,7 +44,7 @@ public abstract class AbstractCvsScmTest
protected ScmRepository getScmRepository()
throws Exception
{
- return makeScmRepository( CvsScmTestUtils.getScmUrl( getRepository(), getModule() ) );
+ return makeScmRepository( CvsScmTestUtils.getScmUrl( getRepository(), "cvs" ) );
}
public void assertBetween( long small, long large, long value )
diff --git a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateCommandTest.java b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateCommandTest.java
index 976ab10..19f19d3 100644
--- a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateCommandTest.java
+++ b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateCommandTest.java
@@ -25,7 +25,6 @@ import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.command.update.UpdateScmResult;
import org.apache.maven.scm.manager.ScmManager;
-import org.apache.maven.scm.provider.cvslib.AbstractCvsScmTest;
import org.apache.maven.scm.provider.cvslib.CvsScmTestUtils;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.util.FileUtils;
@@ -40,7 +39,7 @@ import java.io.FileWriter;
*
*/
public class CvsUpdateCommandTest
- extends AbstractCvsScmTest
+ extends ScmTestCase
{
private File repository;
@@ -65,10 +64,7 @@ public class CvsUpdateCommandTest
CvsScmTestUtils.initRepo( repository, workingDirectory, assertionDirectory );
}
- /**
- * {@inheritDoc}
- */
- protected String getModule()
+ private String getModule()
{
return "test-repo/update";
}
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 ed6568f..283fd16 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
@@ -77,13 +77,6 @@ public abstract class ScmTestCase
scmManager = null;
}
- protected String getModule()
- {
- fail( "getModule() must be overridden." );
-
- return null;
- }
-
/**
* @return default location of the test read/write repository
*/
@@ -170,7 +163,7 @@ public abstract class ScmTestCase
}
/**
- * TODO This method is bogus. ActualPatch is not used and if used, it breaks
+ * TODO This method is bogus. ActualPath is not used and if used, it breaks
* some unit tests.
*/
public void assertPath( String expectedPath, String actualPath )
@@ -369,7 +362,7 @@ public abstract class ScmTestCase
/**
* @param cmd the executable to run, not null.
- * @return <code>true</code>
+ * @return true iff the command is on the path
*/
public static boolean isSystemCmd( String cmd )
{