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 08:57:31 UTC

[maven-scm] 03/04: Annotate and/or convert last bits and missed ones

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch scm-979-dejunit3
in repository https://gitbox.apache.org/repos/asf/maven-scm.git

commit 3e78df701cc5b6a296c06e142297834598c32e85
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Sat May 21 12:01:31 2022 +0200

    Annotate and/or convert last bits and missed ones
---
 .../java/org/apache/maven/scm/ChangeFileTest.java  |  9 +++++--
 .../java/org/apache/maven/scm/ChangeSetTest.java   | 29 ++++++++++++++++++----
 .../java/org/apache/maven/scm/ScmFileSetTest.java  | 12 +++++++--
 .../java/org/apache/maven/scm/ScmResultTest.java   |  7 ++++--
 .../apache/maven/scm/manager/ScmManagerTest.java   |  6 +++--
 .../apache/maven/scm/provider/ScmUrlUtilsTest.java | 10 ++++++--
 .../apache/maven/scm/util/FilenameUtilsTest.java   |  7 ++++--
 .../hg/repository/HgScmProviderRepositoryTest.java | 13 ++++++++--
 .../repository/GitScmProviderRepositoryTest.java   |  1 +
 .../command/checkin/GitCheckInCommandTest.java     |  1 +
 .../command/blame/SvnExeBlameCommandTckTest.java   |  2 ++
 .../command/branch/SvnExeBranchCommandTckTest.java |  7 ++++++
 .../command/changelog/SvnChangeLogCommandTest.java | 15 +++++++++++
 .../changelog/SvnChangeLogConsumerTest.java        |  5 ++--
 .../command/checkin/SvnCheckInCommandTest.java     |  8 +++++-
 .../command/checkout/SvnCheckOutCommandTest.java   |  5 ++++
 .../command/export/SvnExportCommandTest.java       |  3 +++
 .../svnexe/command/info/SvnInfoCommandTest.java    |  2 ++
 .../svnexe/command/list/SvnListCommandTest.java    |  6 +++++
 .../command/tag/SvnExeTagCommandTckTest.java       |  6 +++++
 .../command/untag/SvnExeUntagCommandTckTest.java   |  3 +++
 .../svnexe/command/untag/SvnUntagCommandTest.java  |  3 +++
 .../maven/scm/manager/ScmManagerStubTest.java      | 17 +++++++++----
 23 files changed, 149 insertions(+), 28 deletions(-)

diff --git a/maven-scm-api/src/test/java/org/apache/maven/scm/ChangeFileTest.java b/maven-scm-api/src/test/java/org/apache/maven/scm/ChangeFileTest.java
index 3f953db31..dab0baabe 100644
--- a/maven-scm-api/src/test/java/org/apache/maven/scm/ChangeFileTest.java
+++ b/maven-scm-api/src/test/java/org/apache/maven/scm/ChangeFileTest.java
@@ -19,14 +19,17 @@ package org.apache.maven.scm;
  * under the License.
  */
 
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse </a>
  */
 public class ChangeFileTest
-    extends TestCase
 {
+    @Test
     public void testNewFile()
     {
         ChangeFile f = new ChangeFile( "test.java" );
@@ -35,6 +38,7 @@ public class ChangeFileTest
         assertEquals( "test.java", f.toString() );
     }
 
+    @Test
     public void testNewFileRevision()
     {
         ChangeFile f = new ChangeFile( "test.java", "1.2.3" );
@@ -43,6 +47,7 @@ public class ChangeFileTest
         assertEquals( "test.java, 1.2.3", f.toString() );
     }
 
+    @Test
     public void testNewRevisionFile()
     {
         ChangeFile f = new ChangeFile( "test.java", "revision1" );
diff --git a/maven-scm-api/src/test/java/org/apache/maven/scm/ChangeSetTest.java b/maven-scm-api/src/test/java/org/apache/maven/scm/ChangeSetTest.java
index e95f0deab..67627dc72 100644
--- a/maven-scm-api/src/test/java/org/apache/maven/scm/ChangeSetTest.java
+++ b/maven-scm-api/src/test/java/org/apache/maven/scm/ChangeSetTest.java
@@ -19,12 +19,17 @@ package org.apache.maven.scm;
  * under the License.
  */
 
-import junit.framework.TestCase;
-
 import java.util.Calendar;
 import java.util.Date;
 
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Tests for the {@link ChangeSet}class
@@ -33,7 +38,6 @@ import static org.junit.Assert.assertNotEquals;
  *
  */
 public class ChangeSetTest
-    extends TestCase
 {
     /**
      * the {@link ChangeSet} used for testing
@@ -43,6 +47,7 @@ public class ChangeSetTest
     /**
      * Initialize per test data
      */
+    @Before
     public void setUp()
     {
         instance = createInstance();
@@ -60,6 +65,7 @@ public class ChangeSetTest
     /**
      * Test of addFile methods: using ChangeFile
      */
+    @Test
     public void testAddFileWithFile()
     {
         ChangeFile file = new ChangeFile( "maven:dummy" );
@@ -76,6 +82,7 @@ public class ChangeSetTest
     /**
      * Test of toString method
      */
+    @Test
     public void testToString()
     {
         //dion, Mon Apr 01 00:00:00 EST 2002, comment
@@ -88,6 +95,7 @@ public class ChangeSetTest
     /**
      * Test of getAuthor method
      */
+    @Test
     public void testGetAuthor()
     {
         assertEquals( "Author value not retrieved correctly", "dion", instance.getAuthor() );
@@ -96,6 +104,7 @@ public class ChangeSetTest
     /**
      * Test of setAuthor method
      */
+    @Test
     public void testSetAuthor()
     {
         instance.setAuthor( "maven:dion" );
@@ -105,6 +114,7 @@ public class ChangeSetTest
     /**
      * Test of getComment method
      */
+    @Test
     public void testGetComment()
     {
         assertEquals( "Comment value not retrieved correctly", "comment", instance.getComment() );
@@ -113,6 +123,7 @@ public class ChangeSetTest
     /**
      * Test of setComment method
      */
+    @Test
     public void testSetComment()
     {
         instance.setComment( "maven:comment" );
@@ -122,6 +133,7 @@ public class ChangeSetTest
     /**
      * Test of getDate method
      */
+    @Test
     public void testGetDate()
     {
         assertEquals( "Date value not retrieved correctly", getDate( 2002, 3, 1 ), instance.getDate() );
@@ -130,6 +142,7 @@ public class ChangeSetTest
     /**
      * Test of setDate method with Date object
      */
+    @Test
     public void testSetDate()
     {
         Calendar cal = Calendar.getInstance();
@@ -142,6 +155,7 @@ public class ChangeSetTest
     /**
      * Test of setDate method with String
      */
+    @Test
     public void testSetDateFromString()
     {
         instance.setDate( "2002/03/04 00:00:00" );
@@ -151,6 +165,7 @@ public class ChangeSetTest
     /**
      * Test of getDateFormatted method
      */
+    @Test
     public void testGetDateFormatted()
     {
         assertEquals( "Date not formatted correctly", "2002-04-01", instance.getDateFormatted() );
@@ -159,6 +174,7 @@ public class ChangeSetTest
     /**
      * Test of getDateFormatted method
      */
+    @Test
     public void testGetTimeFormatted()
     {
         assertEquals( "Time not formatted correctly", "00:00:00", instance.getTimeFormatted() );
@@ -174,6 +190,7 @@ public class ChangeSetTest
         return cal.getTime();
     }
 
+    @Test
     public void testEscapeValue()
     {
         assertEquals( "", ChangeSet.escapeValue("") );
@@ -186,6 +203,7 @@ public class ChangeSetTest
         assertEquals( "&apos;&amp;;&lt;&gt;&quot;", ChangeSet.escapeValue("'&;<>\"") );
     }
 
+    @Test
     public void testEquals()
     {
         ChangeSet instance2 = createInstance();
@@ -198,6 +216,7 @@ public class ChangeSetTest
         assertEquals(instance, instance2);
     }
 
+    @Test
     public void testHashCode()
     {
         int hashCode1 = instance.hashCode();
@@ -208,6 +227,7 @@ public class ChangeSetTest
         assertEquals( hashCode1, instance.hashCode() );
     }
 
+    @Test
     public void testToXml()
     {
         String sXml = instance.toXML();
@@ -217,6 +237,7 @@ public class ChangeSetTest
         assertTrue(sXml.indexOf("</changelog-entry>") > -1);
     }
 
+    @Test
     public void testToXmlWithFiles()
     {
         instance.addFile( new ChangeFile( "maven1:dummy" ) );
@@ -231,8 +252,6 @@ public class ChangeSetTest
         assertTrue(sXml.indexOf("<file>") > -1);
         assertTrue(sXml.indexOf("<name>maven1:dummy</name>") > -1);
         assertTrue(sXml.indexOf("<name>maven2:dummy2</name>") > -1);
-
-
     }
 
 }
diff --git a/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java b/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java
index 5b8055b6c..ca123268c 100644
--- a/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java
+++ b/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java
@@ -24,13 +24,16 @@ import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 /**
  * @author dtran
  */
 public class ScmFileSetTest
-    extends TestCase
 {
     private static String basedirPath;
 
@@ -56,6 +59,7 @@ public class ScmFileSetTest
         return filename.substring( getBasedir().length(), filename.length() );
     }
 
+    @Test
     public void testFilesList()
         throws IOException
     {
@@ -67,6 +71,7 @@ public class ScmFileSetTest
                 fileSet.getFileList().size() > 10 );
     }
 
+    @Test
     public void testFilesListWithoutIncludesResultsEmptyList()
         throws IOException
     {
@@ -74,6 +79,7 @@ public class ScmFileSetTest
         assertEquals( 0, fileSet.getFileList().size() );
     }
 
+    @Test
     public void testFilesListExcludes()
         throws IOException
     {
@@ -92,6 +98,7 @@ public class ScmFileSetTest
         }
     }
 
+    @Test
     public void testFilesListExcludes2()
         throws IOException
     {
@@ -100,6 +107,7 @@ public class ScmFileSetTest
         assertEquals( 2, fileSet.getFileList().size() );
     }
 
+    @Test
     public void testFilesListNoExcludes()
         throws IOException
     {
diff --git a/maven-scm-api/src/test/java/org/apache/maven/scm/ScmResultTest.java b/maven-scm-api/src/test/java/org/apache/maven/scm/ScmResultTest.java
index d1f1de673..2a8619923 100644
--- a/maven-scm-api/src/test/java/org/apache/maven/scm/ScmResultTest.java
+++ b/maven-scm-api/src/test/java/org/apache/maven/scm/ScmResultTest.java
@@ -19,10 +19,12 @@ package org.apache.maven.scm;
  * under the License.
  */
 
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
 
 public class ScmResultTest
-    extends TestCase
 {
 
     private static final String PASSWORD = "secr$t";
@@ -33,6 +35,7 @@ public class ScmResultTest
 
     private static final String MOCK_ERROR_MULTILINE_OUTPUT = "remote: Invalid username or password." + System.lineSeparator() + "fatal: Authentication failed for '" + SCM_URL_GIT_COLON + "'";
 
+    @Test
     public void testPasswordsAreMaskedInOutput()
         throws Exception
     {
diff --git a/maven-scm-api/src/test/java/org/apache/maven/scm/manager/ScmManagerTest.java b/maven-scm-api/src/test/java/org/apache/maven/scm/manager/ScmManagerTest.java
index ff13a67e1..04ee3c7ef 100644
--- a/maven-scm-api/src/test/java/org/apache/maven/scm/manager/ScmManagerTest.java
+++ b/maven-scm-api/src/test/java/org/apache/maven/scm/manager/ScmManagerTest.java
@@ -19,15 +19,17 @@ package org.apache.maven.scm.manager;
  * under the License.
  */
 
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  *
  */
 public class ScmManagerTest
-    extends TestCase
 {
+    @Test
     public void testCleanScmUrl()
         throws Exception
     {
diff --git a/maven-scm-api/src/test/java/org/apache/maven/scm/provider/ScmUrlUtilsTest.java b/maven-scm-api/src/test/java/org/apache/maven/scm/provider/ScmUrlUtilsTest.java
index 035a777cf..6ec5f93da 100644
--- a/maven-scm-api/src/test/java/org/apache/maven/scm/provider/ScmUrlUtilsTest.java
+++ b/maven-scm-api/src/test/java/org/apache/maven/scm/provider/ScmUrlUtilsTest.java
@@ -19,14 +19,17 @@ package org.apache.maven.scm.provider;
  * under the License.
  */
 
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author <a href="mailto:dennisl@apache.org">Dennis Lundberg</a>
  *
  */
 public class ScmUrlUtilsTest
-    extends TestCase
 {
     private static final String SCM_URL_INVALID_1 = null;
 
@@ -44,6 +47,7 @@ public class ScmUrlUtilsTest
 
     private static final String SCM_URL_VALID_4 = "scm:a|provider-specific-part";
 
+    @Test
     public void testGetProvider()
         throws Exception
     {
@@ -53,6 +57,7 @@ public class ScmUrlUtilsTest
         assertEquals( "a", ScmUrlUtils.getProvider( SCM_URL_VALID_4 ) );
     }
 
+    @Test
     public void testGetProviderSpecificPart()
         throws Exception
     {
@@ -62,6 +67,7 @@ public class ScmUrlUtilsTest
         assertEquals( "provider-specific-part", ScmUrlUtils.getProviderSpecificPart( SCM_URL_VALID_4 ) );
     }
 
+    @Test
     public void testIsValid()
         throws Exception
     {
diff --git a/maven-scm-api/src/test/java/org/apache/maven/scm/util/FilenameUtilsTest.java b/maven-scm-api/src/test/java/org/apache/maven/scm/util/FilenameUtilsTest.java
index 47a876232..98be80522 100644
--- a/maven-scm-api/src/test/java/org/apache/maven/scm/util/FilenameUtilsTest.java
+++ b/maven-scm-api/src/test/java/org/apache/maven/scm/util/FilenameUtilsTest.java
@@ -19,12 +19,15 @@ package org.apache.maven.scm.util;
  * under the License.
  */
 
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 public class FilenameUtilsTest
-    extends TestCase
 {
 
+    @Test
     public void testNormalize()
     {
         assertNull( FilenameUtils.normalizeFilename( (String) null ) );
diff --git a/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/repository/HgScmProviderRepositoryTest.java b/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/repository/HgScmProviderRepositoryTest.java
index b602d989b..de05fa391 100644
--- a/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/repository/HgScmProviderRepositoryTest.java
+++ b/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/repository/HgScmProviderRepositoryTest.java
@@ -19,10 +19,13 @@ package org.apache.maven.scm.provider.hg.repository;
  * under the License.
  */
 
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 public class HgScmProviderRepositoryTest
-    extends TestCase
 {
 
 //    public void testInvalidRepo()
@@ -33,6 +36,7 @@ public class HgScmProviderRepositoryTest
 //        assertNotNull( repo.validateURI() );
 //    }
 
+    @Test
     public void testFileRepo()
     {
         //1. Test *nix like paths
@@ -56,6 +60,7 @@ public class HgScmProviderRepositoryTest
 //        assertNotNull( repo.validateURI() );
     }
 
+    @Test
     public void testSSHRepo()
     {
         //todo: check assert
@@ -78,6 +83,7 @@ public class HgScmProviderRepositoryTest
         assertNull( repo.validateURI() );
     }
 
+    @Test
     public void testHTTPRepo()
     {
         //todo: check assert
@@ -105,6 +111,7 @@ public class HgScmProviderRepositoryTest
         assertTrue( true );
     }
 
+    @Test
     public void testHTTPRepoWithHgInUrl()
     {
         String url = "http://hg/hg/maven";
@@ -118,6 +125,7 @@ public class HgScmProviderRepositoryTest
      *
      * @throws Exception
      */
+    @Test
     public void testParseHostAndPort()
         throws Exception
     {
@@ -139,6 +147,7 @@ public class HgScmProviderRepositoryTest
      *
      * @throws Exception
      */
+    @Test
     public void testParseBasicAuth()
         throws Exception
     {
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/repository/GitScmProviderRepositoryTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/repository/GitScmProviderRepositoryTest.java
index 3cdb7360a..e94701619 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/repository/GitScmProviderRepositoryTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/repository/GitScmProviderRepositoryTest.java
@@ -397,6 +397,7 @@ public class GitScmProviderRepositoryTest
         }
     }
 
+    @Test
     public void testGetParent() throws Exception
     {
         new GitScmProviderRepository( "http://gitrepos.apache.org" );
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java
index a1a4acd58..4f7050aa1 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java
@@ -148,6 +148,7 @@ public class GitCheckInCommandTest
     }
 
     // Test FileSet in configuration
+    @Test
     public void testCheckinWithFileSet() throws Exception {
         File repo = getRepositoryRoot();
         File checkedOutRepo = getWorkingCopy();
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/blame/SvnExeBlameCommandTckTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/blame/SvnExeBlameCommandTckTest.java
index e578ff50e..ef989b7c8 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/blame/SvnExeBlameCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/blame/SvnExeBlameCommandTckTest.java
@@ -20,6 +20,7 @@ package org.apache.maven.scm.provider.svn.svnexe.command.blame;
  */
 
 import org.apache.maven.scm.provider.svn.command.blame.SvnBlameCommandTckTest;
+import org.junit.Test;
 
 /**
  * @author Evgeny Mandrikov
@@ -27,6 +28,7 @@ import org.apache.maven.scm.provider.svn.command.blame.SvnBlameCommandTckTest;
 public class SvnExeBlameCommandTckTest
     extends SvnBlameCommandTckTest
 {
+    @Test
     public void testBlameCommand()
         throws Exception
     {
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/branch/SvnExeBranchCommandTckTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java
index 3547f22a4..e307bf456 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java
@@ -24,6 +24,7 @@ import org.apache.maven.scm.provider.svn.command.branch.SvnBranchCommandTckTest;
 import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.codehaus.plexus.util.cli.Commandline;
+import org.junit.Test;
 
 import java.io.File;
 
@@ -37,6 +38,7 @@ public class SvnExeBranchCommandTckTest
     extends SvnBranchCommandTckTest
 {
     //--no-auth-cache
+    @Test
     public void testBranchUserNameSvnHttpsRemoteBranchingWithRev()
         throws Exception
     {
@@ -54,6 +56,7 @@ public class SvnExeBranchCommandTckTest
                          scmBranchParameters );
     }
 
+    @Test
     public void testBranchUserNameSvnHttpsRemoteBranchingWithRevWithPinExternals()
         throws Exception
     {
@@ -71,6 +74,7 @@ public class SvnExeBranchCommandTckTest
                          scmBranchParameters );
     }
 
+    @Test
     public void testBranchUserNameSvnHttpsRemoteBranchingNoRev()
         throws Exception
     {
@@ -86,6 +90,7 @@ public class SvnExeBranchCommandTckTest
                              + " --encoding UTF-8 https://foo.com/svn/trunk@ https://foo.com/svn/branches/svnbranch@", scmBranchParameters );
     }
 
+    @Test
     public void testBranchUserNameSvnHttpsRemoteBranchingNoRevWithPinExternals()
         throws Exception
     {
@@ -101,6 +106,7 @@ public class SvnExeBranchCommandTckTest
                              + " --encoding UTF-8 --pin-externals https://foo.com/svn/trunk@ https://foo.com/svn/branches/svnbranch@", scmBranchParameters );
     }
 
+    @Test
     public void testBranchUserNameSvnHttps()
         throws Exception
     {
@@ -112,6 +118,7 @@ public class SvnExeBranchCommandTckTest
                              + " --encoding UTF-8 . https://foo.com/svn/branches/svnbranch@", null );
     }
 
+    @Test
     public void testBranchUserNameSvnSsh()
         throws Exception
     {
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/changelog/SvnChangeLogCommandTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java
index f5729bd95..332320fda 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java
@@ -26,6 +26,7 @@ import org.apache.maven.scm.ScmRevision;
 import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.codehaus.plexus.util.cli.Commandline;
+import org.junit.Test;
 
 import java.io.File;
 import java.util.Calendar;
@@ -38,6 +39,7 @@ import java.util.Date;
 public class SvnChangeLogCommandTest
     extends ScmTestCase
 {
+    @Test
     public void testCommandLineNoDates()
         throws Exception
     {
@@ -45,6 +47,7 @@ public class SvnChangeLogCommandTest
                          "svn --non-interactive log -v http://foo.com/svn/trunk@" );
     }
 
+    @Test
     public void testCommandLineNoDatesLimitedCount()
         throws Exception
     {
@@ -52,6 +55,7 @@ public class SvnChangeLogCommandTest
                          "svn --non-interactive log -v --limit 40 http://foo.com/svn/trunk@" );
     }
 
+    @Test
     public void testCommandLineWithDates()
         throws Exception
     {
@@ -62,6 +66,7 @@ public class SvnChangeLogCommandTest
                          "svn --non-interactive log -v -r \"{2003-09-10 00:00:00 +0000}:{2003-10-10 00:00:00 +0000}\" http://foo.com/svn/trunk@" );
     }
 
+    @Test
     public void testCommandLineStartDateOnly()
         throws Exception
     {
@@ -71,6 +76,7 @@ public class SvnChangeLogCommandTest
                          "svn --non-interactive log -v -r \"{2003-09-10 01:01:01 +0000}:HEAD\" http://foo.com/svn/trunk@" );
     }
 
+    @Test
     public void testCommandLineDateFormat()
         throws Exception
     {
@@ -81,6 +87,7 @@ public class SvnChangeLogCommandTest
                          "svn --non-interactive log -v -r \"{2003-09-10 01:01:01 +0000}:{2005-11-13 23:23:23 +0000}\" http://foo.com/svn/trunk@" );
     }
 
+    @Test
     public void testCommandLineEndDateOnly()
         throws Exception
     {
@@ -91,6 +98,7 @@ public class SvnChangeLogCommandTest
                          "svn --non-interactive log -v http://foo.com/svn/trunk@" );
     }
 
+    @Test
     public void testCommandLineWithBranchNoDates()
         throws Exception
     {
@@ -98,6 +106,7 @@ public class SvnChangeLogCommandTest
                          "svn --non-interactive log -v http://foo.com/svn/branches/my-test-branch@ http://foo.com/svn/trunk@" );
     }
 
+    @Test
     public void testCommandLineWithBranchStartDateOnly()
         throws Exception
     {
@@ -107,6 +116,7 @@ public class SvnChangeLogCommandTest
                          "svn --non-interactive log -v -r \"{2003-09-10 01:01:01 +0000}:HEAD\" http://foo.com/svn/branches/my-test-branch@ http://foo.com/svn/trunk@" );
     }
 
+    @Test
     public void testCommandLineWithBranchEndDateOnly()
         throws Exception
     {
@@ -117,6 +127,7 @@ public class SvnChangeLogCommandTest
                          "svn --non-interactive log -v http://foo.com/svn/branches/my-test-branch@ http://foo.com/svn/trunk@" );
     }
 
+    @Test
     public void testCommandLineWithBranchBothDates()
         throws Exception
     {
@@ -127,6 +138,7 @@ public class SvnChangeLogCommandTest
                          "svn --non-interactive log -v -r \"{2003-09-10 00:00:00 +0000}:{2003-10-10 00:00:00 +0000}\" http://foo.com/svn/branches/my-test-branch@ http://foo.com/svn/trunk@" );
     }
 
+    @Test
     public void testCommandLineWithStartVersion()
         throws Exception
     {
@@ -134,6 +146,7 @@ public class SvnChangeLogCommandTest
                          "svn --non-interactive log -v -r 1:HEAD http://foo.com/svn/trunk@" );
     }
 
+    @Test
     public void testCommandLineWithStartVersionAndEndVersion()
         throws Exception
     {
@@ -141,6 +154,7 @@ public class SvnChangeLogCommandTest
                          "svn --non-interactive log -v -r 1:10 http://foo.com/svn/trunk@" );
     }
 
+    @Test
     public void testCommandLineWithStartVersionAndEndVersionEquals()
         throws Exception
     {
@@ -148,6 +162,7 @@ public class SvnChangeLogCommandTest
                          "svn --non-interactive log -v -r 1 http://foo.com/svn/trunk@" );
     }
 
+    @Test
     public void testCommandLineWithBaseVersion()
         throws Exception
     {
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/changelog/SvnChangeLogConsumerTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java
index 2354e3daf..ce847692a 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java
@@ -24,7 +24,6 @@ import org.apache.maven.scm.ChangeSet;
 import org.apache.maven.scm.ScmFileStatus;
 import org.apache.maven.scm.ScmTestCase;
 import org.apache.maven.scm.util.ConsumerUtils;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -41,8 +40,8 @@ import java.util.Map;
 import java.util.TimeZone;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 /**
@@ -257,7 +256,7 @@ public class SvnChangeLogConsumerTest
                 out.append( "File:" + fileName );
 
                 // files in this log are known to be from one subtree
-                Assert.assertTrue( "Unexpected file name: " + fileName, fileName.startsWith( "/maven/scm/trunk" ) );
+                assertTrue( "Unexpected file name: " + fileName, fileName.startsWith( "/maven/scm/trunk" ) );
 
                 // files in this log are known not to contain space
                 assertEquals( "Unexpected space found in filename: " + fileName, -1, fileName.indexOf( " " ) );
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/checkin/SvnCheckInCommandTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java
index e14214ed1..91cb399bd 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java
@@ -26,6 +26,7 @@ import org.apache.maven.scm.provider.svn.util.SvnUtil;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.codehaus.plexus.util.cli.Commandline;
 import org.junit.Before;
+import org.junit.Test;
 
 import java.io.File;
 
@@ -57,18 +58,21 @@ public class SvnCheckInCommandTest
         messageFileString = "--file " + path + " --encoding UTF-8";
     }
 
+    @Test
     public void testCommandLineWithEmptyTag()
         throws Exception
     {
         testCommandLine( "scm:svn:http://foo.com/svn/trunk", "svn --non-interactive commit " + messageFileString );
     }
 
+    @Test
     public void testCommandLineWithoutTag()
         throws Exception
     {
         testCommandLine( "scm:svn:http://foo.com/svn/trunk", "svn --non-interactive commit " + messageFileString );
     }
 
+    @Test
     public void testCommandLineTag()
         throws Exception
     {
@@ -76,13 +80,15 @@ public class SvnCheckInCommandTest
                          "svn --username anonymous --no-auth-cache --non-interactive commit " + messageFileString );
     }
 
+    @Test
     public void testCommandLineWithUsernameAndTag()
         throws Exception
     {
         testCommandLine( "scm:svn:http://anonymous@foo.com/svn/trunk",
                          "svn --username anonymous --no-auth-cache --non-interactive commit " + messageFileString );
     }
-    
+
+    @Test
     public void testCommandLineWithUsernameWithoutNonInteractive()
         throws Exception
     {
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/checkout/SvnCheckOutCommandTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java
index 8c7300171..c49f8f435 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java
@@ -27,6 +27,7 @@ import org.apache.maven.scm.repository.ScmRepository;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.cli.Commandline;
 import org.junit.Before;
+import org.junit.Test;
 
 import java.io.File;
 
@@ -64,6 +65,7 @@ public class SvnCheckOutCommandTest
     //
     // ----------------------------------------------------------------------
 
+    @Test
     public void testCommandLineWithoutRevision()
         throws Exception
     {
@@ -72,6 +74,7 @@ public class SvnCheckOutCommandTest
                              + workingDirectory.getAbsolutePath() );
     }
 
+    @Test
     public void testCommandLineWithEmptyRevision()
         throws Exception
     {
@@ -80,6 +83,7 @@ public class SvnCheckOutCommandTest
                              + workingDirectory.getAbsolutePath() );
     }
 
+    @Test
     public void testCommandLineWithRevision()
         throws Exception
     {
@@ -88,6 +92,7 @@ public class SvnCheckOutCommandTest
                              + workingDirectory.getAbsolutePath() );
     }
 
+    @Test
     public void testRecursiveCheckOutCommandLine()
         throws Exception
     {
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/export/SvnExportCommandTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/export/SvnExportCommandTest.java
index 4c702e489..307fa1d6c 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/export/SvnExportCommandTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/export/SvnExportCommandTest.java
@@ -25,11 +25,13 @@ import org.apache.maven.scm.ScmTestCase;
 import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.codehaus.plexus.util.cli.Commandline;
+import org.junit.Test;
 
 public class SvnExportCommandTest
     extends ScmTestCase
 {
 
+    @Test
     public void testGetExportCommandLineWithImplicitExportDirectory()
         throws Exception
     {
@@ -39,6 +41,7 @@ public class SvnExportCommandTest
                          "svn --non-interactive export --force http://foo.com/svn/trunk@" );
     }
 
+    @Test
     public void testGetExportCommandLineWithExplicitExportDirectory()
         throws Exception
     {
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/info/SvnInfoCommandTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommandTest.java
index b9221a0db..137c5cb30 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommandTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommandTest.java
@@ -26,11 +26,13 @@ import org.apache.maven.scm.ScmTestCase;
 import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.codehaus.plexus.util.cli.Commandline;
+import org.junit.Test;
 
 public class SvnInfoCommandTest
     extends ScmTestCase
 {
 
+    @Test
     public void testGetInfoOnEmptyFileSet()
         throws Exception
     {
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/list/SvnListCommandTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/list/SvnListCommandTest.java
index 7e57b7acb..5d50c84ae 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/list/SvnListCommandTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/list/SvnListCommandTest.java
@@ -25,6 +25,7 @@ import org.apache.maven.scm.ScmTestCase;
 import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.codehaus.plexus.util.cli.Commandline;
+import org.junit.Test;
 
 import java.io.File;
 
@@ -35,24 +36,28 @@ import java.io.File;
 public class SvnListCommandTest
     extends ScmTestCase
 {
+    @Test
     public void testCommandLineWithEmptyTag()
         throws Exception
     {
         testCommandLine( "scm:svn:http://foo.com/svn/trunk", true, "svn --non-interactive list --recursive" );
     }
 
+    @Test
     public void testCommandLineWithWhitespaceTag()
         throws Exception
     {
         testCommandLine( "scm:svn:http://foo.com/svn/trunk", false, "svn --non-interactive list" );
     }
 
+    @Test
     public void testCommandLineWithoutTag()
         throws Exception
     {
         testCommandLine( "scm:svn:http://foo.com/svn/trunk", false, "svn --non-interactive list" );
     }
 
+    @Test
     public void testCommandLineTag()
         throws Exception
     {
@@ -60,6 +65,7 @@ public class SvnListCommandTest
                          "svn --username anonymous --no-auth-cache --non-interactive list -r 10" );
     }
 
+    @Test
     public void testCommandLineWithUsernameAndTag()
         throws Exception
     {
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/tag/SvnExeTagCommandTckTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java
index 30c2b5677..edc74925f 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java
@@ -26,6 +26,7 @@ import org.apache.maven.scm.provider.svn.command.tag.SvnTagCommandTckTest;
 import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.codehaus.plexus.util.cli.Commandline;
+import org.junit.Test;
 
 /**
  * This test tests the tag command.
@@ -36,6 +37,7 @@ import org.codehaus.plexus.util.cli.Commandline;
 public class SvnExeTagCommandTckTest
     extends SvnTagCommandTckTest
 {
+    @Test
     public void testTagUserNameSvnSsh()
         throws Exception
     {
@@ -47,6 +49,7 @@ public class SvnExeTagCommandTckTest
                              " --encoding UTF-8 --parents . svn+ssh://user@foo.com/svn/tags/svntag@", null );
     }
 
+    @Test
     public void testTagRemoteTagHttps()
         throws Exception
     {
@@ -61,6 +64,7 @@ public class SvnExeTagCommandTckTest
                              + " --encoding UTF-8 --parents https://foo.com/svn/trunk@ https://foo.com/svn/tags/svntag@", scmTagParameters );
     }
 
+    @Test
     public void testTagRemoteTagHttpsWithPinExternals()
         throws Exception
     {
@@ -75,6 +79,7 @@ public class SvnExeTagCommandTckTest
                              + " --encoding UTF-8 --parents --pin-externals https://foo.com/svn/trunk@ https://foo.com/svn/tags/svntag@", scmTagParameters );
     }
 
+    @Test
     public void testTagRemoteTagHttpsWithRevision()
         throws Exception
     {
@@ -91,6 +96,7 @@ public class SvnExeTagCommandTckTest
                          scmTagParameters );
     }
 
+    @Test
     public void testTagRemoteTagHttpsWithRevisionAndPinExternals()
         throws Exception
     {
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/untag/SvnExeUntagCommandTckTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/untag/SvnExeUntagCommandTckTest.java
index 8dc0f6952..cae35dfbe 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/untag/SvnExeUntagCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/untag/SvnExeUntagCommandTckTest.java
@@ -26,6 +26,7 @@ import org.apache.maven.scm.provider.svn.command.untag.SvnUntagCommandTckTest;
 import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.codehaus.plexus.util.cli.Commandline;
+import org.junit.Test;
 
 /**
  * This test tests the untag command for Subversion.
@@ -39,6 +40,7 @@ public class SvnExeUntagCommandTckTest
      *
      * @throws Exception in case of error
      */
+    @Test
     public void testUntagSsh()
         throws Exception
     {
@@ -57,6 +59,7 @@ public class SvnExeUntagCommandTckTest
      *
      * @throws Exception in case of error
      */
+    @Test
     public void testUntagHttps()
         throws Exception
     {
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/untag/SvnUntagCommandTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/untag/SvnUntagCommandTest.java
index 7838a0c45..a503b0c31 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/untag/SvnUntagCommandTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/untag/SvnUntagCommandTest.java
@@ -26,6 +26,7 @@ import org.codehaus.plexus.util.cli.Commandline;
 
 import java.io.File;
 import org.apache.maven.scm.ScmFileSet;
+import org.junit.Test;
 
 /**
  * test the subversion untag implementation
@@ -40,6 +41,7 @@ public class SvnUntagCommandTest
      *
      * @throws Exception in case of error
      */
+    @Test
     public void testUntagHttp()
         throws Exception
     {
@@ -57,6 +59,7 @@ public class SvnUntagCommandTest
      *
      * @throws Exception in case of error
      */
+    @Test
     public void testUntagSsh()
         throws Exception
     {
diff --git a/maven-scm-test/src/test/java/org/apache/maven/scm/manager/ScmManagerStubTest.java b/maven-scm-test/src/test/java/org/apache/maven/scm/manager/ScmManagerStubTest.java
index ce4ee013a..6d62901f3 100644
--- a/maven-scm-test/src/test/java/org/apache/maven/scm/manager/ScmManagerStubTest.java
+++ b/maven-scm-test/src/test/java/org/apache/maven/scm/manager/ScmManagerStubTest.java
@@ -19,16 +19,19 @@ package org.apache.maven.scm.manager;
  * under the License.
  */
 
-import junit.framework.TestCase;
 import org.apache.maven.scm.provider.ScmProvider;
 import org.apache.maven.scm.provider.ScmProviderStub;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.apache.maven.scm.repository.ScmRepositoryStub;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.junit.Assert.assertSame;
+
 /**
  * Test for the ScmManagerStub
  *
@@ -36,7 +39,6 @@ import java.util.List;
  *
  */
 public class ScmManagerStubTest
-    extends TestCase
 {
 
     private ScmManagerStub scmManagerStub;
@@ -47,11 +49,10 @@ public class ScmManagerStubTest
 
     private ScmRepository scmRepository;
 
-    protected void setUp()
+    @Before
+    public void setUp()
         throws Exception
     {
-        super.setUp();
-
         messages = new ArrayList<>( 0 );
         scmProvider = new ScmProviderStub();
         scmRepository = new ScmRepositoryStub();
@@ -65,6 +66,7 @@ public class ScmManagerStubTest
     /*
      * Test method for 'org.apache.maven.scm.manager.ScmManagerStub.makeScmRepository(String)'
      */
+    @Test
     public void testMakeScmRepository()
         throws Exception
     {
@@ -75,6 +77,7 @@ public class ScmManagerStubTest
     /*
      * Test method for 'org.apache.maven.scm.manager.ScmManagerStub.makeProviderScmRepository(String, File)'
      */
+    @Test
     public void testMakeProviderScmRepository()
         throws Exception
     {
@@ -85,6 +88,7 @@ public class ScmManagerStubTest
     /*
      * Test method for 'org.apache.maven.scm.manager.ScmManagerStub.validateScmRepository(String)'
      */
+    @Test
     public void testValidateScmRepository()
     {
         List<String> list = scmManagerStub.validateScmRepository( "" );
@@ -94,6 +98,7 @@ public class ScmManagerStubTest
     /*
      * Test method for 'org.apache.maven.scm.manager.ScmManagerStub.getProviderByUrl(String)'
      */
+    @Test
     public void testGetProviderByUrl()
         throws Exception
     {
@@ -104,6 +109,7 @@ public class ScmManagerStubTest
     /*
      * Test method for 'org.apache.maven.scm.manager.ScmManagerStub.getProviderByType(String)'
      */
+    @Test
     public void testGetProviderByType()
         throws Exception
     {
@@ -114,6 +120,7 @@ public class ScmManagerStubTest
     /*
      * Test method for 'org.apache.maven.scm.manager.ScmManagerStub.getProviderByRepository(ScmRepository)'
      */
+    @Test
     public void testGetProviderByRepository()
         throws Exception
     {