This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch 1.1.X
in repository https://gitbox.apache.org/repos/asf/mina-ftpserver.git
The following commit(s) were added to refs/heads/1.1.X by this push:
new 30636410 Applied Arturo Bernal PR about simplified assertions
30636410 is described below
commit 3063641076be7101cbc5a8e47b59f967f380854c
Author: emmanuel lecharny <elecha...@apache.org>
AuthorDate: Tue Apr 5 09:34:08 2022 +0200
Applied Arturo Bernal PR about simplified assertions
---
.../ftpserver/clienttests/ActiveModeReplyTest.java | 2 +-
.../apache/ftpserver/clienttests/RmDirTest.java | 10 ++++----
.../commands/impl/listing/ListArgumentTest.java | 8 +++---
.../ftpserver/config/spring/SpringConfigTest.java | 9 +++----
.../ftpserver/ssl/impl/AliasKeymanagerTest.java | 9 +++----
.../ssl/impl/ExtendedAliasKeymanagerTest.java | 16 ++++++------
.../usermanager/impl/UserManagerTestTemplate.java | 6 ++---
.../apache/ftpserver/util/BasePropertiesTest.java | 30 +++++++++++-----------
8 files changed, 44 insertions(+), 46 deletions(-)
diff --git
a/core/src/test/java/org/apache/ftpserver/clienttests/ActiveModeReplyTest.java
b/core/src/test/java/org/apache/ftpserver/clienttests/ActiveModeReplyTest.java
index 073ca55a..bdd80ba4 100644
---
a/core/src/test/java/org/apache/ftpserver/clienttests/ActiveModeReplyTest.java
+++
b/core/src/test/java/org/apache/ftpserver/clienttests/ActiveModeReplyTest.java
@@ -59,7 +59,7 @@ public class ActiveModeReplyTest extends ClientTestTemplate {
}
public void testStoreInActiveModeIfNotAllowed() throws Exception {
- assertTrue(client.getDataConnectionMode() ==
FTPClient.ACTIVE_LOCAL_DATA_CONNECTION_MODE);
+ assertEquals(FTPClient.ACTIVE_LOCAL_DATA_CONNECTION_MODE,
client.getDataConnectionMode());
sendCommand("APPE " + TEST_FILE1.getAbsolutePath());
sendCommand("LIST");
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/RmDirTest.java
b/core/src/test/java/org/apache/ftpserver/clienttests/RmDirTest.java
index a576df01..f3040b13 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/RmDirTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/RmDirTest.java
@@ -93,30 +93,30 @@ public class RmDirTest extends ClientTestTemplate {
assertEquals(450, client.sendCommand("RMD ."));
assertTrue(TEST_CWD.exists());
- assertEquals(false, client.removeDirectory("."));
+ assertFalse(client.removeDirectory("."));
assertTrue(TEST_CWD.exists());
assertEquals(450, client.sendCommand("RMD " + "/" +
TEST_CWD.getName()));
assertTrue(TEST_CWD.exists());
- assertEquals(false, client.removeDirectory("/" + TEST_CWD.getName()));
+ assertFalse(client.removeDirectory("/" + TEST_CWD.getName()));
assertTrue(TEST_CWD.exists());
assertEquals(450, client.sendCommand("RMD " + "../" +
TEST_CWD.getName()));
assertTrue(TEST_CWD.exists());
- assertEquals(false, client.removeDirectory("../" +
TEST_CWD.getName()));
+ assertFalse(client.removeDirectory("../" + TEST_CWD.getName()));
assertTrue(TEST_CWD.exists());
assertEquals(450, client.sendCommand("RMD " + "././."));
assertTrue(TEST_CWD.exists());
- assertEquals(false, client.removeDirectory("././."));
+ assertFalse(client.removeDirectory("././."));
assertTrue(TEST_CWD.exists());
// Test for case-insensitive servers. In case it is case sensitive
we'll receive a 550 response
// so this test should end successfully in both cases.
- assertEquals(false, client.removeDirectory("/" +
TEST_CWD.getName().toUpperCase()));
+ assertFalse(client.removeDirectory("/" +
TEST_CWD.getName().toUpperCase()));
assertTrue(TEST_CWD.exists());
}
}
diff --git
a/core/src/test/java/org/apache/ftpserver/commands/impl/listing/ListArgumentTest.java
b/core/src/test/java/org/apache/ftpserver/commands/impl/listing/ListArgumentTest.java
index ec47c9ca..b2898f02 100644
---
a/core/src/test/java/org/apache/ftpserver/commands/impl/listing/ListArgumentTest.java
+++
b/core/src/test/java/org/apache/ftpserver/commands/impl/listing/ListArgumentTest.java
@@ -19,12 +19,12 @@
package org.apache.ftpserver.commands.impl.listing;
-import java.util.Arrays;
-
-import junit.framework.TestCase;
+import static org.junit.Assert.assertArrayEquals;
import org.apache.ftpserver.command.impl.listing.ListArgument;
+import junit.framework.TestCase;
+
/**
*
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
@@ -42,7 +42,7 @@ public class ListArgumentTest extends TestCase {
assertEquals("bar", arg.getFile());
assertEquals("foo", arg.getPattern());
- assertTrue(Arrays.equals(OPTIONS, arg.getOptions()));
+ assertArrayEquals(OPTIONS, arg.getOptions());
}
public void testArgumentAndEmptyOptions() {
diff --git
a/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
b/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
index 8e405e4e..d592e826 100644
---
a/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
+++
b/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
@@ -23,8 +23,6 @@ import java.net.InetAddress;
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.apache.ftpserver.command.CommandFactory;
import org.apache.ftpserver.command.impl.HELP;
import org.apache.ftpserver.command.impl.STAT;
@@ -37,6 +35,8 @@ import org.apache.mina.filter.firewall.Subnet;
import org.springframework.beans.factory.xml.XmlBeanFactory;
import org.springframework.core.io.FileSystemResource;
+import junit.framework.TestCase;
+
/**
*
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
@@ -51,8 +51,7 @@ public class SpringConfigTest extends TestCase {
DefaultFtpServer server = (DefaultFtpServer) factory.getBean("server");
assertEquals(500, server.getConnectionConfig().getMaxLogins());
- assertEquals(false, server.getConnectionConfig()
- .isAnonymousLoginEnabled());
+ assertFalse(server.getConnectionConfig().isAnonymousLoginEnabled());
assertEquals(123,
server.getConnectionConfig().getMaxAnonymousLogins());
assertEquals(124, server.getConnectionConfig().getMaxLoginFailures());
assertEquals(125, server.getConnectionConfig().getLoginFailureDelay());
@@ -78,7 +77,7 @@ public class SpringConfigTest extends TestCase {
.getDataConnectionConfiguration().getActiveLocalAddress()) );
assertEquals("123-125", ((NioListener) listener)
.getDataConnectionConfiguration().getPassivePorts());
- assertEquals(false, ((NioListener) listener)
+ assertFalse(((NioListener) listener)
.getDataConnectionConfiguration().isPassiveIpCheck());
RemoteIpFilter filter = (RemoteIpFilter) listener.getSessionFilter();
diff --git
a/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java
b/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java
index 4606b878..7e64f26d 100644
--- a/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java
+++ b/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java
@@ -54,13 +54,13 @@ public class AliasKeymanagerTest extends TestCase {
AliasKeyManager akm = new AliasKeyManager(km, "dsakey");
assertEquals("dsakey", akm.chooseServerAlias("DSA", null, null));
- assertEquals(null, akm.chooseServerAlias("RSA", null, null));
+ assertNull(akm.chooseServerAlias("RSA", null, null));
}
public void testServerAliasWithAliasRSAKey() throws Exception {
AliasKeyManager akm = new AliasKeyManager(km, "rsakey");
- assertEquals(null, akm.chooseServerAlias("DSA", null, null));
+ assertNull(akm.chooseServerAlias("DSA", null, null));
assertEquals("rsakey", akm.chooseServerAlias("RSA", null, null));
}
@@ -74,8 +74,7 @@ public class AliasKeymanagerTest extends TestCase {
public void testServerAliasNonExistingKey() throws Exception {
AliasKeyManager akm = new AliasKeyManager(km, "nonexisting");
- assertEquals(null, akm.chooseServerAlias("DSA", null, null));
- assertEquals(null, akm.chooseServerAlias("RSA", null, null));
+ assertNull(akm.chooseServerAlias("DSA", null, null));
+ assertNull(akm.chooseServerAlias("RSA", null, null));
}
-
}
\ No newline at end of file
diff --git
a/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java
b/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java
index 9c485d69..8d03c795 100644
---
a/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java
+++
b/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java
@@ -54,13 +54,13 @@ public class ExtendedAliasKeymanagerTest extends TestCase {
ExtendedAliasKeyManager akm = new ExtendedAliasKeyManager(km,
"dsakey");
assertEquals("dsakey", akm.chooseServerAlias("DSA", null, null));
- assertEquals(null, akm.chooseServerAlias("RSA", null, null));
+ assertNull(akm.chooseServerAlias("RSA", null, null));
}
public void testServerAliasWithAliasRSAKey() throws Exception {
ExtendedAliasKeyManager akm = new ExtendedAliasKeyManager(km,
"rsakey");
- assertEquals(null, akm.chooseServerAlias("DSA", null, null));
+ assertNull(akm.chooseServerAlias("DSA", null, null));
assertEquals("rsakey", akm.chooseServerAlias("RSA", null, null));
}
@@ -75,21 +75,21 @@ public class ExtendedAliasKeymanagerTest extends TestCase {
ExtendedAliasKeyManager akm = new ExtendedAliasKeyManager(km,
"nonexisting");
- assertEquals(null, akm.chooseServerAlias("DSA", null, null));
- assertEquals(null, akm.chooseServerAlias("RSA", null, null));
+ assertNull(akm.chooseServerAlias("DSA", null, null));
+ assertNull(akm.chooseServerAlias("RSA", null, null));
}
public void testEngineServerAliasWithAliasDSAKey() throws Exception {
ExtendedAliasKeyManager akm = new ExtendedAliasKeyManager(km,
"dsakey");
assertEquals("dsakey", akm.chooseEngineServerAlias("DSA", null, null));
- assertEquals(null, akm.chooseEngineServerAlias("RSA", null, null));
+ assertNull(akm.chooseEngineServerAlias("RSA", null, null));
}
public void testEngineServerAliasWithAliasRSAKey() throws Exception {
ExtendedAliasKeyManager akm = new ExtendedAliasKeyManager(km,
"rsakey");
- assertEquals(null, akm.chooseEngineServerAlias("DSA", null, null));
+ assertNull(akm.chooseEngineServerAlias("DSA", null, null));
assertEquals("rsakey", akm.chooseEngineServerAlias("RSA", null, null));
}
@@ -104,7 +104,7 @@ public class ExtendedAliasKeymanagerTest extends TestCase {
ExtendedAliasKeyManager akm = new ExtendedAliasKeyManager(km,
"nonexisting");
- assertEquals(null, akm.chooseEngineServerAlias("DSA", null, null));
- assertEquals(null, akm.chooseEngineServerAlias("RSA", null, null));
+ assertNull(akm.chooseEngineServerAlias("DSA", null, null));
+ assertNull(akm.chooseEngineServerAlias("RSA", null, null));
}
}
\ No newline at end of file
diff --git
a/core/src/test/java/org/apache/ftpserver/usermanager/impl/UserManagerTestTemplate.java
b/core/src/test/java/org/apache/ftpserver/usermanager/impl/UserManagerTestTemplate.java
index e029740d..7a27d6a4 100644
---
a/core/src/test/java/org/apache/ftpserver/usermanager/impl/UserManagerTestTemplate.java
+++
b/core/src/test/java/org/apache/ftpserver/usermanager/impl/UserManagerTestTemplate.java
@@ -22,8 +22,6 @@ package org.apache.ftpserver.usermanager.impl;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.ftpserver.ftplet.Authentication;
import org.apache.ftpserver.ftplet.AuthenticationFailedException;
import org.apache.ftpserver.ftplet.Authority;
@@ -32,6 +30,8 @@ import org.apache.ftpserver.ftplet.UserManager;
import org.apache.ftpserver.usermanager.UserManagerFactory;
import org.apache.ftpserver.usermanager.UsernamePasswordAuthentication;
+import junit.framework.TestCase;
+
/**
*
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
@@ -394,7 +394,7 @@ public abstract class UserManagerTestTemplate extends
TestCase {
assertEquals(user.getName(), actualUser.getName());
assertNull(actualUser.getPassword());
assertEquals("/", actualUser.getHomeDirectory());
- assertEquals(true, actualUser.getEnabled());
+ assertTrue(actualUser.getEnabled());
assertNull(user.authorize(new WriteRequest()));
assertEquals(0, getMaxDownloadRate(actualUser));
assertEquals(0, actualUser.getMaxIdleTime());
diff --git
a/core/src/test/java/org/apache/ftpserver/util/BasePropertiesTest.java
b/core/src/test/java/org/apache/ftpserver/util/BasePropertiesTest.java
index 6ca2f822..1870e622 100644
--- a/core/src/test/java/org/apache/ftpserver/util/BasePropertiesTest.java
+++ b/core/src/test/java/org/apache/ftpserver/util/BasePropertiesTest.java
@@ -27,10 +27,10 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimeZone;
-import junit.framework.TestCase;
-
import org.apache.ftpserver.ftplet.FtpException;
+import junit.framework.TestCase;
+
/**
*
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
@@ -49,14 +49,14 @@ public class BasePropertiesTest extends TestCase {
props.setProperty("bool7", "foo");
props.setProperty("bool8", "");
- assertEquals(true, props.getBoolean("bool1"));
- assertEquals(true, props.getBoolean("bool2"));
- assertEquals(true, props.getBoolean("bool3"));
- assertEquals(false, props.getBoolean("bool4"));
- assertEquals(false, props.getBoolean("bool5"));
- assertEquals(false, props.getBoolean("bool6"));
- assertEquals(false, props.getBoolean("bool7"));
- assertEquals(false, props.getBoolean("bool8"));
+ assertTrue(props.getBoolean("bool1"));
+ assertTrue(props.getBoolean("bool2"));
+ assertTrue(props.getBoolean("bool3"));
+ assertFalse(props.getBoolean("bool4"));
+ assertFalse(props.getBoolean("bool5"));
+ assertFalse(props.getBoolean("bool6"));
+ assertFalse(props.getBoolean("bool7"));
+ assertFalse(props.getBoolean("bool8"));
// Unknown key
try {
@@ -67,17 +67,17 @@ public class BasePropertiesTest extends TestCase {
}
// default values
- assertEquals(true, props.getBoolean("foo", true));
- assertEquals(false, props.getBoolean("foo", false));
- assertEquals(true, props.getBoolean("bool1", false));
- assertEquals(false, props.getBoolean("bool4", true));
+ assertTrue(props.getBoolean("foo", true));
+ assertFalse(props.getBoolean("foo", false));
+ assertTrue(props.getBoolean("bool1", false));
+ assertFalse(props.getBoolean("bool4", true));
}
public void testSetBoolean() throws FtpException {
BaseProperties props = new BaseProperties();
props.setProperty("b1", true);
- assertEquals(true, props.getBoolean("b1"));
+ assertTrue(props.getBoolean("b1"));
assertEquals("true", props.getProperty("b1"));
assertEquals("true", props.getString("b1"));
}
