You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2021/09/05 18:52:45 UTC
[maven-scm] branch master updated: Replace assert by simpler but
equivalent calls
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
The following commit(s) were added to refs/heads/master by this push:
new c59dcf2 Replace assert by simpler but equivalent calls
c59dcf2 is described below
commit c59dcf29361d69995446f57c9511a0613b382a7c
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Wed Sep 1 19:24:03 2021 +0200
Replace assert by simpler but equivalent calls
This closes #122
---
maven-scm-api/src/test/java/org/apache/maven/scm/ChangeFileTest.java | 2 +-
maven-scm-api/src/test/java/org/apache/maven/scm/ChangeSetTest.java | 4 +++-
.../src/test/java/org/apache/maven/scm/provider/hg/HgUtilsTest.java | 3 ++-
.../maven/scm/provider/hg/repository/HgScmProviderRepositoryTest.java | 4 ++--
.../scm/provider/local/command/update/LocalUpdateCommandTckTest.java | 4 ++--
.../scm/provider/starteam/command/add/StarteamAddConsumerTest.java | 2 +-
.../starteam/command/checkin/StarteamCheckInConsumerTest.java | 2 +-
.../starteam/command/checkout/StarteamCheckOutConsumerTest.java | 2 +-
.../provider/starteam/command/remove/StarteamRemoveConsumerTest.java | 2 +-
.../org/apache/maven/scm/tck/command/blame/BlameCommandTckTest.java | 4 +++-
.../org/apache/maven/scm/tck/command/mkdir/MkdirCommandTckTest.java | 2 +-
11 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/maven-scm-api/src/test/java/org/apache/maven/scm/ChangeFileTest.java b/maven-scm-api/src/test/java/org/apache/maven/scm/ChangeFileTest.java
index e934cc1..3f953db 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
@@ -31,7 +31,7 @@ public class ChangeFileTest
{
ChangeFile f = new ChangeFile( "test.java" );
assertEquals( "test.java", f.getName() );
- assertEquals( null, f.getRevision() );
+ assertNull( f.getRevision() );
assertEquals( "test.java", f.toString() );
}
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 86f3171..e95f0de 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
@@ -24,6 +24,8 @@ import junit.framework.TestCase;
import java.util.Calendar;
import java.util.Date;
+import static org.junit.Assert.assertNotEquals;
+
/**
* Tests for the {@link ChangeSet}class
*
@@ -190,7 +192,7 @@ public class ChangeSetTest
assertEquals(instance, instance2);
instance2.setComment("another comment");
- assertFalse(instance2.equals(instance));
+ assertNotEquals( instance2, instance );
instance2.setComment("comment");
assertEquals(instance, instance2);
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 efd87be..feddba6 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
@@ -20,6 +20,7 @@ package org.apache.maven.scm.provider.hg;
*/
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import org.apache.maven.scm.provider.hg.command.HgCommandConstants;
import org.codehaus.plexus.util.StringUtils;
@@ -34,7 +35,7 @@ public class HgUtilsTest
throws Exception
{
Commandline cmd = HgUtils.buildCmd( null, new String[] {} );
- assertEquals( null, cmd.getWorkingDirectory() );
+ assertNull( cmd.getWorkingDirectory() );
}
@Test
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 dca9385..b602d98 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
@@ -85,7 +85,7 @@ public class HgScmProviderRepositoryTest
String url = "http://www.myhost.com/~username/dev/maven";
HgScmProviderRepository repo = new HgScmProviderRepository( url );
assertEquals( url, repo.getURI() );
- assertEquals( null, repo.validateURI() );
+ assertNull( repo.validateURI() );
//2. Test with absolute path
url = "http://www.myhost.com/dev/maven";
@@ -110,7 +110,7 @@ public class HgScmProviderRepositoryTest
String url = "http://hg/hg/maven";
HgScmProviderRepository repo = new HgScmProviderRepository( url );
assertEquals( url, repo.getURI() );
- assertEquals( null, repo.validateURI() );
+ assertNull( repo.validateURI() );
}
/**
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 722809c..86a5476 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
@@ -77,7 +77,7 @@ public class LocalUpdateCommandTckTest
File readmeFileLocal = new File( getUpdatingCopy(), "readme.txt" );
assertTrue( readmeFileLocal.exists() );
File newFileLocal = new File( getUpdatingCopy(), "newfile.xml" );
- assertTrue( !newFileLocal.exists() );
+ assertFalse( newFileLocal.exists() );
// Delete readme.txt from repository
File readmeFileRepo = new File( getRepositoryRoot(), moduleName + "/readme.txt" );
@@ -123,7 +123,7 @@ public class LocalUpdateCommandTckTest
// ----------------------------------------------------------------------
// readme.txt
- assertTrue( "Expected local copy of readme.txt to be deleted", !readmeFileLocal.exists() );
+ assertFalse( "Expected local copy of readme.txt to be deleted", readmeFileLocal.exists() );
// newfile.xml
assertTrue( "Expected local copy of newfile.xml NOT to be deleted", newFileLocal.exists() );
diff --git a/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumerTest.java b/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumerTest.java
index f0507be..53a80e5 100644
--- a/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumerTest.java
+++ b/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumerTest.java
@@ -65,7 +65,7 @@ public class StarteamAddConsumerTest
assertTrue( entry.getPath().startsWith( "./" ) );
- assertTrue( entry.getStatus() == ScmFileStatus.ADDED );
+ assertSame( entry.getStatus(), ScmFileStatus.ADDED );
}
diff --git a/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumerTest.java b/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumerTest.java
index eee54d0..5d1bcf6 100644
--- a/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumerTest.java
+++ b/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumerTest.java
@@ -62,7 +62,7 @@ public class StarteamCheckInConsumerTest
{
assertTrue( entry.getPath().startsWith( "./" ) );
- assertTrue( entry.getStatus() == ScmFileStatus.CHECKED_OUT );
+ assertSame( entry.getStatus(), ScmFileStatus.CHECKED_OUT );
}
diff --git a/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumerTest.java b/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumerTest.java
index 0c51f0b..425aea7 100644
--- a/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumerTest.java
+++ b/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumerTest.java
@@ -64,7 +64,7 @@ public class StarteamCheckOutConsumerTest
{
assertTrue( entry.getPath().startsWith( "./" ) );
- assertTrue( entry.getStatus() == ScmFileStatus.CHECKED_OUT );
+ assertSame( entry.getStatus(), ScmFileStatus.CHECKED_OUT );
}
}
diff --git a/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveConsumerTest.java b/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveConsumerTest.java
index ed18b41..805aa73 100644
--- a/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveConsumerTest.java
+++ b/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveConsumerTest.java
@@ -62,7 +62,7 @@ public class StarteamRemoveConsumerTest
assertTrue( entry.getPath().startsWith( "./" ) );
- assertTrue( entry.getStatus() == ScmFileStatus.DELETED );
+ assertSame( entry.getStatus(), ScmFileStatus.DELETED );
}
}
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 e5cba29..8f7dec8 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
@@ -32,6 +32,8 @@ import org.apache.maven.scm.repository.ScmRepository;
import java.util.Date;
+import static org.junit.Assert.assertNotEquals;
+
/**
* @author Evgeny Mandrikov
*/
@@ -88,7 +90,7 @@ public abstract class BlameCommandTckTest
assertNotNull( "Expected not null revision", line.getRevision() );
assertNotNull( "Expected not null date", line.getDate() );
- assertTrue( "Expected another revision", !initialRevision.equals( line.getRevision() ) );
+ assertNotEquals( "Expected another revision", initialRevision, line.getRevision() );
if ( isTestDateTime() )
{
assertDateBetween( timeBeforeSecond, timeAfterSecond, line.getDate() );
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 f392012..ba8b565 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
@@ -45,7 +45,7 @@ public abstract class MkdirCommandTckTest
assertNotNull( result.getCreatedDirs() );
- assertTrue( "Directory should have been added.", 1 == result.getCreatedDirs().size() );
+ assertEquals( "Directory should have been added.", 1, result.getCreatedDirs().size() );
}
protected String getMissingDirectory()