From 128448f704c5c67f4bec3591d4e65cce2158d824 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sun, 2 Nov 2025 12:54:30 +0000 Subject: [PATCH] JUnit Jupiter migration from JUnit 4.x Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.java.testing.junit5.JUnit4to5Migration?organizationId=QUxML09wZW4gU291cmNlL05ldGZsaXggKyBTcHJpbmcgKyBBcGFjaGUvQXBhY2hlL0FwYWNoZSBNYXZlbg%3D%3D Co-authored-by: Moderne --- maven-scm-api/pom.xml | 5 -- .../org/apache/maven/scm/ChangeFileTest.java | 6 +- .../org/apache/maven/scm/ChangeSetTest.java | 42 ++++++------ .../org/apache/maven/scm/ScmFileSetTest.java | 12 ++-- .../org/apache/maven/scm/ScmResultTest.java | 14 ++-- .../maven/scm/manager/ScmManagerTest.java | 4 +- .../maven/scm/provider/ScmUrlUtilsTest.java | 8 +-- .../maven/scm/util/FilenameUtilsTest.java | 6 +- maven-scm-plugin/pom.xml | 26 +++++--- .../plugin/AbstractJUnit4MojoTestCase.java | 8 +-- .../maven/scm/plugin/BootstrapMojoTest.java | 11 ++-- .../maven/scm/plugin/BranchMojoTest.java | 11 ++-- .../maven/scm/plugin/ChangeLogMojoTest.java | 11 ++-- .../maven/scm/plugin/CheckoutMojoTest.java | 24 +++---- .../maven/scm/plugin/ExportMojoTest.java | 12 ++-- .../maven/scm/plugin/StatusMojoTest.java | 5 +- .../apache/maven/scm/plugin/TagMojoTest.java | 11 ++-- .../maven/scm/plugin/UntagMojoTest.java | 11 ++-- .../maven/scm/plugin/UpdateMojoTest.java | 9 +-- .../maven/scm/plugin/ValidateMojoTest.java | 8 +-- .../maven-scm-provider-hg/pom.xml | 6 -- .../maven/scm/provider/hg/HgUtilsTest.java | 6 +- .../command/blame/HgBlameCommandTckTest.java | 6 +- .../hg/command/diff/HgDiffCommandTckTest.java | 4 +- .../HgScmProviderRepositoryTest.java | 8 +-- .../maven-scm-provider-local/pom.xml | 6 -- .../provider/local/LocalScmProviderTest.java | 4 +- .../checkout/LocalCheckOutCommandTckTest.java | 8 +-- .../mkdir/LocalMkdirCommandTckTest.java | 10 +-- .../update/LocalUpdateCommandTckTest.java | 22 +++---- .../local/repository/LocalRepositoryTest.java | 14 ++-- .../maven-scm-provider-git-commons/pom.xml | 5 -- .../git/command/diff/GitDiffConsumerTest.java | 8 +-- .../GitScmProviderRepositoryTest.java | 42 ++++++------ .../maven-scm-provider-gitexe/pom.xml | 11 ++-- .../command/GitCommandLineUtilsTest.java | 18 +++--- .../command/add/GitExeAddCommandTest.java | 2 +- .../command/blame/GitBlameConsumerTest.java | 64 +++++++++---------- .../blame/GitExeBlameCommandTckTest.java | 6 +- .../changelog/GitChangeLogCommandTest.java | 6 +- .../changelog/GitChangeLogConsumerTest.java | 12 ++-- .../GitCheckInCommandNoBranchTest.java | 8 +-- .../checkin/GitCheckInCommandTest.java | 14 ++-- .../checkout/GitCheckOutCommandTest.java | 6 +- .../GitExeCheckOutCommandNoBranchTest.java | 8 +-- .../command/diff/GitDiffRawConsumerTest.java | 4 +- .../command/info/GitInfoCommandTest.java | 20 +++--- .../GitExeRemoteInfoCommandTckTest.java | 2 +- .../remoteinfo/GitRemoteInfoConsumerTest.java | 4 +- .../command/remove/GitRemoveCommandTest.java | 2 +- .../command/remove/GitRemoveConsumerTest.java | 6 +- .../command/status/GitStatusConsumerTest.java | 6 +- .../gitexe/command/tag/GitTagCommandTest.java | 6 +- .../GitLatestRevisionCommandConsumerTest.java | 6 +- .../command/update/GitUpdateCommandTest.java | 2 +- .../maven-scm-provider-gittest/pom.xml | 10 +-- .../scm/provider/git/GitScmTestUtils.java | 8 +-- .../branch/GitBranchCommandTckTest.java | 6 +- .../branch/GitSshBranchCommandTckTest.java | 17 +++-- .../changelog/GitChangeLogCommandTckTest.java | 34 +++++----- .../checkin/GitCheckInCommandTckTest.java | 8 +-- .../GitSshCheckOutCommandTckTest.java | 18 +++--- .../command/tag/GitSshTagCommandTckTest.java | 17 +++-- .../git/command/tag/GitTagCommandTckTest.java | 6 +- .../untag/GitSshUntagCommandTckTest.java | 17 +++-- .../command/untag/GitUntagCommandTckTest.java | 6 +- .../maven-scm-provider-jgit/pom.xml | 13 ++-- ...tCheckInCommandCommitterAuthorTckTest.java | 32 +++++----- .../JGitSshCheckOutCommandTckTest.java | 2 +- .../JGitRemoteInfoCommandTckTest.java | 2 +- .../maven-scm-provider-svn-commons/pom.xml | 5 -- .../scm/provider/svn/SvnCommandUtilsTest.java | 8 +-- .../provider/svn/SvnTagBranchUtilsTest.java | 8 +-- .../SvnScmProviderRepositoryTest.java | 38 +++++------ .../maven-scm-provider-svnexe/pom.xml | 11 ++-- .../svn/svnexe/SvnExeScmProviderTest.java | 16 ++--- .../command/SvnCommandLineUtilsTest.java | 6 +- .../blame/SvnExeBlameCommandTckTest.java | 2 +- .../branch/SvnExeBranchCommandTckTest.java | 2 +- .../changelog/SvnChangeLogCommandTest.java | 2 +- .../changelog/SvnChangeLogConsumerTest.java | 36 +++++------ .../checkin/SvnCheckInCommandTest.java | 6 +- .../checkout/SvnCheckOutCommandTest.java | 6 +- .../checkout/SvnCheckOutConsumerTest.java | 6 +- .../command/export/SvnExportCommandTest.java | 2 +- .../command/info/SvnInfoCommandTest.java | 2 +- .../command/info/SvnInfoConsumerTest.java | 4 +- .../command/list/SvnListCommandTest.java | 2 +- .../command/mkdir/SvnMkdirCommandTest.java | 12 ++-- ...bstractSvnExeRemoteInfoCommandTckTest.java | 2 +- .../remoteinfo/SvnRemoteInfoCommandTest.java | 6 +- .../command/tag/SvnExeTagCommandTckTest.java | 2 +- .../untag/SvnExeUntagCommandTckTest.java | 2 +- .../command/untag/SvnUntagCommandTest.java | 2 +- .../command/update/SvnUpdateCommandTest.java | 4 +- .../maven-scm-provider-svntest/pom.xml | 10 +-- .../scm/provider/svn/SvnScmTestUtils.java | 20 +++--- .../command/blame/SvnBlameCommandTckTest.java | 4 +- .../command/mkdir/SvnMkdirCommandTckTest.java | 12 ++-- maven-scm-providers/pom.xml | 6 ++ maven-scm-test/pom.xml | 11 ++-- .../maven/scm/PlexusJUnit4TestCase.java | 27 ++++---- .../org/apache/maven/scm/ScmTckTestCase.java | 28 ++++---- .../org/apache/maven/scm/ScmTestCase.java | 24 +++---- .../command/blame/BlameCommandTckTest.java | 34 +++++----- .../command/branch/BranchCommandTckTest.java | 14 ++-- .../changelog/ChangeLogCommandTckTest.java | 10 +-- .../checkin/CheckInCommandTckTest.java | 50 +++++++-------- .../checkout/CheckOutCommandTckTest.java | 10 +-- .../tck/command/diff/DiffCommandTckTest.java | 14 ++-- .../tck/command/info/InfoCommandTckTest.java | 4 +- .../tck/command/list/ListCommandTckTest.java | 18 +++--- .../command/mkdir/MkdirCommandTckTest.java | 8 +-- .../AbstractRemoteInfoCommandTckTest.java | 2 +- .../command/remove/RemoveCommandTckTest.java | 12 ++-- .../command/status/StatusCommandTckTest.java | 20 +++--- .../tck/command/tag/TagCommandTckTest.java | 14 ++-- .../command/untag/UntagCommandTckTest.java | 4 +- .../command/update/UpdateCommandTckTest.java | 26 ++++---- .../maven/scm/manager/ScmManagerStubTest.java | 8 +-- pom.xml | 2 +- 121 files changed, 687 insertions(+), 699 deletions(-) diff --git a/maven-scm-api/pom.xml b/maven-scm-api/pom.xml index 4678b80bb..1a4346b93 100644 --- a/maven-scm-api/pom.xml +++ b/maven-scm-api/pom.xml @@ -45,11 +45,6 @@ commons-lang3 3.19.0 - - junit - junit - test - org.slf4j slf4j-simple 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 809f3f69d..7bf68cc73 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 @@ -18,10 +18,10 @@ */ package org.apache.maven.scm; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; /** * @author Emmanuel Venisse 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 248abad8e..4ce3fb6e8 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 @@ -22,14 +22,14 @@ import java.util.Calendar; import java.util.Date; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.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; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests for the {@link ChangeSet}class @@ -46,7 +46,7 @@ public class ChangeSetTest { /** * Initialize per test data */ - @Before + @BeforeEach public void setUp() { instance = createInstance(); } @@ -67,7 +67,7 @@ private static ChangeSet createInstance() { public void testAddFileWithFile() { ChangeFile file = new ChangeFile("maven:dummy"); instance.addFile(file); - assertTrue("File name not found in list", instance.toString().indexOf("maven:dummy") != -1); + assertTrue(instance.toString().indexOf("maven:dummy") != -1, "File name not found in list"); assertTrue(instance.containsFilename("maven:")); assertTrue(instance.containsFilename(":dummy")); @@ -83,9 +83,9 @@ public void testAddFileWithFile() { public void testToString() { // dion, Mon Apr 01 00:00:00 EST 2002, comment String value = instance.toString(); - assertTrue("author not found in string", value.indexOf("dion") != -1); - assertTrue("comment not found in string", value.indexOf("comment") != -1); - assertTrue("date not found in string", value.indexOf("Mon Apr 01") != -1); + assertTrue(value.indexOf("dion") != -1, "author not found in string"); + assertTrue(value.indexOf("comment") != -1, "comment not found in string"); + assertTrue(value.indexOf("Mon Apr 01") != -1, "date not found in string"); } /** @@ -93,7 +93,7 @@ public void testToString() { */ @Test public void testGetAuthor() { - assertEquals("Author value not retrieved correctly", "dion", instance.getAuthor()); + assertEquals("dion", instance.getAuthor(), "Author value not retrieved correctly"); } /** @@ -102,7 +102,7 @@ public void testGetAuthor() { @Test public void testSetAuthor() { instance.setAuthor("maven:dion"); - assertEquals("Author not set correctly", "maven:dion", instance.getAuthor()); + assertEquals("maven:dion", instance.getAuthor(), "Author not set correctly"); } /** @@ -110,7 +110,7 @@ public void testSetAuthor() { */ @Test public void testGetComment() { - assertEquals("Comment value not retrieved correctly", "comment", instance.getComment()); + assertEquals("comment", instance.getComment(), "Comment value not retrieved correctly"); } /** @@ -119,7 +119,7 @@ public void testGetComment() { @Test public void testSetComment() { instance.setComment("maven:comment"); - assertEquals("Comment not set correctly", "maven:comment", instance.getComment()); + assertEquals("maven:comment", instance.getComment(), "Comment not set correctly"); } /** @@ -127,7 +127,7 @@ public void testSetComment() { */ @Test public void testGetDate() { - assertEquals("Date value not retrieved correctly", getDate(2002, 3, 1), instance.getDate()); + assertEquals(getDate(2002, 3, 1), instance.getDate(), "Date value not retrieved correctly"); } /** @@ -138,7 +138,7 @@ public void testSetDate() { Calendar cal = Calendar.getInstance(); Date date = cal.getTime(); instance.setDate(date); - assertEquals("Date value not set correctly", date, instance.getDate()); + assertEquals(date, instance.getDate(), "Date value not set correctly"); } /** @@ -147,7 +147,7 @@ public void testSetDate() { @Test public void testSetDateFromString() { instance.setDate("2002/03/04 00:00:00"); - assertEquals("Date value not set correctly from a string", getDate(2002, 2, 4), instance.getDate()); + assertEquals(getDate(2002, 2, 4), instance.getDate(), "Date value not set correctly from a string"); } /** @@ -155,7 +155,7 @@ public void testSetDateFromString() { */ @Test public void testGetDateFormatted() { - assertEquals("Date not formatted correctly", "2002-04-01", instance.getDateFormatted()); + assertEquals("2002-04-01", instance.getDateFormatted(), "Date not formatted correctly"); } /** @@ -163,7 +163,7 @@ public void testGetDateFormatted() { */ @Test public void testGetTimeFormatted() { - assertEquals("Time not formatted correctly", "00:00:00", instance.getTimeFormatted()); + assertEquals("00:00:00", instance.getTimeFormatted(), "Time not formatted correctly"); } public static Date getDate(int year, int month, int day) { 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 585499ac5..333de0dcc 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 @@ -23,11 +23,11 @@ import java.util.Iterator; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * @author dtran @@ -60,9 +60,9 @@ public void testFilesList() throws IOException { assertEquals("**/**", fileSet.getIncludes()); // assertEquals( ScmFileSet.DEFAULT_EXCLUDES, fileSet.getExcludes() ); assertTrue( + fileSet.getFileList().size() > 10, "List of files should be longer than 10 elements, but received: " - + fileSet.getFileList().size(), - fileSet.getFileList().size() > 10); + + fileSet.getFileList().size()); } @Test 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 b7d80fd16..07d39b13f 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 @@ -18,10 +18,10 @@ */ package org.apache.maven.scm; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ScmResultTest { @@ -38,11 +38,11 @@ public class ScmResultTest { @Test public void testPasswordsAreMaskedInOutput() throws Exception { ScmResult result = new ScmResult("git push", "git-push failed", MOCK_ERROR_OUTPUT, false); - assertNotSame("Command output contains password", MOCK_ERROR_OUTPUT, result.getCommandOutput()); - assertTrue("Command output not masked", result.getCommandOutput().contains(ScmResult.PASSWORD_PLACE_HOLDER)); + assertNotSame(MOCK_ERROR_OUTPUT, result.getCommandOutput(), "Command output contains password"); + assertTrue(result.getCommandOutput().contains(ScmResult.PASSWORD_PLACE_HOLDER), "Command output not masked"); result = new ScmResult("git push", "git-push failed", MOCK_ERROR_MULTILINE_OUTPUT, false); - assertNotSame("Command output contains password", MOCK_ERROR_MULTILINE_OUTPUT, result.getCommandOutput()); - assertTrue("Command output not masked", result.getCommandOutput().contains(ScmResult.PASSWORD_PLACE_HOLDER)); + assertNotSame(MOCK_ERROR_MULTILINE_OUTPUT, result.getCommandOutput(), "Command output contains password"); + assertTrue(result.getCommandOutput().contains(ScmResult.PASSWORD_PLACE_HOLDER), "Command output not masked"); } } 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 a5d94af2a..999d617fe 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 @@ -18,9 +18,9 @@ */ package org.apache.maven.scm.manager; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Emmanuel Venisse 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 507071b11..e2af518fe 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 @@ -18,11 +18,11 @@ */ package org.apache.maven.scm.provider; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Dennis Lundberg 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 ae40fc8e7..88860a7c1 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 @@ -18,10 +18,10 @@ */ package org.apache.maven.scm.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class FilenameUtilsTest { diff --git a/maven-scm-plugin/pom.xml b/maven-scm-plugin/pom.xml index bd57cb0ff..519be4d2a 100644 --- a/maven-scm-plugin/pom.xml +++ b/maven-scm-plugin/pom.xml @@ -136,14 +136,6 @@ 1 provided - - - - junit - junit - 4.13.2 - test - org.apache.maven.plugin-testing maven-plugin-testing-harness @@ -160,16 +152,34 @@ org.apache.maven.scm maven-scm-test test + + + junit + junit + + org.apache.maven.scm maven-scm-provider-svntest test + + + junit + junit + + org.apache.maven.scm maven-scm-provider-gittest test + + + junit + junit + + diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/AbstractJUnit4MojoTestCase.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/AbstractJUnit4MojoTestCase.java index a169c93a7..4986accfd 100644 --- a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/AbstractJUnit4MojoTestCase.java +++ b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/AbstractJUnit4MojoTestCase.java @@ -22,19 +22,19 @@ import org.apache.maven.plugin.testing.AbstractMojoTestCase; import org.apache.maven.scm.PlexusJUnit4TestCase; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; public abstract class AbstractJUnit4MojoTestCase extends AbstractMojoTestCase { private static final PlexusJUnit4TestCase PLEXUS_JUNIT4_TEST_CASE = new PlexusJUnit4TestCase(); - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); PLEXUS_JUNIT4_TEST_CASE.setUp(); } - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); PLEXUS_JUNIT4_TEST_CASE.tearDown(); diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/BootstrapMojoTest.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/BootstrapMojoTest.java index 888bf178d..a5763d267 100644 --- a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/BootstrapMojoTest.java +++ b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/BootstrapMojoTest.java @@ -21,10 +21,10 @@ import java.io.File; import org.codehaus.plexus.util.FileUtils; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Unit Test for BootstrapMojo @@ -32,7 +32,6 @@ * @author Arne Degenring * */ -@RunWith(JUnit4.class) public class BootstrapMojoTest extends AbstractJUnit4MojoTestCase { File checkoutDir; @@ -42,7 +41,7 @@ public class BootstrapMojoTest extends AbstractJUnit4MojoTestCase { BootstrapMojo bootstrapMojo; - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/BranchMojoTest.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/BranchMojoTest.java index 91bd82b4c..555374368 100644 --- a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/BranchMojoTest.java +++ b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/BranchMojoTest.java @@ -24,24 +24,23 @@ import org.apache.maven.scm.provider.svn.SvnScmTestUtils; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.StringUtils; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.apache.maven.scm.ScmTestCase.checkSystemCmdPresence; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Emmanuel Venisse * */ -@RunWith(JUnit4.class) public class BranchMojoTest extends AbstractJUnit4MojoTestCase { File checkoutDir; File repository; - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/ChangeLogMojoTest.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/ChangeLogMojoTest.java index 9d6805912..a41c40385 100644 --- a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/ChangeLogMojoTest.java +++ b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/ChangeLogMojoTest.java @@ -25,22 +25,21 @@ import org.apache.maven.scm.provider.svn.SvnScmTestUtils; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.StringUtils; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.apache.maven.scm.ScmTestCase.checkSystemCmdPresence; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; /** * @author Emmanuel Venisse * */ -@RunWith(JUnit4.class) public class ChangeLogMojoTest extends AbstractJUnit4MojoTestCase { File repository; - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/CheckoutMojoTest.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/CheckoutMojoTest.java index ac0823e38..f11af2cbe 100644 --- a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/CheckoutMojoTest.java +++ b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/CheckoutMojoTest.java @@ -25,25 +25,27 @@ import org.apache.maven.scm.provider.svn.SvnScmTestUtils; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.StringUtils; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.apache.maven.scm.ScmTestCase.checkSystemCmdPresence; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * @author Emmanuel Venisse * */ -@RunWith(JUnit4.class) public class CheckoutMojoTest extends AbstractJUnit4MojoTestCase { File checkoutDir; File repository; - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); @@ -165,14 +167,14 @@ public void testEncryptedPasswordFromSettings() throws Exception { (ScmProviderRepositoryWithHost) mojo.getScmRepository().getProviderRepository(); assertNotEquals( - "Raw encrypted Password was returned instead of the decrypted plaintext version", "{Ael0S2tnXv8H3X+gHKpZAvAA25D8+gmU2w2RrGaf5v8=}", - repo.getPassword()); + repo.getPassword(), + "Raw encrypted Password was returned instead of the decrypted plaintext version"); assertNotEquals( - "Raw encrypted Passphrase was returned instead of the decrypted plaintext version", "{7zK9P8hNVeUHbTsjiA/vnOs0zUXbND+9MBNPvdvl+x4=}", - repo.getPassphrase()); + repo.getPassphrase(), + "Raw encrypted Passphrase was returned instead of the decrypted plaintext version"); assertEquals("testuser", repo.getUser()); assertEquals("testpass", repo.getPassword()); diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/ExportMojoTest.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/ExportMojoTest.java index b940c545b..b308ae242 100644 --- a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/ExportMojoTest.java +++ b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/ExportMojoTest.java @@ -22,23 +22,23 @@ import org.apache.maven.scm.provider.svn.SvnScmTestUtils; import org.codehaus.plexus.util.FileUtils; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.apache.maven.scm.ScmTestCase.checkSystemCmdPresence; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * */ -@RunWith(JUnit4.class) public class ExportMojoTest extends AbstractJUnit4MojoTestCase { File exportDir; File repository; - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/StatusMojoTest.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/StatusMojoTest.java index 242dea07d..3661f567e 100644 --- a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/StatusMojoTest.java +++ b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/StatusMojoTest.java @@ -21,9 +21,7 @@ import java.io.File; import org.apache.maven.scm.provider.svn.SvnScmTestUtils; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; +import org.junit.jupiter.api.Test; import static org.apache.maven.scm.ScmTestCase.checkSystemCmdPresence; @@ -31,7 +29,6 @@ * @author Emmanuel Venisse * */ -@RunWith(JUnit4.class) public class StatusMojoTest extends AbstractJUnit4MojoTestCase { @Test public void testStatusMojo() throws Exception { diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/TagMojoTest.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/TagMojoTest.java index 0628c02a0..f171792e9 100644 --- a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/TagMojoTest.java +++ b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/TagMojoTest.java @@ -22,24 +22,23 @@ import org.apache.maven.scm.provider.svn.SvnScmTestUtils; import org.codehaus.plexus.util.FileUtils; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.apache.maven.scm.ScmTestCase.checkSystemCmdPresence; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Emmanuel Venisse * */ -@RunWith(JUnit4.class) public class TagMojoTest extends AbstractJUnit4MojoTestCase { File checkoutDir; File repository; - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UntagMojoTest.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UntagMojoTest.java index db2081482..ac9815cf3 100644 --- a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UntagMojoTest.java +++ b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UntagMojoTest.java @@ -24,20 +24,19 @@ import org.apache.maven.scm.provider.git.GitScmTestUtils; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.StringUtils; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.apache.maven.scm.ScmTestCase.checkSystemCmdPresence; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; -@RunWith(JUnit4.class) public class UntagMojoTest extends AbstractJUnit4MojoTestCase { File checkoutDir; File repository; - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UpdateMojoTest.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UpdateMojoTest.java index b5af852ef..fc76211fc 100644 --- a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UpdateMojoTest.java +++ b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UpdateMojoTest.java @@ -23,10 +23,8 @@ import org.apache.maven.scm.provider.svn.SvnScmTestUtils; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.StringUtils; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.apache.maven.scm.ScmTestCase.checkSystemCmdPresence; @@ -34,13 +32,12 @@ * @author Emmanuel Venisse * */ -@RunWith(JUnit4.class) public class UpdateMojoTest extends AbstractJUnit4MojoTestCase { File checkoutDir; File repository; - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/ValidateMojoTest.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/ValidateMojoTest.java index 5289b7cb8..c3c8b5efa 100644 --- a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/ValidateMojoTest.java +++ b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/ValidateMojoTest.java @@ -19,15 +19,15 @@ package org.apache.maven.scm.plugin; import org.apache.maven.plugin.MojoExecutionException; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; /** * @author Emmanuel Venisse * */ -@RunWith(JUnit4.class) public class ValidateMojoTest extends AbstractJUnit4MojoTestCase { @Test public void testValidateWithoutScmUrl() throws Exception { diff --git a/maven-scm-providers/maven-scm-provider-hg/pom.xml b/maven-scm-providers/maven-scm-provider-hg/pom.xml index 252def88e..f15ff8f9b 100644 --- a/maven-scm-providers/maven-scm-provider-hg/pom.xml +++ b/maven-scm-providers/maven-scm-provider-hg/pom.xml @@ -67,12 +67,6 @@ org.apache.commons commons-lang3 - - - junit - junit - test - diff --git a/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgUtilsTest.java b/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgUtilsTest.java index 875da5b5d..c3beeb71a 100644 --- a/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgUtilsTest.java +++ b/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgUtilsTest.java @@ -21,10 +21,10 @@ import org.apache.commons.lang3.StringUtils; import org.apache.maven.scm.provider.hg.command.HgCommandConstants; import org.codehaus.plexus.util.cli.Commandline; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class HgUtilsTest { 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 76cc78671..1496aeaeb 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 @@ -26,8 +26,8 @@ import org.apache.maven.scm.tck.command.blame.BlameCommandTckTest; import static org.apache.maven.scm.provider.hg.HgRepoUtils.HG_COMMAND_LINE; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; /** * @author Evgeny Mandrikov @@ -48,7 +48,7 @@ public void initRepo() throws Exception { protected void verifyResult(BlameScmResult result) { List lines = result.getLines(); - assertEquals("Expected 1 line in blame", 1, lines.size()); + assertEquals(1, lines.size(), "Expected 1 line in blame"); BlameLine line = lines.get(0); assertNotEquals("0", line.getRevision()); } diff --git a/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommandTckTest.java b/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommandTckTest.java index 5e9724fb8..e509400c4 100644 --- a/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommandTckTest.java +++ b/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommandTckTest.java @@ -27,10 +27,10 @@ import org.apache.maven.scm.provider.hg.HgRepoUtils; import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.scm.tck.command.diff.DiffCommandTckTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.maven.scm.provider.hg.HgRepoUtils.HG_COMMAND_LINE; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class HgDiffCommandTckTest extends DiffCommandTckTest { @Override 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 13c20e36f..4b21792e8 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 @@ -18,11 +18,11 @@ */ package org.apache.maven.scm.provider.hg.repository; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class HgScmProviderRepositoryTest { diff --git a/maven-scm-providers/maven-scm-provider-local/pom.xml b/maven-scm-providers/maven-scm-provider-local/pom.xml index a326585c2..cb569ccc5 100644 --- a/maven-scm-providers/maven-scm-provider-local/pom.xml +++ b/maven-scm-providers/maven-scm-provider-local/pom.xml @@ -52,12 +52,6 @@ org.apache.commons commons-lang3 - - - junit - junit - test - diff --git a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/LocalScmProviderTest.java b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/LocalScmProviderTest.java index 430640827..700b00103 100644 --- a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/LocalScmProviderTest.java +++ b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/LocalScmProviderTest.java @@ -19,9 +19,9 @@ package org.apache.maven.scm.provider.local; import org.apache.maven.scm.ScmTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Trygve Laugstøl diff --git a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java index d3cbbabfc..dee90d2b7 100644 --- a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java +++ b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java @@ -29,10 +29,10 @@ import org.apache.maven.scm.provider.local.metadata.io.xpp3.LocalScmMetadataXpp3Reader; import org.apache.maven.scm.tck.command.checkout.CheckOutCommandTckTest; import org.codehaus.plexus.util.FileUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Emmanuel Venisse @@ -78,7 +78,7 @@ public void testMetadata() throws Exception { // Assert metadata file // ---------------------------------------------------------------------- File metadataFile = new File(getWorkingCopy(), ".maven-scm-local"); - assertTrue("Expected metadata file .maven-scm-local does not exist", metadataFile.exists()); + assertTrue(metadataFile.exists(), "Expected metadata file .maven-scm-local does not exist"); try (Reader reader = Files.newBufferedReader(metadataFile.toPath()); ) { LocalScmMetadata metadata = new LocalScmMetadataXpp3Reader().read(reader); diff --git a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/mkdir/LocalMkdirCommandTckTest.java b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/mkdir/LocalMkdirCommandTckTest.java index 75ee92ac8..43d541dde 100644 --- a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/mkdir/LocalMkdirCommandTckTest.java +++ b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/mkdir/LocalMkdirCommandTckTest.java @@ -24,10 +24,10 @@ import org.apache.maven.scm.command.list.ListScmResult; import org.apache.maven.scm.command.mkdir.MkdirScmResult; import org.apache.maven.scm.tck.command.mkdir.MkdirCommandTckTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Maria Odea Ching @@ -66,7 +66,7 @@ public void testMkdirCommandMkdirUrl() throws Exception { ListScmResult listResult = getScmManager().list(getScmRepository(), fileSet, true, null); - assertTrue("Directory should have been found.", listResult.isSuccess()); + assertTrue(listResult.isSuccess(), "Directory should have been found."); } @Test @@ -79,7 +79,7 @@ public void testMkdirCommandDirAlreadyAdded() throws Exception { ListScmResult listResult = getScmManager().list(getScmRepository(), fileSet, true, null); - assertTrue("Directory should have been found.", listResult.isSuccess()); + assertTrue(listResult.isSuccess(), "Directory should have been found."); // add the directory again result = getScmManager().mkdir(getScmRepository(), fileSet, "Mkdir message", false); diff --git a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java index 1964f3c83..1e347ac3e 100644 --- a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java +++ b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java @@ -36,12 +36,12 @@ import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.scm.tck.command.update.UpdateCommandTckTest; import org.codehaus.plexus.util.FileUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Trygve Laugstøl @@ -79,7 +79,7 @@ public void testDeletion() throws Exception { // Delete readme.txt from repository File readmeFileRepo = new File(getRepositoryRoot(), MODULE_NAME + "/readme.txt"); assertTrue(readmeFileRepo.exists()); - assertTrue("Could not delete", readmeFileRepo.delete()); + assertTrue(readmeFileRepo.delete(), "Could not delete"); assertFalse(readmeFileRepo.exists()); // Make local addition to updating copy - this one must not be touched @@ -95,13 +95,13 @@ public void testDeletion() throws Exception { Thread.sleep(1000); UpdateScmResult result = scmManager.update(repository, new ScmFileSet(getUpdatingCopy()), lastUpdate); - assertNotNull("The command returned a null result.", result); + assertNotNull(result, "The command returned a null result."); assertResultIsSuccess(result); List updatedFiles = result.getUpdatedFiles(); - assertEquals("Expected 1 files in the updated files list " + updatedFiles, 1, updatedFiles.size()); + assertEquals(1, updatedFiles.size(), "Expected 1 files in the updated files list " + updatedFiles); // ---------------------------------------------------------------------- // Assert the files in the updated files list @@ -119,16 +119,16 @@ public void testDeletion() throws Exception { // ---------------------------------------------------------------------- // readme.txt - assertFalse("Expected local copy of readme.txt to be deleted", readmeFileLocal.exists()); + assertFalse(readmeFileLocal.exists(), "Expected local copy of readme.txt to be deleted"); // newfile.xml - assertTrue("Expected local copy of newfile.xml NOT to be deleted", newFileLocal.exists()); + assertTrue(newFileLocal.exists(), "Expected local copy of newfile.xml NOT to be deleted"); // ---------------------------------------------------------------------- // Assert metadata file // ---------------------------------------------------------------------- File metadataFile = new File(getUpdatingCopy(), ".maven-scm-local"); - assertTrue("Expected metadata file .maven-scm-local does not exist", metadataFile.exists()); + assertTrue(metadataFile.exists(), "Expected metadata file .maven-scm-local does not exist"); try (Reader reader = Files.newBufferedReader(metadataFile.toPath())) { LocalScmMetadata metadata = new LocalScmMetadataXpp3Reader().read(reader); File root = new File(getRepositoryRoot() + "/" + MODULE_NAME); 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 7adb6b95e..35c9e25b0 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 @@ -23,20 +23,20 @@ import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.scm.repository.ScmRepositoryException; import org.codehaus.plexus.util.FileUtils; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * @author Trygve Laugstøl * */ public class LocalRepositoryTest extends ScmTestCase { - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml index 164a02a1c..d7f2147e4 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml @@ -50,11 +50,6 @@ javax.inject test - - junit - junit - test - diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java index 224ff0822..a449eb504 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java @@ -26,11 +26,11 @@ import org.apache.maven.scm.ScmFileStatus; import org.apache.maven.scm.ScmTestCase; import org.apache.maven.scm.util.ConsumerUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Mark Struberg 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 50194c7af..9877b9dee 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 @@ -23,14 +23,14 @@ import org.apache.maven.scm.manager.ScmManager; import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.scm.repository.ScmRepositoryException; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * @author Emmanuel Venisse @@ -39,7 +39,7 @@ public class GitScmProviderRepositoryTest extends ScmTestCase { private ScmManager scmManager; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -422,7 +422,7 @@ public void testHttpFetchSshPushUrl() throws Exception { // X in fact this url is perfectly valid from a technical perspective // X it will be interpreted by git as git://file/tmp/git @Test - @Ignore + @Disabled public void nottestIllegalFileUrl() throws Exception { testIllegalUrl("file:/tmp/git"); } @@ -501,20 +501,20 @@ private GitScmProviderRepository testScmProviderRepository( String expectedHost, int expectedPort, GitScmProviderRepository providerRepository) { - assertEquals("fetch url is incorrect", expectedFetchUrl, providerRepository.getFetchUrl()); + assertEquals(expectedFetchUrl, providerRepository.getFetchUrl(), "fetch url is incorrect"); if (expectedPushUrl != null) { - assertEquals("push url is incorrect", expectedPushUrl, providerRepository.getPushUrl()); + assertEquals(expectedPushUrl, providerRepository.getPushUrl(), "push url is incorrect"); } - assertEquals("User is incorrect", expectedUser, providerRepository.getUser()); + assertEquals(expectedUser, providerRepository.getUser(), "User is incorrect"); - assertEquals("Password is incorrect", expectedPassword, providerRepository.getPassword()); + assertEquals(expectedPassword, providerRepository.getPassword(), "Password is incorrect"); - assertEquals("Host is incorrect", expectedHost == null ? "" : expectedHost, providerRepository.getHost()); + assertEquals(expectedHost == null ? "" : expectedHost, providerRepository.getHost(), "Host is incorrect"); if (expectedPort > 0) { - assertEquals("Port is incorrect", expectedPort, providerRepository.getPort()); + assertEquals(expectedPort, providerRepository.getPort(), "Port is incorrect"); } return providerRepository; @@ -524,18 +524,18 @@ private ScmRepository testScmRepository(String scmUrl, String expectedToString, throws ScmRepositoryException, NoSuchScmProviderException { ScmRepository repository = scmManager.makeScmRepository(scmUrl); - assertNotNull("ScmManager.makeScmRepository() returned null", repository); + assertNotNull(repository, "ScmManager.makeScmRepository() returned null"); - assertNotNull("The provider repository was null.", repository.getProviderRepository()); + assertNotNull(repository.getProviderRepository(), "The provider repository was null."); assertTrue( - "The SCM Repository isn't a " + GitScmProviderRepository.class.getName() + ".", - repository.getProviderRepository() instanceof GitScmProviderRepository); + repository.getProviderRepository() instanceof GitScmProviderRepository, + "The SCM Repository isn't a " + GitScmProviderRepository.class.getName() + "."); if (expectedToString != null) { - assertEquals("toString is incorrect", "git:" + expectedToString, repository.toString()); + assertEquals("git:" + expectedToString, repository.toString(), "toString is incorrect"); } else { - assertEquals("toString is incorrect", "git:" + expectedFetchUrl, repository.toString()); + assertEquals("git:" + expectedFetchUrl, repository.toString(), "toString is incorrect"); } return repository; diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml index b794d478c..f41451f99 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml @@ -67,11 +67,12 @@ org.apache.maven.scm maven-scm-provider-gittest test - - - junit - junit - test + + + junit + junit + + 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/GitCommandLineUtilsTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/GitCommandLineUtilsTest.java index a920fa569..0b14cb54b 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/GitCommandLineUtilsTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/GitCommandLineUtilsTest.java @@ -31,12 +31,12 @@ import org.apache.maven.scm.provider.git.util.GitUtil; import org.codehaus.plexus.util.Os; import org.codehaus.plexus.util.cli.Commandline; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * @author mfriedenhagen @@ -90,10 +90,10 @@ public void testPasswordAnonymous() throws Exception { // for (int i = 0; i < commandLineArgs.length; i++) { assertFalse( + commandLineArgs[i].contains(GitUtil.PASSWORD_PLACE_HOLDER_WITH_DELIMITERS), MessageFormat.format( "The target log message should not contain <{0}> but it contains <{1}>", - GitUtil.PASSWORD_PLACE_HOLDER_WITH_DELIMITERS, commandLineArgs[i]), - commandLineArgs[i].contains(GitUtil.PASSWORD_PLACE_HOLDER_WITH_DELIMITERS)); + GitUtil.PASSWORD_PLACE_HOLDER_WITH_DELIMITERS, commandLineArgs[i])); } final String scmUrlFakeForTest = "https://user" @@ -101,10 +101,10 @@ public void testPasswordAnonymous() throws Exception { .concat("foo.com/git/trunk"); assertTrue( + cl.toString().contains(scmUrlFakeForTest), MessageFormat.format( "The target log message should contain <{0}> but it contains <{1}>", - scmUrlFakeForTest, cl.toString()), - cl.toString().contains(scmUrlFakeForTest)); + scmUrlFakeForTest, cl.toString())); } @Test 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/add/GitExeAddCommandTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitExeAddCommandTest.java index 5cac3ed11..a15496410 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitExeAddCommandTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitExeAddCommandTest.java @@ -24,7 +24,7 @@ import org.apache.maven.scm.ScmTestCase; import org.codehaus.plexus.util.cli.Commandline; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Check if the {@code GitAddCommand#createCommandLine(File, List)} returns the correct 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/blame/GitBlameConsumerTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameConsumerTest.java index 314a9d59a..875b1983e 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameConsumerTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameConsumerTest.java @@ -30,10 +30,10 @@ import org.apache.maven.scm.ScmTestCase; import org.apache.maven.scm.command.blame.BlameLine; import org.apache.maven.scm.util.ConsumerUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Test the {@link GitBlameConsumer} in various different situations. @@ -45,24 +45,24 @@ public class GitBlameConsumerTest extends ScmTestCase { public void testConsumerEasy() throws Exception { GitBlameConsumer consumer = consumeFile("/src/test/resources/git/blame/git-blame-3.out"); - Assert.assertEquals(36, consumer.getLines().size()); + Assertions.assertEquals(36, consumer.getLines().size()); BlameLine blameLine = consumer.getLines().get(11); - Assert.assertEquals("e670863b2b03e158c59f34af1fee20f91b2bd852", blameLine.getRevision()); - Assert.assertEquals("Mark Struberg", blameLine.getAuthor()); - Assert.assertNotNull(blameLine.getDate()); + Assertions.assertEquals("e670863b2b03e158c59f34af1fee20f91b2bd852", blameLine.getRevision()); + Assertions.assertEquals("Mark Struberg", blameLine.getAuthor()); + Assertions.assertNotNull(blameLine.getDate()); } @Test public void testConsumer() throws Exception { GitBlameConsumer consumer = consumeFile("/src/test/resources/git/blame/git-blame.out"); - Assert.assertEquals(187, consumer.getLines().size()); + Assertions.assertEquals(187, consumer.getLines().size()); BlameLine blameLine = consumer.getLines().get(11); - Assert.assertEquals("e670863b2b03e158c59f34af1fee20f91b2bd852", blameLine.getRevision()); - Assert.assertEquals("Mark Struberg", blameLine.getAuthor()); - Assert.assertNotNull(blameLine.getDate()); + Assertions.assertEquals("e670863b2b03e158c59f34af1fee20f91b2bd852", blameLine.getRevision()); + Assertions.assertEquals("Mark Struberg", blameLine.getAuthor()); + Assertions.assertNotNull(blameLine.getDate()); } /** @@ -73,7 +73,7 @@ public void testConsumer() throws Exception { public void testConsumerEmptyFile() throws Exception { GitBlameConsumer consumer = consumeFile("/src/test/resources/git/blame/git-blame-empty.out"); - Assert.assertEquals(0, consumer.getLines().size()); + Assertions.assertEquals(0, consumer.getLines().size()); } /** @@ -84,11 +84,11 @@ public void testConsumerEmptyFile() throws Exception { public void testConsumerOnNewFile() throws Exception { GitBlameConsumer consumer = consumeFile("/src/test/resources/git/blame/git-blame-new-file.out"); - Assert.assertEquals(3, consumer.getLines().size()); + Assertions.assertEquals(3, consumer.getLines().size()); BlameLine blameLine = consumer.getLines().get(0); - Assert.assertNotNull(blameLine); - Assert.assertEquals("0000000000000000000000000000000000000000", blameLine.getRevision()); - Assert.assertEquals("Not Committed Yet", blameLine.getAuthor()); + Assertions.assertNotNull(blameLine); + Assertions.assertEquals("0000000000000000000000000000000000000000", blameLine.getRevision()); + Assertions.assertEquals("Not Committed Yet", blameLine.getAuthor()); } /** @@ -98,18 +98,18 @@ public void testConsumerOnNewFile() throws Exception { public void testConsumerWithDifferentAuthor() throws Exception { GitBlameConsumer consumer = consumeFile("/src/test/resources/git/blame/git-blame-different-author.out"); - Assert.assertEquals(93, consumer.getLines().size()); + Assertions.assertEquals(93, consumer.getLines().size()); BlameLine blameLine = consumer.getLines().get(0); - Assert.assertNotNull(blameLine); - Assert.assertEquals("39574726d20f62023d39311e6032c7ab0a9d3cdb", blameLine.getRevision()); - Assert.assertEquals("Mark Struberg", blameLine.getAuthor()); - Assert.assertEquals("Mark Struberg", blameLine.getCommitter()); + Assertions.assertNotNull(blameLine); + Assertions.assertEquals("39574726d20f62023d39311e6032c7ab0a9d3cdb", blameLine.getRevision()); + Assertions.assertEquals("Mark Struberg", blameLine.getAuthor()); + Assertions.assertEquals("Mark Struberg", blameLine.getCommitter()); blameLine = consumer.getLines().get(12); - Assert.assertNotNull(blameLine); - Assert.assertEquals("41e5bc05953781a5702f597a1a36c55371b517d3", blameLine.getRevision()); - Assert.assertEquals("Another User", blameLine.getAuthor()); - Assert.assertEquals("Mark Struberg", blameLine.getCommitter()); + Assertions.assertNotNull(blameLine); + Assertions.assertEquals("41e5bc05953781a5702f597a1a36c55371b517d3", blameLine.getRevision()); + Assertions.assertEquals("Another User", blameLine.getAuthor()); + Assertions.assertEquals("Mark Struberg", blameLine.getCommitter()); } /** @@ -119,13 +119,13 @@ public void testConsumerWithDifferentAuthor() throws Exception { @Test public void testConsumerCompareWithOriginal() throws Exception { GitBlameConsumer consumer = consumeFile("/src/test/resources/git/blame/git-blame-2.out"); - Assert.assertNotNull(consumer); + Assertions.assertNotNull(consumer); List consumerLines = consumer.getLines(); Iterator consumerLineIt = consumerLines.iterator(); File compareWithFile = getTestFile("/src/test/resources/git/blame/git-blame-2.orig"); - Assert.assertNotNull(compareWithFile); + Assertions.assertNotNull(compareWithFile); try (BufferedReader r = new BufferedReader(new FileReader(compareWithFile))) { String line; @@ -139,14 +139,14 @@ public void testConsumerCompareWithOriginal() throws Exception { fail("GitBlameConsumer lines do not match the original output!"); } BlameLine blameLine = consumerLineIt.next(); - Assert.assertNotNull(blameLine); + Assertions.assertNotNull(blameLine); String[] parts = line.split("\t"); - Assert.assertEquals(3, parts.length); + Assertions.assertEquals(3, parts.length); - Assert.assertEquals("error in line " + lineNr, parts[0], blameLine.getRevision()); - Assert.assertEquals("error in line " + lineNr, parts[1], blameLine.getAuthor()); - Assert.assertEquals("error in line " + lineNr, parts[2], blameDateFormat.format(blameLine.getDate())); + Assertions.assertEquals(parts[0], blameLine.getRevision(), "error in line " + lineNr); + Assertions.assertEquals(parts[1], blameLine.getAuthor(), "error in line " + lineNr); + Assertions.assertEquals(parts[2], blameDateFormat.format(blameLine.getDate()), "error in line " + lineNr); lineNr++; } 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/blame/GitExeBlameCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitExeBlameCommandTckTest.java index e6d97abf7..afd5ecf8b 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitExeBlameCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitExeBlameCommandTckTest.java @@ -24,10 +24,10 @@ import org.apache.maven.scm.command.blame.BlameScmResult; import org.apache.maven.scm.provider.git.GitScmTestUtils; import org.apache.maven.scm.provider.git.command.blame.GitBlameCommandTckTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.maven.scm.provider.git.GitScmTestUtils.GIT_COMMAND_LINE; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Evgeny Mandrikov @@ -49,7 +49,7 @@ public void testBlameCommand() throws Exception { protected void verifyResult(BlameScmResult result) { List lines = result.getLines(); - assertEquals("Expected 1 line in blame", 1, lines.size()); + assertEquals(1, lines.size(), "Expected 1 line in blame"); BlameLine line = lines.get(0); assertEquals("Mark Struberg", line.getAuthor()); assertEquals("92f139dfec4d1dfb79c3cd2f94e83bf13129668b", line.getRevision()); 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/changelog/GitChangeLogCommandTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommandTest.java index 8ae2b5f80..d8d8327b9 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommandTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommandTest.java @@ -29,8 +29,8 @@ import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository; import org.apache.maven.scm.repository.ScmRepository; import org.codehaus.plexus.util.cli.Commandline; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Emmanuel Venisse @@ -39,7 +39,7 @@ public class GitChangeLogCommandTest extends ScmTestCase { private File workingDirectory; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); 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/changelog/GitChangeLogConsumerTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumerTest.java index 0a1b61c99..fdcaa09e3 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumerTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumerTest.java @@ -34,12 +34,12 @@ import org.apache.maven.scm.ScmFileStatus; import org.apache.maven.scm.ScmTestCase; import org.apache.maven.scm.util.ConsumerUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Mark Struberg @@ -137,7 +137,7 @@ public void testConsumer2() throws Exception { } } assertEquals( - "Action summary differs from expectations", "{modified=21, added=88, deleted=1}", summary.toString()); + "{modified=21, added=88, deleted=1}", summary.toString(), "Action summary differs from expectations"); assertEquals(8, modifications.size()); 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/GitCheckInCommandNoBranchTest.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/GitCheckInCommandNoBranchTest.java index 3fabe14b8..7f59ed149 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/GitCheckInCommandNoBranchTest.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/GitCheckInCommandNoBranchTest.java @@ -29,11 +29,11 @@ import org.apache.maven.scm.provider.git.GitScmTestUtils; import org.apache.maven.scm.repository.ScmRepository; import org.codehaus.plexus.util.FileUtils; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.apache.maven.scm.provider.git.GitScmTestUtils.GIT_COMMAND_LINE; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Bertrand Paquet @@ -42,7 +42,7 @@ public class GitCheckInCommandNoBranchTest extends ScmTestCase { private File workingDirectory; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); 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 a6c2ebaf6..c39e4425a 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 @@ -39,12 +39,12 @@ 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 org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.apache.maven.scm.provider.git.GitScmTestUtils.GIT_COMMAND_LINE; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeNoException; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assumptions.assumeNoException; /** * @author Trygve Laugstøl @@ -54,7 +54,7 @@ public class GitCheckInCommandTest extends ScmTestCase { private String messageFileString; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -141,8 +141,8 @@ public void testCheckinAfterRename() throws Exception { .checkIn(scmRepository, new ScmFileSet(checkedOutRepo), "moved wine.xml from foo/bar/ to foo/newbar/"); assertResultIsSuccess(checkInScmResult); assertTrue( - "Renamed file has not been commited!", - checkInScmResult.getCheckedInFiles().size() != 0); + checkInScmResult.getCheckedInFiles().size() != 0, + "Renamed file has not been commited!"); } // Test FileSet in configuration 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/checkout/GitCheckOutCommandTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommandTest.java index d5332854d..86396308b 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommandTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommandTest.java @@ -26,8 +26,8 @@ import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository; import org.apache.maven.scm.repository.ScmRepository; import org.codehaus.plexus.util.cli.Commandline; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Emmanuel Venisse @@ -40,7 +40,7 @@ public class GitCheckOutCommandTest extends ScmTestCase { // // ---------------------------------------------------------------------- - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); 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/checkout/GitExeCheckOutCommandNoBranchTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java index 55f50a9ce..81a2aa692 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java @@ -26,11 +26,11 @@ import org.apache.maven.scm.command.checkout.CheckOutScmResult; import org.apache.maven.scm.repository.ScmRepository; import org.codehaus.plexus.util.FileUtils; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.apache.maven.scm.provider.git.GitScmTestUtils.GIT_COMMAND_LINE; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Bertrand Paquet @@ -43,7 +43,7 @@ public class GitExeCheckOutCommandNoBranchTest extends ScmTestCase { private ScmRepository scmRepository; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); 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/diff/GitDiffRawConsumerTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/diff/GitDiffRawConsumerTest.java index d480242e1..7ff65cebf 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/diff/GitDiffRawConsumerTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/diff/GitDiffRawConsumerTest.java @@ -26,9 +26,9 @@ import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmTestCase; import org.codehaus.plexus.util.ReaderFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Mark Struberg 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/info/GitInfoCommandTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTest.java index 3cf5bca93..911c6156f 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTest.java @@ -28,12 +28,12 @@ import org.apache.maven.scm.provider.ScmProvider; import org.apache.maven.scm.provider.ScmProviderRepository; import org.apache.maven.scm.provider.git.GitScmTestUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.maven.scm.provider.git.GitScmTestUtils.GIT_COMMAND_LINE; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Olivier Lamy @@ -71,9 +71,9 @@ public void testInfoCommandWithShortRevision() throws Exception { InfoScmResult result = provider.info(repository, new ScmFileSet(getRepositoryRoot()), commandParameters); assertNotNull(result); assertEquals( - "revision must be short, exactly 6 digits ", "cd3c0d", - result.getInfoItems().get(0).getRevision()); + result.getInfoItems().get(0).getRevision(), + "revision must be short, exactly 6 digits "); } @Test @@ -90,9 +90,9 @@ public void testInfoCommandWithNegativeShortRevision() throws Exception { InfoScmResult result = provider.info(repository, new ScmFileSet(getRepositoryRoot()), commandParameters); assertNotNull(result); assertEquals( - "revision should not be short", "cd3c0dfacb65955e6fbb35c56cc5b1bf8ce4f767", - result.getInfoItems().get(0).getRevision()); + result.getInfoItems().get(0).getRevision(), + "revision should not be short"); } @Test @@ -109,8 +109,8 @@ public void testInfoCommandWithZeroShortRevision() throws Exception { InfoScmResult result = provider.info(repository, new ScmFileSet(getRepositoryRoot()), commandParameters); assertNotNull(result); assertTrue( - "revision should be not empty, minimum 4 (similar to git help rev-parse --short)", - result.getInfoItems().get(0).getRevision().length() >= 4); + result.getInfoItems().get(0).getRevision().length() >= 4, + "revision should be not empty, minimum 4 (similar to git help rev-parse --short)"); } protected File getRepositoryRoot() { 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/remoteinfo/GitExeRemoteInfoCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remoteinfo/GitExeRemoteInfoCommandTckTest.java index 32214e3ec..f59bc752a 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remoteinfo/GitExeRemoteInfoCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remoteinfo/GitExeRemoteInfoCommandTckTest.java @@ -23,7 +23,7 @@ import org.apache.maven.scm.provider.git.command.remoteinfo.AbstractGitRemoteInfoCommandTckTest; import static org.apache.maven.scm.provider.git.GitScmTestUtils.GIT_COMMAND_LINE; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Bertrand Paquet 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/remoteinfo/GitRemoteInfoConsumerTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remoteinfo/GitRemoteInfoConsumerTest.java index 61281641b..b09bf1ddf 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remoteinfo/GitRemoteInfoConsumerTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remoteinfo/GitRemoteInfoConsumerTest.java @@ -20,9 +20,9 @@ import org.apache.maven.scm.ScmTestCase; import org.apache.maven.scm.command.remoteinfo.RemoteInfoScmResult; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Bertrand Paquet 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/remove/GitRemoveCommandTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommandTest.java index 1c604a6d0..e6f4f1511 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommandTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommandTest.java @@ -26,7 +26,7 @@ import org.apache.maven.scm.ScmTestCase; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.cli.Commandline; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Mark Struberg 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/remove/GitRemoveConsumerTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumerTest.java index 9913e430f..850e21670 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumerTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumerTest.java @@ -26,10 +26,10 @@ import org.apache.maven.scm.ScmTestCase; import org.apache.maven.scm.provider.git.gitexe.command.status.GitStatusConsumer; import org.apache.maven.scm.util.ConsumerUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author Mark Struberg 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/status/GitStatusConsumerTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java index 012fc3a9b..08ad457b9 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java @@ -33,10 +33,10 @@ import org.apache.maven.scm.ScmFileSet; import org.apache.maven.scm.ScmFileStatus; import org.apache.maven.scm.ScmTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author Mark Struberg 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/tag/GitTagCommandTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommandTest.java index e0ca5d689..ba6b2864f 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommandTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommandTest.java @@ -25,8 +25,8 @@ import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository; import org.apache.maven.scm.repository.ScmRepository; import org.codehaus.plexus.util.cli.Commandline; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Mark Struberg @@ -36,7 +36,7 @@ public class GitTagCommandTest extends ScmTestCase { private String messageFileString; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); 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/update/GitLatestRevisionCommandConsumerTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitLatestRevisionCommandConsumerTest.java index 3a5d5b463..10d48be4a 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitLatestRevisionCommandConsumerTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitLatestRevisionCommandConsumerTest.java @@ -24,10 +24,10 @@ import org.apache.maven.scm.ScmTestCase; import org.codehaus.plexus.util.ReaderFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author Mark Struberg 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/update/GitUpdateCommandTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandTest.java index 92407ab93..2a9482ce8 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandTest.java @@ -26,7 +26,7 @@ import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository; import org.apache.maven.scm.repository.ScmRepository; import org.codehaus.plexus.util.cli.Commandline; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Mark Struberg diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml index 97a4a84bc..1fac61dde 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml @@ -35,6 +35,12 @@ org.apache.maven.scm maven-scm-test + + + junit + junit + + org.apache.maven.scm @@ -68,10 +74,6 @@ bcpkix-jdk15on 1.70 - - junit - junit - org.hamcrest hamcrest-core diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java index 43d0e1ac1..3fabfef45 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java @@ -26,7 +26,7 @@ import org.apache.maven.scm.PlexusJUnit4TestCase; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.cli.CommandLineException; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; /** * @author Trygve Laugstøl @@ -42,7 +42,7 @@ public static void initRepo(File repository, File workingDirectory, File asserti FileUtils.deleteDirectory(assertionDirectory); - Assert.assertTrue(assertionDirectory.mkdirs()); + Assertions.assertTrue(assertionDirectory.mkdirs()); } public static void initRepo(String source, File repository, File workingDirectory) throws IOException { @@ -51,7 +51,7 @@ public static void initRepo(String source, File repository, File workingDirector FileUtils.deleteDirectory(repository); - Assert.assertTrue(repository.mkdirs()); + Assertions.assertTrue(repository.mkdirs()); FileUtils.copyDirectoryStructure(src, repository); @@ -63,7 +63,7 @@ public static void initRepo(String source, File repository, File workingDirector FileUtils.deleteDirectory(workingDirectory); - Assert.assertTrue(workingDirectory.mkdirs()); + Assertions.assertTrue(workingDirectory.mkdirs()); } public static String getScmUrl(File repositoryRootFile, String provider) throws CommandLineException { diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitBranchCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitBranchCommandTckTest.java index 9d37f8c45..76609ebc7 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitBranchCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitBranchCommandTckTest.java @@ -26,9 +26,9 @@ import org.apache.maven.scm.provider.git.GitScmTestUtils; import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.scm.tck.command.branch.BranchCommandTckTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; /** * @author Mark Struberg @@ -60,6 +60,6 @@ public void testPushBranchRejected() throws Exception { .getProviderByUrl(getScmUrl()) .branch(getScmRepository(), new ScmFileSet(getWorkingCopy()), branch); - assertFalse("Branch should not have been pushed", branchResult.isSuccess()); + assertFalse(branchResult.isSuccess(), "Branch should not have been pushed"); } } diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitSshBranchCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitSshBranchCommandTckTest.java index cfc0bffe4..86e10627c 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitSshBranchCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitSshBranchCommandTckTest.java @@ -28,16 +28,15 @@ import org.apache.maven.scm.provider.git.GitSshServer; import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.scm.tck.command.branch.BranchCommandTckTest; -import org.junit.Assume; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public abstract class GitSshBranchCommandTckTest extends BranchCommandTckTest { protected final GitSshServer gitSshServer; - @Rule - public TemporaryFolder tmpDirectory = new TemporaryFolder(); + @TempDir + public File tmpDirectory; protected GitSshBranchCommandTckTest() throws GeneralSecurityException { gitSshServer = new GitSshServer(); @@ -56,7 +55,7 @@ public void configureCredentials(ScmRepository repository, String passphrase) th ScmProviderRepositoryWithHost providerRepository = ScmProviderRepositoryWithHost.class.cast(repository.getProviderRepository()); // store as file - Path privateKeyFile = tmpDirectory.newFile().toPath(); + Path privateKeyFile = File.createTempFile("junit", null, tmpDirectory).toPath(); gitSshServer.writePrivateKeyAsPkcs8(privateKeyFile, passphrase); providerRepository.setPrivateKey(privateKeyFile.toString()); providerRepository.setPassphrase(passphrase); // may be null @@ -98,8 +97,8 @@ public void testBranchCommandTestWithPush() throws Exception { @Test public void testBranchCommandWithPassphraseAndPushTest() throws Exception { // TODO: currently no easy way to pass passphrase in gitexe - Assume.assumeTrue( - "Ignore test with passphrase for provider " + getScmProvider(), "jgit".equals(getScmProvider())); + Assumptions.assumeTrue( + "jgit".equals(getScmProvider()), "Ignore test with passphrase for provider " + getScmProvider()); configureCredentials(getScmRepository(), "mySecret"); getScmRepository().getProviderRepository().setPushChanges(true); super.testBranchCommandTest(); diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/changelog/GitChangeLogCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/changelog/GitChangeLogCommandTckTest.java index e005c4b00..fcf9a0867 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/changelog/GitChangeLogCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/changelog/GitChangeLogCommandTckTest.java @@ -34,11 +34,11 @@ import org.apache.maven.scm.provider.git.GitScmTestUtils; import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.scm.tck.command.changelog.ChangeLogCommandTckTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Mark Struberg @@ -78,9 +78,9 @@ public void testChangeLogCommandFromHeadAncestorAndHead() throws Exception { List logEntries = changelogResult.getChangeLog().getChangeSets(); assertEquals( - String.format("changelog for %s..%s returned bad number of commits", startVersion, endVersion), 1, - logEntries.size()); + logEntries.size(), + String.format("changelog for %s..%s returned bad number of commits", startVersion, endVersion)); assertThat("bad head commit SHA1 retrieved", logEntries.get(0).getRevision(), startsWith("464921b")); } @@ -101,9 +101,9 @@ public void testChangeLogCommandFromHeadToHead() throws Exception { List logEntries = changelogResult.getChangeLog().getChangeSets(); assertEquals( - String.format("changelog for %s..%s returned bad number of commits", startVersion, endVersion), 0, - logEntries.size()); + logEntries.size(), + String.format("changelog for %s..%s returned bad number of commits", startVersion, endVersion)); } @Test @@ -120,7 +120,7 @@ public void testChangeLogCommandFromUndefinedToHead() throws Exception { List logEntries = changelogResult.getChangeLog().getChangeSets(); assertEquals( - String.format("changelog for ..%s returned bad number of commits", endVersion), 0, logEntries.size()); + 0, logEntries.size(), String.format("changelog for ..%s returned bad number of commits", endVersion)); } @Test @@ -137,7 +137,7 @@ public void testChangeLogCommandFromVersionToUndefined() throws Exception { List logEntries = changelogResult.getChangeLog().getChangeSets(); assertEquals( - String.format("changelog for %s.. returned bad number of commits", startVersion), 2, logEntries.size()); + 2, logEntries.size(), String.format("changelog for %s.. returned bad number of commits", startVersion)); assertThat("bad commit SHA1 retrieved", logEntries.get(0).getRevision(), startsWith("464921b")); assertThat("bad commit SHA1 retrieved", logEntries.get(1).getRevision(), startsWith("db46d63")); @@ -159,7 +159,7 @@ public void testChangeLogCommandFromVoneToVtwo() throws Exception { List logEntries = changelogResult.getChangeLog().getChangeSets(); assertEquals( - String.format("changelog for %s.. returned bad number of commits", startVersion), 2, logEntries.size()); + 2, logEntries.size(), String.format("changelog for %s.. returned bad number of commits", startVersion)); assertThat("bad commit SHA1 retrieved", logEntries.get(0).getRevision(), startsWith("db46d63")); assertThat("bad commit SHA1 retrieved", logEntries.get(1).getRevision(), startsWith("e3864d9")); @@ -181,9 +181,9 @@ public void testChangeLogCommandWithStartEndInBadOrder() throws Exception { List logEntries = changelogResult.getChangeLog().getChangeSets(); assertEquals( - String.format("changelog for %s..%s should return no commits", startVersion, endVersion), 0, - logEntries.size()); + logEntries.size(), + String.format("changelog for %s..%s should return no commits", startVersion, endVersion)); } @Test @@ -199,7 +199,7 @@ public void testChangeLogCommandFromHeadToStartOfRepository() throws Exception { ChangeLogScmResult changelogResult = provider.changeLog(clr); List logEntries = changelogResult.getChangeLog().getChangeSets(); - assertEquals(String.format("changelog for %s returned bad number of commits", version), 5, logEntries.size()); + assertEquals(5, logEntries.size(), String.format("changelog for %s returned bad number of commits", version)); } @Test @@ -215,7 +215,7 @@ public void testChangeLogCommandFromVersionToStartOfRepository() throws Exceptio ChangeLogScmResult changelogResult = provider.changeLog(clr); List logEntries = changelogResult.getChangeLog().getChangeSets(); - assertEquals(String.format("changelog for %s returned bad number of commits", version), 4, logEntries.size()); + assertEquals(4, logEntries.size(), String.format("changelog for %s returned bad number of commits", version)); assertThat("bad commit SHA1 retrieved", logEntries.get(0).getRevision(), startsWith("db46d63")); assertThat("bad commit SHA1 retrieved", logEntries.get(1).getRevision(), startsWith("e3864d9")); @@ -226,10 +226,10 @@ public void testChangeLogCommandFromVersionToStartOfRepository() throws Exceptio List tags2 = Collections.singletonList("Tag2"); List noTags = Collections.emptyList(); - assertEquals("Incorrect tags found", tags4, sorted(logEntries.get(0).getTags())); - assertEquals("Incorrect tags found", noTags, sorted(logEntries.get(1).getTags())); - assertEquals("Incorrect tags found", tags2, sorted(logEntries.get(2).getTags())); - assertEquals("Incorrect tags found", noTags, sorted(logEntries.get(3).getTags())); + assertEquals(tags4, sorted(logEntries.get(0).getTags()), "Incorrect tags found"); + assertEquals(noTags, sorted(logEntries.get(1).getTags()), "Incorrect tags found"); + assertEquals(tags2, sorted(logEntries.get(2).getTags()), "Incorrect tags found"); + assertEquals(noTags, sorted(logEntries.get(3).getTags()), "Incorrect tags found"); } private List sorted(List input) { diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java index d13411010..183d9582c 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java @@ -37,9 +37,9 @@ import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.scm.tck.command.checkin.CheckInCommandTckTest; import org.codehaus.plexus.util.FileUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; /** * @author Mark Struberg @@ -106,7 +106,7 @@ public void testRejectedNonFastForwardPush() throws Exception { CheckInScmResult checkInScmResult = getScmManager().checkIn(scmRepository, rejectedFileSet, commandParameters); assertFalse( - "check-in should have been rejected since fast forward was not possible", checkInScmResult.isSuccess()); + checkInScmResult.isSuccess(), "check-in should have been rejected since fast forward was not possible"); } @Test @@ -118,7 +118,7 @@ public void testCommitWithRejectingPreCommitHook() throws Exception { CheckInScmResult result = getScmManager().checkIn(getScmRepository(), addedFile, "Commit with pre-commit hook"); assertFalse( - "check-in should have been rejected since pre-push hook rejects all commits", result.isSuccess()); + result.isSuccess(), "check-in should have been rejected since pre-push hook rejects all commits"); } catch (ScmException e) { // some providers may use an exception to indicate a failed commit diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkout/GitSshCheckOutCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkout/GitSshCheckOutCommandTckTest.java index 335a42e9f..59f9292cc 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkout/GitSshCheckOutCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkout/GitSshCheckOutCommandTckTest.java @@ -18,6 +18,7 @@ */ package org.apache.maven.scm.provider.git.command.checkout; +import java.io.File; import java.nio.file.Path; import java.security.GeneralSecurityException; @@ -26,16 +27,15 @@ import org.apache.maven.scm.provider.git.GitSshServer; import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.scm.tck.command.checkout.CheckOutCommandTckTest; -import org.junit.Assume; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public abstract class GitSshCheckOutCommandTckTest extends CheckOutCommandTckTest { protected final GitSshServer gitSshServer; - @Rule - public TemporaryFolder tmpDirectory = new TemporaryFolder(); + @TempDir + public File tmpDirectory; protected GitSshCheckOutCommandTckTest() throws GeneralSecurityException { gitSshServer = new GitSshServer(); @@ -54,7 +54,7 @@ protected void configureCredentials(ScmRepository repository, String passphrase) ScmProviderRepositoryWithHost providerRepository = ScmProviderRepositoryWithHost.class.cast(repository.getProviderRepository()); // store as file - Path privateKeyFile = tmpDirectory.newFile().toPath(); + Path privateKeyFile = File.createTempFile("junit", null, tmpDirectory).toPath(); gitSshServer.writePrivateKeyAsPkcs8(privateKeyFile, passphrase); providerRepository.setPrivateKey(privateKeyFile.toString()); providerRepository.setPassphrase(passphrase); // may be null @@ -87,8 +87,8 @@ public void testCheckOutCommandTest() throws Exception { @Test public void testCheckOutCommandWithPassphraseTest() throws Exception { // TODO: currently no easy way to pass passphrase in gitexe - Assume.assumeTrue( - "Ignore test with passphrase for provider " + getScmProvider(), "jgit".equals(getScmProvider())); + Assumptions.assumeTrue( + "jgit".equals(getScmProvider()), "Ignore test with passphrase for provider " + getScmProvider()); configureCredentials(getScmRepository(), "mySecret"); super.testCheckOutCommandTest(); } diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitSshTagCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitSshTagCommandTckTest.java index 81d0c07f3..f94c55622 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitSshTagCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitSshTagCommandTckTest.java @@ -28,16 +28,15 @@ import org.apache.maven.scm.provider.git.GitSshServer; import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.scm.tck.command.tag.TagCommandTckTest; -import org.junit.Assume; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public abstract class GitSshTagCommandTckTest extends TagCommandTckTest { protected final GitSshServer gitSshServer; - @Rule - public TemporaryFolder tmpDirectory = new TemporaryFolder(); + @TempDir + public File tmpDirectory; protected GitSshTagCommandTckTest() throws GeneralSecurityException { gitSshServer = new GitSshServer(); @@ -57,7 +56,7 @@ protected void configureCredentials(ScmRepository repository, String passphrase) ScmProviderRepositoryWithHost providerRepository = ScmProviderRepositoryWithHost.class.cast(repository.getProviderRepository()); // store as file - Path privateKeyFile = tmpDirectory.newFile().toPath(); + Path privateKeyFile = File.createTempFile("junit", null, tmpDirectory).toPath(); gitSshServer.writePrivateKeyAsPkcs8(privateKeyFile, passphrase); providerRepository.setPrivateKey(privateKeyFile.toString()); providerRepository.setPassphrase(passphrase); // may be null @@ -99,8 +98,8 @@ public void testTagCommandTestWithPush() throws Exception { @Test public void testTagCommandWithPassphraseAndPushTest() throws Exception { // TODO: currently no easy way to pass passphrase in gitexe - Assume.assumeTrue( - "Ignore test with passphrase for provider " + getScmProvider(), "jgit".equals(getScmProvider())); + Assumptions.assumeTrue( + "jgit".equals(getScmProvider()), "Ignore test with passphrase for provider " + getScmProvider()); configureCredentials(getScmRepository(), "mySecret"); getScmRepository().getProviderRepository().setPushChanges(true); super.testTagCommandTest(); diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java index 0a9667cfc..84f3c0a47 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java @@ -26,9 +26,9 @@ import org.apache.maven.scm.provider.git.GitScmTestUtils; import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.scm.tck.command.tag.TagCommandTckTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; /** * @author Mark Struberg @@ -60,6 +60,6 @@ public void testPushTagRejected() throws Exception { .getProviderByUrl(getScmUrl()) .tag(getScmRepository(), new ScmFileSet(getWorkingCopy()), tag); - assertFalse("Tag should not have been pushed", tagResult.isSuccess()); + assertFalse(tagResult.isSuccess(), "Tag should not have been pushed"); } } diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/untag/GitSshUntagCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/untag/GitSshUntagCommandTckTest.java index fac3eb816..c89eb62e5 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/untag/GitSshUntagCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/untag/GitSshUntagCommandTckTest.java @@ -28,16 +28,15 @@ import org.apache.maven.scm.provider.git.GitSshServer; import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.scm.tck.command.untag.UntagCommandTckTest; -import org.junit.Assume; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public abstract class GitSshUntagCommandTckTest extends UntagCommandTckTest { protected final GitSshServer gitSshServer; - @Rule - public TemporaryFolder tmpDirectory = new TemporaryFolder(); + @TempDir + public File tmpDirectory; protected GitSshUntagCommandTckTest() throws GeneralSecurityException { gitSshServer = new GitSshServer(); @@ -56,7 +55,7 @@ protected void configureCredentials(ScmRepository repository, String passphrase) ScmProviderRepositoryWithHost providerRepository = ScmProviderRepositoryWithHost.class.cast(repository.getProviderRepository()); // store as file - Path privateKeyFile = tmpDirectory.newFile().toPath(); + Path privateKeyFile = File.createTempFile("junit", null, tmpDirectory).toPath(); gitSshServer.writePrivateKeyAsPkcs8(privateKeyFile, passphrase); providerRepository.setPrivateKey(privateKeyFile.toString()); providerRepository.setPassphrase(passphrase); // may be null @@ -98,8 +97,8 @@ public void testUntagCommandTestWithPush() throws Exception { @Test public void testUntagCommandWithPassphraseAndPushTest() throws Exception { // TODO: currently no easy way to pass passphrase in gitexe - Assume.assumeTrue( - "Ignore test with passphrase for provider " + getScmProvider(), "jgit".equals(getScmProvider())); + Assumptions.assumeTrue( + "jgit".equals(getScmProvider()), "Ignore test with passphrase for provider " + getScmProvider()); configureCredentials(getScmRepository(), "mySecret"); getScmRepository().getProviderRepository().setPushChanges(true); super.testUntagCommandTest(); diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/untag/GitUntagCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/untag/GitUntagCommandTckTest.java index 1791136d4..be20b97ec 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/untag/GitUntagCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/untag/GitUntagCommandTckTest.java @@ -31,9 +31,9 @@ import org.apache.maven.scm.provider.git.GitScmTestUtils; import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.scm.tck.command.untag.UntagCommandTckTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; /** * {@inheritDoc} @@ -71,6 +71,6 @@ public void testPushTagDeletionRejected() throws Exception { UntagScmResult untagResult = scmProvider.untag(scmRepository, files, params); - assertFalse("Tag deletion should not have been pushed", untagResult.isSuccess()); + assertFalse(untagResult.isSuccess(), "Tag deletion should not have been pushed"); } } diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/pom.xml b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/pom.xml index c9173a3eb..2ea9405c8 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/pom.xml +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/pom.xml @@ -92,17 +92,16 @@ org.apache.commons commons-lang3 - - - - junit - junit - test - org.apache.maven.scm maven-scm-provider-gittest test + + + junit + junit + + org.slf4j 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/checkin/JGitCheckInCommandCommitterAuthorTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandCommitterAuthorTckTest.java index 0369c214c..1506439b8 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandCommitterAuthorTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandCommitterAuthorTckTest.java @@ -45,21 +45,21 @@ import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.FileUtils; import org.eclipse.jgit.util.SystemReader; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Dominik Bartholdi (imod) */ public class JGitCheckInCommandCommitterAuthorTckTest extends GitCheckInCommandTckTest { - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -67,7 +67,7 @@ public void setUp() throws Exception { SystemReader.setInstance(new CustomSystemReader()); } - @After + @AfterEach @Override public void tearDown() throws Exception { super.tearDown(); @@ -94,7 +94,7 @@ protected void deleteDirectory(File directory) throws IOException { @Test public void testCheckInCommandTest() throws Exception { File fooJava = new File(getWorkingCopy(), "src/main/java/Foo.java"); - assertFalse("check Foo.java doesn't yet exist", fooJava.canRead()); + assertFalse(fooJava.canRead(), "check Foo.java doesn't yet exist"); Git git = Git.open(getWorkingCopy()); @@ -138,8 +138,8 @@ public void testCheckInCommandTest() throws Exception { head = getHeadCommit(git.getRepository()); assertEquals("dbartholdi", head.getCommitterIdent().getName()); assertFalse( - "no mail domain is configured, git system default should be used", - head.getCommitterIdent().getEmailAddress().contains("dbartholdi")); + head.getCommitterIdent().getEmailAddress().contains("dbartholdi"), + "no mail domain is configured, git system default should be used"); JGitUtils.closeRepo(git); // unset a user and maven user but set default mail domain @@ -210,11 +210,11 @@ public void testCheckInCommandTest() throws Exception { assertEquals("dundy", head.getCommitterIdent().getName()); assertEquals("dundy", head.getAuthorIdent().getName()); assertTrue( - "the maven user (from parameter) name must be in the committer mail when nothing else is configured", - head.getCommitterIdent().getEmailAddress().contains("dundy")); + head.getCommitterIdent().getEmailAddress().contains("dundy"), + "the maven user (from parameter) name must be in the committer mail when nothing else is configured"); assertTrue( - "the user name (from parameter) must be in the author mail when nothing else is configured", - head.getAuthorIdent().getEmailAddress().contains("dundy")); + head.getAuthorIdent().getEmailAddress().contains("dundy"), + "the user name (from parameter) must be in the author mail when nothing else is configured"); JGitUtils.closeRepo(git); // unset all configs 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/checkout/JGitSshCheckOutCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitSshCheckOutCommandTckTest.java index d5df098c9..c05294569 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitSshCheckOutCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitSshCheckOutCommandTckTest.java @@ -35,7 +35,7 @@ import org.apache.maven.scm.repository.ScmRepository; import org.apache.sshd.common.config.keys.PublicKeyEntry; import org.eclipse.jgit.util.FileUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** @author Mark Struberg */ public class JGitSshCheckOutCommandTckTest extends GitSshCheckOutCommandTckTest { 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/remoteinfo/JGitRemoteInfoCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remoteinfo/JGitRemoteInfoCommandTckTest.java index 63602a451..324a97606 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remoteinfo/JGitRemoteInfoCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remoteinfo/JGitRemoteInfoCommandTckTest.java @@ -28,7 +28,7 @@ import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository; import org.eclipse.jgit.util.FileUtils; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml index 1cb3ebc9f..42d867ca0 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml @@ -54,11 +54,6 @@ javax.inject test - - junit - junit - test - diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/SvnCommandUtilsTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/SvnCommandUtilsTest.java index 4e9cac122..70b5ca4a6 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/SvnCommandUtilsTest.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/SvnCommandUtilsTest.java @@ -19,11 +19,11 @@ package org.apache.maven.scm.provider.svn; import org.apache.maven.scm.ScmTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * @author Jerome Lacoste diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/SvnTagBranchUtilsTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/SvnTagBranchUtilsTest.java index a1834a97e..f9a24cf10 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/SvnTagBranchUtilsTest.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/SvnTagBranchUtilsTest.java @@ -24,11 +24,11 @@ import org.apache.maven.scm.ScmTestCase; import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository; import org.apache.maven.scm.repository.ScmRepository; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Emmanuel Venisse diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java index 690fbe5df..a49c2f696 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java @@ -22,13 +22,13 @@ import org.apache.maven.scm.manager.ScmManager; import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.scm.repository.ScmRepositoryException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * @author Emmanuel Venisse @@ -37,7 +37,7 @@ public class SvnScmProviderRepositoryTest extends ScmTestCase { private ScmManager scmManager; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -236,28 +236,28 @@ private void testUrl( throws Exception { ScmRepository repository = scmManager.makeScmRepository(scmUrl); - assertNotNull("ScmManager.makeScmRepository() returned null", repository); + assertNotNull(repository, "ScmManager.makeScmRepository() returned null"); - assertNotNull("The provider repository was null.", repository.getProviderRepository()); + assertNotNull(repository.getProviderRepository(), "The provider repository was null."); assertTrue( - "The SCM Repository isn't a " + SvnScmProviderRepository.class.getName() + ".", - repository.getProviderRepository() instanceof SvnScmProviderRepository); + repository.getProviderRepository() instanceof SvnScmProviderRepository, + "The SCM Repository isn't a " + SvnScmProviderRepository.class.getName() + "."); SvnScmProviderRepository providerRepository = (SvnScmProviderRepository) repository.getProviderRepository(); - assertEquals("url is incorrect", expectedUrl, providerRepository.getUrl()); + assertEquals(expectedUrl, providerRepository.getUrl(), "url is incorrect"); - assertEquals("url string is incorrect", "svn:" + expectedUrl, repository.toString()); + assertEquals("svn:" + expectedUrl, repository.toString(), "url string is incorrect"); - assertEquals("User is incorrect", expectedUser, providerRepository.getUser()); + assertEquals(expectedUser, providerRepository.getUser(), "User is incorrect"); - assertEquals("Password is incorrect", expectedPassword, providerRepository.getPassword()); + assertEquals(expectedPassword, providerRepository.getPassword(), "Password is incorrect"); assertEquals( - "Host is incorrect", expectedHost, - ((SvnScmProviderRepository) repository.getProviderRepository()).getHost()); + ((SvnScmProviderRepository) repository.getProviderRepository()).getHost(), + "Host is incorrect"); } private void testUrl(String scmUrl, String expectedUrl, String expectedUser, String expectedHost, int expectedPort) @@ -279,9 +279,9 @@ private void testUrl( ScmRepository repository = scmManager.makeScmRepository(scmUrl); assertEquals( - "Port is incorrect", expectedPort, - ((SvnScmProviderRepository) repository.getProviderRepository()).getPort()); + ((SvnScmProviderRepository) repository.getProviderRepository()).getPort(), + "Port is incorrect"); } private void testIllegalUrl(String url) throws Exception { diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml index cd64600ff..0d363f8b5 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml @@ -64,11 +64,12 @@ org.apache.maven.scm maven-scm-provider-svntest test - - - junit - junit - test + + + junit + junit + + org.mockito diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/SvnExeScmProviderTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/SvnExeScmProviderTest.java index 82b405d5d..a022996f7 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/SvnExeScmProviderTest.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/SvnExeScmProviderTest.java @@ -22,13 +22,13 @@ import org.apache.maven.scm.ScmException; import org.codehaus.plexus.util.Os; -import org.junit.Assume; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -36,16 +36,16 @@ public class SvnExeScmProviderTest { private SvnExeScmProvider scmProvider; - @Before + @BeforeEach public void onSetup() { scmProvider = new SvnExeScmProvider(); } // SCM-435 @Test - @Ignore("This test is for now ignore: it mock Logger and then asserts against it") + @Disabled("This test is for now ignore: it mock Logger and then asserts against it") public void testGetRepositoryURLWindows() throws Exception { - Assume.assumeTrue(Os.isFamily(Os.FAMILY_WINDOWS)); + Assumptions.assumeTrue(Os.isFamily(Os.FAMILY_WINDOWS)); // prepare Logger logger = mock(Logger.class); 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/SvnCommandLineUtilsTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtilsTest.java index 8cce9751b..d89cde4d5 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtilsTest.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtilsTest.java @@ -24,10 +24,10 @@ import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository; import org.codehaus.plexus.util.Os; import org.codehaus.plexus.util.cli.Commandline; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; /** * @author Emmanuel Venisse 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 de13e0370..b5f4b175f 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 @@ -19,7 +19,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; +import org.junit.jupiter.api.Test; import static org.apache.maven.scm.provider.svn.SvnScmTestUtils.SVN_COMMAND_LINE; 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 b5ca4bb69..8136181ea 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 @@ -25,7 +25,7 @@ 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 org.junit.jupiter.api.Test; import static org.apache.maven.scm.provider.svn.SvnScmTestUtils.SVN_COMMAND_LINE; 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 cd741bdbd..0c88ef266 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 @@ -29,7 +29,7 @@ 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 org.junit.jupiter.api.Test; /** * @author Emmanuel Venisse 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 80fabf293..fc6864dae 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 @@ -34,14 +34,14 @@ import org.apache.maven.scm.ScmFileStatus; import org.apache.maven.scm.ScmTestCase; import org.apache.maven.scm.util.ConsumerUtils; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * @author Emmanuel Venisse @@ -52,7 +52,7 @@ public class SvnChangeLogConsumerTest extends ScmTestCase { SvnChangeLogConsumer consumer; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -65,8 +65,8 @@ public void setUp() throws Exception { @Test public void testGetModificationsInitial() { assertTrue( - "Initial modifications should be empty", - consumer.getModifications().isEmpty()); + consumer.getModifications().isEmpty(), + "Initial modifications should be empty"); } /** @@ -85,12 +85,12 @@ public void testConsumeLineValidOutput() throws Exception { final List changedFiles = entry.getFiles(); final String revision = changedFiles.get(0).getRevision(); - assertEquals("Valid revision expected", "15", revision); - assertEquals("Valid num changed files expected", 2, changedFiles.size()); - assertEquals("Valid name expected", "unconventional author output (somedata)", entry.getAuthor()); + assertEquals("15", revision, "Valid revision expected"); + assertEquals(2, changedFiles.size(), "Valid num changed files expected"); + assertEquals("unconventional author output (somedata)", entry.getAuthor(), "Valid name expected"); String expectedDate = getLocalizedDate("2002-08-26 14:33:26", TimeZone.getTimeZone("GMT-4")); - assertEquals("Valid date expected", expectedDate, entry.getDateFormatted()); - assertEquals("Valid comment expected", "Minor formatting changes.\n", entry.getComment()); + assertEquals(expectedDate, entry.getDateFormatted(), "Valid date expected"); + assertEquals("Minor formatting changes.\n", entry.getComment(), "Valid comment expected"); } private static String getLocalizedDate(String date, TimeZone timeZone) throws Exception { @@ -225,10 +225,10 @@ public void testConsumerWithPattern2() throws Exception { out.append("File:" + fileName); // files in this log are known to be from one subtree - assertTrue("Unexpected file name: " + fileName, fileName.startsWith("/maven/scm/trunk")); + assertTrue(fileName.startsWith("/maven/scm/trunk"), "Unexpected file name: " + fileName); // files in this log are known not to contain space - assertEquals("Unexpected space found in filename: " + fileName, -1, fileName.indexOf(" ")); + assertEquals(-1, fileName.indexOf(" "), "Unexpected space found in filename: " + fileName); if (file.getOriginalName() != null) { origFileCounter++; @@ -238,12 +238,12 @@ public void testConsumerWithPattern2() throws Exception { out.append("=============================="); } - assertEquals("Unexpected number of file copy records", 1, origFileCounter); + assertEquals(1, origFileCounter, "Unexpected number of file copy records"); assertEquals( - "Action summary differs from expectations", "{modified=626, deleted=56, added=310, copied=1}", - summary.toString()); + summary.toString(), + "Action summary differs from expectations"); if (logger.isDebugEnabled()) { logger.debug(out.toString()); 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 382afc2f3..f58007cf3 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,8 +26,8 @@ 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 org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Trygve Laugstøl @@ -38,7 +38,7 @@ public class SvnCheckInCommandTest extends ScmTestCase { private String messageFileString; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); 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 eb08205eb..b331f8fe2 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,8 +27,8 @@ 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 org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Emmanuel Venisse @@ -43,7 +43,7 @@ public class SvnCheckOutCommandTest extends ScmTestCase { // // ---------------------------------------------------------------------- - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); 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/SvnCheckOutConsumerTest.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/SvnCheckOutConsumerTest.java index 42b53c649..1dc4298c6 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/SvnCheckOutConsumerTest.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/SvnCheckOutConsumerTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class SvnCheckOutConsumerTest { SvnCheckOutConsumer consumer; @@ -36,6 +36,6 @@ public void testParseLine() { consumer.parseLine("Checked out revision 1345915."); - Assert.assertEquals(1345915, consumer.getRevision()); + Assertions.assertEquals(1345915, consumer.getRevision()); } } 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 c4191f5d1..5a5729d23 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 @@ -24,7 +24,7 @@ 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 org.junit.jupiter.api.Test; public class SvnExportCommandTest extends ScmTestCase { 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 605f51770..b65eab893 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 @@ -25,7 +25,7 @@ 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 org.junit.jupiter.api.Test; public class SvnInfoCommandTest extends ScmTestCase { 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/SvnInfoConsumerTest.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/SvnInfoConsumerTest.java index d74c8adad..92ff87db8 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/SvnInfoConsumerTest.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/SvnInfoConsumerTest.java @@ -21,9 +21,9 @@ import java.time.temporal.ChronoField; import java.time.temporal.TemporalAccessor; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class SvnInfoConsumerTest { 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 d0d58f4ed..f93c96d01 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 @@ -26,7 +26,7 @@ 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 org.junit.jupiter.api.Test; /** * @author Carlos Sanchez 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/mkdir/SvnMkdirCommandTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommandTest.java index b1f4351bb..10e3a1b85 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommandTest.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommandTest.java @@ -26,11 +26,11 @@ import org.apache.maven.scm.repository.ScmRepository; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.cli.Commandline; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Maria Odea Ching @@ -41,7 +41,7 @@ public class SvnMkdirCommandTest extends ScmTestCase { String messageFileString; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -57,7 +57,7 @@ public void setUp() throws Exception { messageFileString = "--file " + path + " --encoding UTF-8"; } - @After + @AfterEach @Override public void tearDown() throws Exception { assertTrue(messageFile.delete()); 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/AbstractSvnExeRemoteInfoCommandTckTest.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 index d954fd968..a3ea70d2d 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/AbstractSvnExeRemoteInfoCommandTckTest.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 @@ -22,7 +22,7 @@ import org.apache.maven.scm.provider.svn.command.remoteinfo.AbstractSvnRemoteInfoCommandTckTest; import static org.apache.maven.scm.provider.svn.SvnScmTestUtils.SVN_COMMAND_LINE; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Bertrand Paquet 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/SvnRemoteInfoCommandTest.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/SvnRemoteInfoCommandTest.java index b195ee8c8..59618e614 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/SvnRemoteInfoCommandTest.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/SvnRemoteInfoCommandTest.java @@ -20,11 +20,11 @@ import org.apache.maven.scm.ScmTestCase; import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.maven.scm.provider.svn.SvnScmTestUtils.SVN_COMMAND_LINE; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Olivier Lamy 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 d932b57bd..694ddbd78 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 @@ -25,7 +25,7 @@ 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 org.junit.jupiter.api.Test; import static org.apache.maven.scm.provider.svn.SvnScmTestUtils.SVN_COMMAND_LINE; 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 08582b113..21af11d30 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 @@ -25,7 +25,7 @@ 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 org.junit.jupiter.api.Test; import static org.apache.maven.scm.provider.svn.SvnScmTestUtils.SVN_COMMAND_LINE; 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 5d944620c..12f77fa46 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 @@ -25,7 +25,7 @@ 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 org.junit.jupiter.api.Test; /** * test the subversion untag implementation 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/update/SvnUpdateCommandTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java index aac6c23b7..e75ea831f 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java @@ -30,9 +30,9 @@ import org.apache.maven.scm.repository.ScmRepository; import org.codehaus.plexus.util.Os; import org.codehaus.plexus.util.cli.Commandline; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Emmanuel Venisse diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/pom.xml b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/pom.xml index 09d7f7726..dea0b0d49 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/pom.xml +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/pom.xml @@ -35,14 +35,16 @@ org.apache.maven.scm maven-scm-test + + + junit + junit + + org.codehaus.plexus plexus-utils - - junit - junit - diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java index 2d87cd02d..367b36773 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java @@ -27,7 +27,7 @@ import org.codehaus.plexus.util.cli.CommandLineException; import org.codehaus.plexus.util.cli.CommandLineUtils; import org.codehaus.plexus.util.cli.Commandline; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; /** * @author Trygve Laugstøl @@ -46,11 +46,11 @@ public static void initializeRepository(File repositoryRoot) throws Exception { FileUtils.deleteDirectory(repositoryRoot); } - Assert.assertFalse("repositoryRoot still exists", repositoryRoot.exists()); + Assertions.assertFalse(repositoryRoot.exists(), "repositoryRoot still exists"); - Assert.assertTrue( - "Could not make repository root directory: " + repositoryRoot.getAbsolutePath(), - repositoryRoot.mkdirs()); + Assertions.assertTrue( + repositoryRoot.mkdirs(), + "Could not make repository root directory: " + repositoryRoot.getAbsolutePath()); ScmTestCase.execute( repositoryRoot.getParentFile(), SVNADMIN_COMMAND_LINE, "create " + repositoryRoot.getName()); @@ -65,14 +65,14 @@ public static void initializeRepository(File repositoryRoot, File dump) throws E FileUtils.deleteDirectory(repositoryRoot); } - Assert.assertTrue( - "Could not make repository root directory: " + repositoryRoot.getAbsolutePath(), - repositoryRoot.mkdirs()); + Assertions.assertTrue( + repositoryRoot.mkdirs(), + "Could not make repository root directory: " + repositoryRoot.getAbsolutePath()); ScmTestCase.execute( repositoryRoot.getParentFile(), SVNADMIN_COMMAND_LINE, "create " + repositoryRoot.getName()); - Assert.assertTrue("The dump file doesn't exist: " + dump.getAbsolutePath(), dump.exists()); + Assertions.assertTrue(dump.exists(), "The dump file doesn't exist: " + dump.getAbsolutePath()); loadSvnDump(repositoryRoot, new FileInputStream(dump)); } @@ -111,7 +111,7 @@ private static void loadSvnDump(File repositoryRoot, InputStream dumpStream) thr } if (exitValue != 0) { - Assert.fail("Exit value wasn't 0, was:" + exitValue); + Assertions.fail("Exit value wasn't 0, was:" + exitValue); } } diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/blame/SvnBlameCommandTckTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/blame/SvnBlameCommandTckTest.java index cbaeb33e2..9605ba6a6 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/blame/SvnBlameCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/blame/SvnBlameCommandTckTest.java @@ -26,7 +26,7 @@ import org.apache.maven.scm.provider.svn.SvnScmTestUtils; import org.apache.maven.scm.tck.command.blame.BlameCommandTckTest; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Evgeny Mandrikov @@ -42,7 +42,7 @@ public void initRepo() throws Exception { protected void verifyResult(BlameScmResult result) { List lines = result.getLines(); - assertEquals("Expected 1 line in blame", 1, lines.size()); + assertEquals(1, lines.size(), "Expected 1 line in blame"); BlameLine line = lines.get(0); assertEquals("trygvis", line.getAuthor()); assertEquals("7", line.getRevision()); diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/mkdir/SvnMkdirCommandTckTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/mkdir/SvnMkdirCommandTckTest.java index 1dc1a199d..4c908b7aa 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/mkdir/SvnMkdirCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/mkdir/SvnMkdirCommandTckTest.java @@ -25,11 +25,11 @@ import org.apache.maven.scm.command.mkdir.MkdirScmResult; import org.apache.maven.scm.provider.svn.SvnScmTestUtils; import org.apache.maven.scm.tck.command.mkdir.MkdirCommandTckTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Maria Odea Ching @@ -61,7 +61,7 @@ public void testMkdirCommandMkdirUrl() throws Exception { ListScmResult listResult = getScmManager().list(getScmRepository(), fileSet, true, null); - assertTrue("Directory should have been found.", listResult.isSuccess()); + assertTrue(listResult.isSuccess(), "Directory should have been found."); } @Test @@ -76,7 +76,7 @@ public void testMkdirCommandDirAlreadyAdded() throws Exception { ListScmResult listResult = getScmManager().list(getScmRepository(), fileSet, true, null); - assertTrue("Directory should have been found.", listResult.isSuccess()); + assertTrue(listResult.isSuccess(), "Directory should have been found."); // add the directory again result = getScmManager().mkdir(getScmRepository(), fileSet, null, false); diff --git a/maven-scm-providers/pom.xml b/maven-scm-providers/pom.xml index a15ffa4ad..40e4f372b 100644 --- a/maven-scm-providers/pom.xml +++ b/maven-scm-providers/pom.xml @@ -49,6 +49,12 @@ org.apache.maven.scm maven-scm-test test + + + junit + junit + + diff --git a/maven-scm-test/pom.xml b/maven-scm-test/pom.xml index c95edcdb1..bc8c8a7ca 100644 --- a/maven-scm-test/pom.xml +++ b/maven-scm-test/pom.xml @@ -70,15 +70,16 @@ plexus-sec-dispatcher runtime - - - junit - junit - org.apache.maven.plugin-testing maven-plugin-testing-harness 3.3.0 + + + junit + junit + + diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/PlexusJUnit4TestCase.java b/maven-scm-test/src/main/java/org/apache/maven/scm/PlexusJUnit4TestCase.java index cb9af4b03..4fdc81631 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/PlexusJUnit4TestCase.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/PlexusJUnit4TestCase.java @@ -20,7 +20,9 @@ import java.io.File; import java.io.InputStream; +import java.lang.reflect.Method; import java.util.Map; +import java.util.Optional; import com.google.inject.Module; import org.codehaus.plexus.ContainerConfiguration; @@ -32,12 +34,11 @@ import org.codehaus.plexus.configuration.PlexusConfiguration; import org.codehaus.plexus.context.Context; import org.codehaus.plexus.context.DefaultContext; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.rules.TestName; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.TestInfo; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Based on PlexusTestCase from org.sonatype.sisu:sisu-inject-plexus. @@ -50,16 +51,20 @@ public class PlexusJUnit4TestCase { private static String basedir; - @Rule - public TestName testName = new TestName(); + + public String testName; - @Before - public void setUp() throws Exception { + @BeforeEach + public void setUp(TestInfo testInfo) throws Exception { + Optional testMethod = testInfo.getTestMethod(); + if (testMethod.isPresent()) { + this.testName = testMethod.get().getName(); + } basedir = getBasedir(); } public String getName() { - return testName.getMethodName(); + return testName; } protected void setupContainer() { @@ -135,7 +140,7 @@ protected PlexusConfiguration customizeComponentConfiguration() { return null; } - @After + @AfterEach public void tearDown() throws Exception { if (container != null) { container.dispose(); diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTckTestCase.java b/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTckTestCase.java index f11abfd56..75262fa4a 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTckTestCase.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTckTestCase.java @@ -33,12 +33,12 @@ import org.apache.maven.scm.command.remove.RemoveScmResult; import org.apache.maven.scm.provider.ScmProvider; import org.apache.maven.scm.repository.ScmRepository; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Base class for all TcK tests. @@ -109,15 +109,15 @@ public void checkScmPresence() { String scmProviderCommand = getScmProviderCommand(); if (scmProviderCommand != null) { assumeTrue( - "Skipping tests because the required command '" + scmProviderCommand + "' is not available.", - ScmTestCase.isSystemCmd(scmProviderCommand)); + ScmTestCase.isSystemCmd(scmProviderCommand), + "Skipping tests because the required command '" + scmProviderCommand + "' is not available."); } } /** * {@inheritDoc} */ - @Before + @BeforeEach @Override public void setUp() throws Exception { checkScmPresence(); @@ -152,7 +152,7 @@ public void removeRepo() throws Exception {} /** * Provided to allow removeRepo() to be called. */ - @After + @AfterEach @Override public void tearDown() throws Exception { removeRepo(); @@ -178,7 +178,7 @@ protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository reposi .getProviderByUrl(getScmUrl()) .checkOut(repository, new ScmFileSet(workingDirectory), (ScmVersion) null); - assertTrue("Check result was successful, output: " + result.getCommandOutput(), result.isSuccess()); + assertTrue(result.isSuccess(), "Check result was successful, output: " + result.getCommandOutput()); return result; } @@ -191,7 +191,7 @@ protected CheckInScmResult checkIn(File workingDirectory, ScmRepository reposito .getProviderByUrl(getScmUrl()) .checkIn(repository, new ScmFileSet(workingDirectory), (ScmVersion) null, "Initial Checkin"); - assertTrue("Check result was successful, output: " + result.getCommandOutput(), result.isSuccess()); + assertTrue(result.isSuccess(), "Check result was successful, output: " + result.getCommandOutput()); return result; } @@ -204,7 +204,7 @@ protected RemoveScmResult remove(File workingDirectory, ScmRepository repository .getProviderByUrl(getScmUrl()) .remove(repository, new ScmFileSet(workingDirectory), "Initial Checkin"); - assertTrue("Remove result was successful, output: " + result.getCommandOutput(), result.isSuccess()); + assertTrue(result.isSuccess(), "Remove result was successful, output: " + result.getCommandOutput()); return result; } @@ -220,13 +220,13 @@ protected void addToWorkingTree(File workingDirectory, File file, ScmRepository AddScmResult result = provider.add(repository, new ScmFileSet(workingDirectory, file), commandParameters); - assertTrue("Check result was successful, output: " + result.getCommandOutput(), result.isSuccess()); + assertTrue(result.isSuccess(), "Check result was successful, output: " + result.getCommandOutput()); List addedFiles = result.getAddedFiles(); if (new File(workingDirectory, file.getPath()).isFile()) { // Don't check directory add because some SCM tools ignore it - assertEquals("Expected 1 file in the added files list " + addedFiles, 1, addedFiles.size()); + assertEquals(1, addedFiles.size(), "Expected 1 file in the added files list " + addedFiles); } } 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 8cf1294d7..d2040b8cd 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 @@ -34,13 +34,13 @@ import org.codehaus.plexus.util.cli.CommandLineUtils; import org.codehaus.plexus.util.cli.CommandLineUtils.StringStreamConsumer; import org.codehaus.plexus.util.cli.Commandline; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Base class for all SCM tests. Consumers will typically @@ -58,7 +58,7 @@ public abstract class ScmTestCase extends PlexusJUnit4TestCase { private ScmManager scmManager; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -145,16 +145,16 @@ public void assertPath(String expectedPath, String actualPath) throws Exception protected void assertFile(File root, String fileName) throws Exception { File file = new File(root, fileName); - assertTrue("Missing file: '" + file.getAbsolutePath() + "'.", file.exists()); + assertTrue(file.exists(), "Missing file: '" + file.getAbsolutePath() + "'."); - assertTrue("File isn't a file: '" + file.getAbsolutePath() + "'.", file.isFile()); + assertTrue(file.isFile(), "File isn't a file: '" + file.getAbsolutePath() + "'."); String expected = fileName; String actual = FileUtils.fileRead(file); assertEquals( - "The file doesn't contain the expected contents. File: " + file.getAbsolutePath(), expected, actual); + expected, actual, "The file doesn't contain the expected contents. File: " + file.getAbsolutePath()); } protected void assertResultIsSuccess(ScmResult result) { @@ -300,8 +300,8 @@ public void assertCommandLine(String expectedCommand, File expectedWorkingDirect public static void checkSystemCmdPresence(String scmProviderCommand) { assumeTrue( - "Skipping tests because the required command '" + scmProviderCommand + "' is not available.", - ScmTestCase.isSystemCmd(scmProviderCommand)); + ScmTestCase.isSystemCmd(scmProviderCommand), + "Skipping tests because the required command '" + scmProviderCommand + "' is not available."); } /** diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/blame/BlameCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/blame/BlameCommandTckTest.java index 623dc32d8..1aede7087 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/blame/BlameCommandTckTest.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/blame/BlameCommandTckTest.java @@ -30,12 +30,12 @@ import org.apache.maven.scm.manager.ScmManager; import org.apache.maven.scm.provider.ScmProvider; import org.apache.maven.scm.repository.ScmRepository; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Evgeny Mandrikov @@ -58,9 +58,9 @@ public void testBlameCommand() throws Exception { blameScmRequest.setFilename("readme.txt"); // result = manager.blame( repository, fileSet, "readme.txt" ); result = manager.blame(blameScmRequest); - assertNotNull("The command returned a null result.", result); + assertNotNull(result, "The command returned a null result."); assertResultIsSuccess(result); - assertEquals("Expected 1 line in blame", 1, result.getLines().size()); + assertEquals(1, result.getLines().size(), "Expected 1 line in blame"); line = result.getLines().get(0); String initialRevision = line.getRevision(); @@ -72,7 +72,7 @@ public void testBlameCommand() throws Exception { this.edit(getWorkingCopy(), "readme.txt", null, getScmRepository()); ScmTestCase.makeFile(getWorkingCopy(), "/readme.txt", "changed readme.txt"); CheckInScmResult checkInResult = provider.checkIn(getScmRepository(), fileSet, COMMIT_MSG); - assertTrue("Unable to checkin changes to the repository", checkInResult.isSuccess()); + assertTrue(checkInResult.isSuccess(), "Unable to checkin changes to the repository"); result = manager.blame(repository, fileSet, "readme.txt"); @@ -80,17 +80,17 @@ public void testBlameCommand() throws Exception { Thread.sleep(2000); Date timeAfterSecond = new Date(); // Current time - assertNotNull("The command returned a null result.", result); + assertNotNull(result, "The command returned a null result."); assertResultIsSuccess(result); - assertEquals("Expected 1 line in blame", 1, result.getLines().size()); + assertEquals(1, result.getLines().size(), "Expected 1 line in blame"); line = result.getLines().get(0); - assertNotNull("Expected not null author", line.getAuthor()); - assertNotNull("Expected not null revision", line.getRevision()); - assertNotNull("Expected not null date", line.getDate()); + assertNotNull(line.getAuthor(), "Expected not null author"); + assertNotNull(line.getRevision(), "Expected not null revision"); + assertNotNull(line.getDate(), "Expected not null date"); - assertNotEquals("Expected another revision", initialRevision, line.getRevision()); + assertNotEquals(initialRevision, line.getRevision(), "Expected another revision"); if (isTestDateTime()) { assertDateBetween(timeBeforeSecond, timeAfterSecond, line.getDate()); } @@ -98,7 +98,7 @@ public void testBlameCommand() throws Exception { // === pom.xml === result = manager.blame(repository, fileSet, "pom.xml"); - assertNotNull("The command returned a null result.", result); + assertNotNull(result, "The command returned a null result."); assertResultIsSuccess(result); @@ -111,8 +111,8 @@ protected boolean isTestDateTime() { protected void assertDateBetween(Date start, Date end, Date actual) { assertTrue( - "Expected date between " + start + " and " + end + ", but was " + actual, - start.before(actual) && actual.before(end)); + start.before(actual) && actual.before(end), + "Expected date between " + start + " and " + end + ", but was " + actual); } protected abstract void verifyResult(BlameScmResult result); diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java index 8811df3ed..75f16d905 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java @@ -32,10 +32,10 @@ import org.apache.maven.scm.command.checkin.CheckInScmResult; import org.apache.maven.scm.command.checkout.CheckOutScmResult; import org.codehaus.plexus.util.FileUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; /** * This test tests the branch command. @@ -64,7 +64,7 @@ public void testBranchCommandTest() throws Exception { File readmeTxt = new File(getWorkingCopy(), "readme.txt"); - assertEquals("check readme.txt contents", "/readme.txt", FileUtils.fileRead(readmeTxt)); + assertEquals("/readme.txt", FileUtils.fileRead(readmeTxt), "check readme.txt contents"); this.edit(getWorkingCopy(), "readme.txt", null, getScmRepository()); changeReadmeTxt(readmeTxt.toPath()); @@ -84,11 +84,11 @@ public void testBranchCommandTest() throws Exception { readmeTxt = new File(getAssertionCopy(), "readme.txt"); - assertEquals("check readme.txt contents", "changed file", FileUtils.fileRead(readmeTxt)); + assertEquals("changed file", FileUtils.fileRead(readmeTxt), "check readme.txt contents"); deleteDirectory(getAssertionCopy()); - assertFalse("check previous assertion copy deleted", getAssertionCopy().exists()); + assertFalse(getAssertionCopy().exists(), "check previous assertion copy deleted"); checkoutResult = getScmManager() .getProviderByUrl(getScmUrl()) @@ -97,7 +97,7 @@ public void testBranchCommandTest() throws Exception { assertResultIsSuccess(checkoutResult); assertEquals( - "check readme.txt contents is from branched version", "/readme.txt", FileUtils.fileRead(readmeTxt)); + "/readme.txt", FileUtils.fileRead(readmeTxt), "check readme.txt contents is from branched version"); } private void changeReadmeTxt(Path readmeTxt) throws Exception { diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ChangeLogCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ChangeLogCommandTckTest.java index ec8e181cb..ce32fea37 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ChangeLogCommandTckTest.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ChangeLogCommandTckTest.java @@ -35,10 +35,10 @@ import org.apache.maven.scm.command.checkin.CheckInScmResult; import org.apache.maven.scm.command.tag.TagScmResult; import org.apache.maven.scm.provider.ScmProvider; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test Changlog command.
@@ -75,7 +75,7 @@ public void testChangeLogCommand() throws Exception { // for svn and git the repo get recreated for each test and therefore initial changelog size is 1 int firstLogSize = firstResult.getChangeLog().getChangeSets().size(); - assertTrue("Unexpected initial log size", firstLogSize >= 1); + assertTrue(firstLogSize >= 1, "Unexpected initial log size"); // Make a timestamp that we know are after initial revision but before the second Date timeBeforeSecond = new Date(); // Current time @@ -89,7 +89,7 @@ public void testChangeLogCommand() throws Exception { CommandParameters commandParameters = new CommandParameters(); commandParameters.setString(CommandParameter.MESSAGE, COMMIT_MSG); CheckInScmResult checkInResult = provider.checkIn(getScmRepository(), fileSet, commandParameters); - assertTrue("Unable to checkin changes to the repository", checkInResult.isSuccess()); + assertTrue(checkInResult.isSuccess(), "Unable to checkin changes to the repository"); ScmTagParameters scmTagParameters = new ScmTagParameters(); TagScmResult tagResult = provider.tag(getScmRepository(), fileSet, COMMIT_TAG, scmTagParameters); 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 cde1afe32..86ff4ffcd 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 @@ -36,13 +36,13 @@ import org.apache.maven.scm.provider.ScmProvider; import org.apache.maven.scm.util.FilenameUtils; import org.codehaus.plexus.util.FileUtils; -import org.junit.Assume; -import org.junit.Test; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * This test tests the check out command. @@ -59,11 +59,11 @@ public void testCheckInCommandTest() throws Exception { File readmeTxt = new File(getWorkingCopy(), "readme.txt"); - assertFalse("check Foo.java doesn't yet exist", fooJava.canRead()); + assertFalse(fooJava.canRead(), "check Foo.java doesn't yet exist"); - assertFalse("check Bar.java doesn't yet exist", barJava.canRead()); + assertFalse(barJava.canRead(), "check Bar.java doesn't yet exist"); - assertTrue("check can read readme.txt", readmeTxt.canRead()); + assertTrue(readmeTxt.canRead(), "check can read readme.txt"); // Change the files createFooJava(fooJava); @@ -117,13 +117,13 @@ public void testCheckInCommandTest() throws Exception { readmeTxt = new File(getAssertionCopy(), "readme.txt"); - assertTrue("check can read Foo.java", fooJava.canRead()); + assertTrue(fooJava.canRead(), "check can read Foo.java"); - assertFalse("check Bar.java doesn't exist", barJava.canRead()); + assertFalse(barJava.canRead(), "check Bar.java doesn't exist"); - assertTrue("check can read readme.txt", readmeTxt.canRead()); + assertTrue(readmeTxt.canRead(), "check can read readme.txt"); - assertEquals("check readme.txt contents", "changed file", FileUtils.fileRead(readmeTxt)); + assertEquals("changed file", FileUtils.fileRead(readmeTxt), "check readme.txt contents"); } @Test @@ -135,11 +135,11 @@ public void testCheckInCommandPartialFileset() throws Exception { File readmeTxt = new File(getWorkingCopy(), "readme.txt"); - assertFalse("check Foo.java doesn't yet exist", fooJava.canRead()); + assertFalse(fooJava.canRead(), "check Foo.java doesn't yet exist"); - assertFalse("check Bar.java doesn't yet exist", barJava.canRead()); + assertFalse(barJava.canRead(), "check Bar.java doesn't yet exist"); - assertTrue("check can read readme.txt", readmeTxt.canRead()); + assertTrue(readmeTxt.canRead(), "check can read readme.txt"); // Change the files createFooJava(fooJava); @@ -181,26 +181,26 @@ public void testCheckInCommandPartialFileset() throws Exception { readmeTxt = new File(getAssertionCopy(), "readme.txt"); - assertTrue("check can read Foo.java", fooJava.canRead()); + assertTrue(fooJava.canRead(), "check can read Foo.java"); - assertFalse("check Bar.java doesn't exist", barJava.canRead()); + assertFalse(barJava.canRead(), "check Bar.java doesn't exist"); - assertTrue("check can read readme.txt", readmeTxt.canRead()); + assertTrue(readmeTxt.canRead(), "check can read readme.txt"); - assertEquals("check readme.txt contents", "/readme.txt", FileUtils.fileRead(readmeTxt)); + assertEquals("/readme.txt", FileUtils.fileRead(readmeTxt), "check readme.txt contents"); } @Test public void testCheckInCommandFilesetWithBasedirOtherThanWorkingCopyRoot() throws Exception { ScmProvider scmProvider = getScmManager().getProviderByUrl(getScmUrl()); - Assume.assumeFalse( - "Local provider does not properly support basedir", - scmProvider.getScmType().equals("local")); + Assumptions.assumeFalse( + scmProvider.getScmType().equals("local"), + "Local provider does not properly support basedir"); // Make sure that the correct files was checked out File fooJava = new File(getWorkingCopy(), "src/main/java/Foo.java"); - assertFalse("check Foo.java doesn't yet exist", fooJava.canRead()); + assertFalse(fooJava.canRead(), "check Foo.java doesn't yet exist"); // Change the files createFooJava(fooJava); @@ -244,7 +244,7 @@ public void testCheckInCommandFilesetWithBasedirOtherThanWorkingCopyRoot() throw fooJava = new File(getAssertionCopy(), "src/main/java/Foo.java"); - assertTrue("check can read Foo.java", fooJava.canRead()); + assertTrue(fooJava.canRead(), "check can read Foo.java"); } private void createFooJava(File fooJava) throws Exception { diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java index e1ec1bcca..a7202732e 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java @@ -30,11 +30,11 @@ import org.apache.maven.scm.provider.ScmProvider; import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.scm.repository.UnknownRepositoryStructure; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * This test tests the check out command. @@ -73,7 +73,7 @@ public void testMakeProviderScmRepositoryFromCheckoutDirectory() throws Exceptio CheckOutScmResult result = checkOut(getWorkingCopy(), getScmRepository()); assertResultIsSuccess(result); Optional repository = getScmManager().makeProviderScmRepository(getWorkingCopy()); - assertTrue("Could not detect SCM repository for working copy at " + getWorkingCopy(), repository.isPresent()); + assertTrue(repository.isPresent(), "Could not detect SCM repository for working copy at " + getWorkingCopy()); } private boolean isMakeProviderScmRepositoryFromDirectorySupportedByProvider() throws Exception { 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 b2f500d96..2e5ea124f 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 @@ -32,11 +32,11 @@ import org.apache.maven.scm.command.diff.DiffScmResult; import org.apache.maven.scm.provider.ScmProvider; import org.apache.maven.scm.repository.ScmRepository; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * This test tests the diff command. @@ -91,7 +91,7 @@ public void testDiffCommand() throws Exception { ScmFileSet fileSet = new ScmFileSet(getWorkingCopy()); DiffScmResult result = provider.diff(repository, fileSet, null, (ScmVersion) null); - assertNotNull("The command returned a null result.", result); + assertNotNull(result, "The command returned a null result."); assertResultIsSuccess(result); @@ -99,9 +99,9 @@ public void testDiffCommand() throws Exception { Map differences = result.getDifferences(); - assertEquals("Expected 3 files in the changed files list " + changedFiles, 3, changedFiles.size()); + assertEquals(3, changedFiles.size(), "Expected 3 files in the changed files list " + changedFiles); - assertEquals("Expected 3 files in the differences list " + differences, 3, differences.size()); + assertEquals(3, differences.size(), "Expected 3 files in the differences list " + differences); // ---------------------------------------------------------------------- // Assert the files in the changed files list diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/info/InfoCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/info/InfoCommandTckTest.java index 9648dfee2..ba9caa40e 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/info/InfoCommandTckTest.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/info/InfoCommandTckTest.java @@ -27,9 +27,9 @@ import org.apache.maven.scm.command.info.InfoItem; import org.apache.maven.scm.command.info.InfoScmResult; import org.apache.maven.scm.provider.ScmProvider; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * This test tests the info command. diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/list/ListCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/list/ListCommandTckTest.java index c415d1940..7a17ec581 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/list/ListCommandTckTest.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/list/ListCommandTckTest.java @@ -27,11 +27,11 @@ import org.apache.maven.scm.ScmVersion; import org.apache.maven.scm.command.list.ListScmResult; import org.apache.maven.scm.provider.ScmProvider; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * This test tests the list command. @@ -45,7 +45,7 @@ public void testListCommandTest() throws Exception { List files = runList(fileSet, false); - assertEquals("The result of the list command doesn't have all the files in SCM: " + files, 3, files.size()); + assertEquals(3, files.size(), "The result of the list command doesn't have all the files in SCM: " + files); } @Test @@ -54,7 +54,7 @@ public void testListCommandRecursiveTest() throws Exception { List files = runList(fileSet, true); - assertEquals("The result of the list command doesn't have all the files in SCM: " + files, 10, files.size()); + assertEquals(10, files.size(), "The result of the list command doesn't have all the files in SCM: " + files); } @Test @@ -65,7 +65,7 @@ public void testListCommandUnexistantFileTest() throws Exception { ListScmResult result = provider.list(getScmRepository(), fileSet, false, (ScmVersion) null); - assertFalse("Found file when shouldn't", result.isSuccess()); + assertFalse(result.isSuccess(), "Found file when shouldn't"); } private List runList(ScmFileSet fileSet, boolean recursive) throws Exception { @@ -74,9 +74,9 @@ private List runList(ScmFileSet fileSet, boolean recursive) throws Exce ListScmResult result = provider.list(getScmRepository(), fileSet, recursive, (ScmVersion) null); assertTrue( + result.isSuccess(), "SCM command failed: " + result.getCommandLine() + " : " + result.getProviderMessage() - + (result.getCommandOutput() == null ? "" : ": " + result.getCommandOutput()), - result.isSuccess()); + + (result.getCommandOutput() == null ? "" : ": " + result.getCommandOutput())); return result.getFiles(); } diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/mkdir/MkdirCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/mkdir/MkdirCommandTckTest.java index 171e0fd52..032c697b9 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/mkdir/MkdirCommandTckTest.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/mkdir/MkdirCommandTckTest.java @@ -23,10 +23,10 @@ import org.apache.maven.scm.ScmFileSet; import org.apache.maven.scm.ScmTckTestCase; import org.apache.maven.scm.command.mkdir.MkdirScmResult; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * This test tests the mkdir command. @@ -45,7 +45,7 @@ public void testMkdirCommandMkdirLocal() throws Exception { assertNotNull(result.getCreatedDirs()); assertEquals( - "Directory should have been added.", 1, result.getCreatedDirs().size()); + 1, result.getCreatedDirs().size(), "Directory should have been added."); } protected String getMissingDirectory() { diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/remoteinfo/AbstractRemoteInfoCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/remoteinfo/AbstractRemoteInfoCommandTckTest.java index 3f21524ae..627ffc376 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/remoteinfo/AbstractRemoteInfoCommandTckTest.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/remoteinfo/AbstractRemoteInfoCommandTckTest.java @@ -23,7 +23,7 @@ import org.apache.maven.scm.command.remoteinfo.RemoteInfoScmResult; import org.apache.maven.scm.provider.ScmProvider; import org.apache.maven.scm.provider.ScmProviderRepository; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * This test tests the remote info command. diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/remove/RemoveCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/remove/RemoveCommandTckTest.java index deece3a90..59d60492a 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/remove/RemoveCommandTckTest.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/remove/RemoveCommandTckTest.java @@ -30,11 +30,11 @@ import org.apache.maven.scm.command.checkin.CheckInScmResult; import org.apache.maven.scm.command.checkout.CheckOutScmResult; import org.apache.maven.scm.command.remove.RemoveScmResult; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** This test tests the remove command. */ public abstract class RemoveCommandTckTest extends ScmTckTestCase { @@ -83,10 +83,10 @@ public void testRemoveCommand() throws Exception { File applicationJava = new File(getAssertionCopy(), "src/main/java/Application.java"); - assertFalse("Application.java does exist even though it has been removed before", applicationJava.canRead()); + assertFalse(applicationJava.canRead(), "Application.java does exist even though it has been removed before"); File testJava = new File(getAssertionCopy(), "src/test/java/Test.java"); - assertFalse("Test.java does exist even though it has been removed before", testJava.canRead()); + assertFalse(testJava.canRead(), "Test.java does exist even though it has been removed before"); } } 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 9cacb0b74..d8c9d24ee 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 @@ -34,12 +34,12 @@ import org.apache.maven.scm.command.status.StatusScmResult; import org.apache.maven.scm.manager.ScmManager; import org.apache.maven.scm.repository.ScmRepository; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * This test tests the status command. @@ -66,11 +66,11 @@ protected void commit(File workingDirectory, ScmRepository repository) throws Ex CheckInScmResult result = getScmManager().checkIn(repository, new ScmFileSet(workingDirectory), commandParameters); - assertTrue("Check result was successful, output: " + result.getCommandOutput(), result.isSuccess()); + assertTrue(result.isSuccess(), "Check result was successful, output: " + result.getCommandOutput()); List committedFiles = result.getCheckedInFiles(); - assertEquals("Expected 2 files in the committed files list " + committedFiles, 2, committedFiles.size()); + assertEquals(2, committedFiles.size(), "Expected 2 files in the committed files list " + committedFiles); } protected boolean commitUpdateCopy() { @@ -137,13 +137,13 @@ public void testStatusCommand() throws Exception { commit(getUpdatingCopy(), repository); } - assertNotNull("The command returned a null result.", result); + assertNotNull(result, "The command returned a null result."); assertResultIsSuccess(result); List changedFiles = result.getChangedFiles(); - assertEquals("Expected 2 files in the updated files list " + changedFiles, 2, changedFiles.size()); + assertEquals(2, changedFiles.size(), "Expected 2 files in the updated files list " + changedFiles); // ---------------------------------------------------------------------- // Assert the files in the updated files list @@ -161,6 +161,6 @@ public void testStatusCommand() throws Exception { assertFile(getUpdatingCopy(), "/readme.txt"); - assertFalse("project.xml created incorrectly", new File(getUpdatingCopy(), "/project.xml").exists()); + assertFalse(new File(getUpdatingCopy(), "/project.xml").exists(), "project.xml created incorrectly"); } } diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java index 6f7dadef2..c63df1cf5 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java @@ -32,10 +32,10 @@ import org.apache.maven.scm.command.checkout.CheckOutScmResult; import org.apache.maven.scm.command.tag.TagScmResult; import org.codehaus.plexus.util.FileUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; /** * This test tests the tag command. @@ -64,7 +64,7 @@ public void testTagCommandTest() throws Exception { File readmeTxt = new File(getWorkingCopy(), "readme.txt"); - assertEquals("check readme.txt contents", "/readme.txt", FileUtils.fileRead(readmeTxt)); + assertEquals("/readme.txt", FileUtils.fileRead(readmeTxt), "check readme.txt contents"); this.edit(getWorkingCopy(), "readme.txt", null, getScmRepository()); changeReadmeTxt(readmeTxt.toPath()); @@ -84,11 +84,11 @@ public void testTagCommandTest() throws Exception { readmeTxt = new File(getAssertionCopy(), "readme.txt"); - assertEquals("check readme.txt contents", "changed file", FileUtils.fileRead(readmeTxt)); + assertEquals("changed file", FileUtils.fileRead(readmeTxt), "check readme.txt contents"); deleteDirectory(getAssertionCopy()); - assertFalse("check previous assertion copy deleted", getAssertionCopy().exists()); + assertFalse(getAssertionCopy().exists(), "check previous assertion copy deleted"); checkoutResult = getScmManager() .getProviderByUrl(getScmUrl()) @@ -96,7 +96,7 @@ public void testTagCommandTest() throws Exception { assertResultIsSuccess(checkoutResult); - assertEquals("check readme.txt contents is from tagged version", "/readme.txt", FileUtils.fileRead(readmeTxt)); + assertEquals("/readme.txt", FileUtils.fileRead(readmeTxt), "check readme.txt contents is from tagged version"); } private void changeReadmeTxt(Path readmeTxt) throws Exception { diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/untag/UntagCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/untag/UntagCommandTckTest.java index 8885242de..a100b3409 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/untag/UntagCommandTckTest.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/untag/UntagCommandTckTest.java @@ -30,9 +30,9 @@ import org.apache.maven.scm.command.untag.UntagScmResult; import org.apache.maven.scm.provider.ScmProvider; import org.apache.maven.scm.repository.ScmRepository; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; /** * This test tests the untag command. diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java index e1310f2a7..bbb10aaff 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java @@ -35,12 +35,12 @@ import org.apache.maven.scm.command.update.UpdateScmResult; import org.apache.maven.scm.manager.ScmManager; import org.apache.maven.scm.repository.ScmRepository; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * This test tests the update command. @@ -64,15 +64,15 @@ public abstract class UpdateCommandTckTest extends ScmTckTestCase { private void commit(File workingDirectory, ScmRepository repository) throws Exception { CheckInScmResult result = getScmManager().checkIn(repository, new ScmFileSet(workingDirectory), "No msg"); - assertTrue("Check result was successful, output: " + result.getCommandOutput(), result.isSuccess()); + assertTrue(result.isSuccess(), "Check result was successful, output: " + result.getCommandOutput()); List committedFiles = result.getCheckedInFiles(); assertEquals( - "Expected 3 files in the committed files list:\n " - + StringUtils.join(committedFiles.iterator(), "\n "), 3, - committedFiles.size()); + committedFiles.size(), + "Expected 3 files in the committed files list:\n " + + StringUtils.join(committedFiles.iterator(), "\n ")); } @Test @@ -139,7 +139,7 @@ public void testUpdateCommand() throws Exception { UpdateScmResult result = scmManager.update(repository, new ScmFileSet(getUpdatingCopy()), lastUpdate); - assertNotNull("The command returned a null result.", result); + assertNotNull(result, "The command returned a null result."); assertResultIsSuccess(result); @@ -147,11 +147,11 @@ public void testUpdateCommand() throws Exception { List changedSets = result.getChanges(); - assertEquals("Expected 3 files in the updated files list " + updatedFiles, 3, updatedFiles.size()); + assertEquals(3, updatedFiles.size(), "Expected 3 files in the updated files list " + updatedFiles); - assertNotNull("The changed files list is null", changedSets); + assertNotNull(changedSets, "The changed files list is null"); - assertFalse("The changed files list is empty ", changedSets.isEmpty()); + assertFalse(changedSets.isEmpty(), "The changed files list is empty "); for (ChangeSet changeSet : changedSets) { System.out.println(changeSet.toXML()); 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 4c40d45a0..0cdd6d16d 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 @@ -26,10 +26,10 @@ 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 org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertSame; /** * Test for the ScmManagerStub @@ -47,7 +47,7 @@ public class ScmManagerStubTest { private ScmRepository scmRepository; - @Before + @BeforeEach public void setUp() throws Exception { messages = new ArrayList<>(0); scmProvider = new ScmProviderStub(); diff --git a/pom.xml b/pom.xml index 972c4d038..9ff65d6df 100644 --- a/pom.xml +++ b/pom.xml @@ -286,7 +286,7 @@ org.mockito mockito-core - 2.28.2 + 4.11.0 org.apache.maven.scm