Author: kkolinko
Date: Fri Jun 20 17:10:43 2014
New Revision: 1604217
URL: http://svn.apache.org/r1604217
Log:
Mode test for adding duplicates from setUp() into a test method.
Add two additional tests.
Modified:
tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java
Modified: tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java?rev=1604217&r1=1604216&r2=1604217&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java (original)
+++ tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java Fri Jun 20
17:10:43 2014
@@ -75,7 +75,6 @@ public class TestMapper extends LoggingB
mapper.addHost("fwehoihoihwfeo", new String[0], createHost("blah5"));
mapper.addHost("owefojiwefoi", new String[0], createHost("blah6"));
mapper.addHost("iowejoiejfoiew", new String[0], createHost("blah7"));
- mapper.addHost("iowejoiejfoiew", new String[0], createHost("blah17"));
mapper.addHost("ohewoihfewoih", new String[0], createHost("blah8"));
mapper.addHost("fewohfoweoih", new String[0], createHost("blah9"));
mapper.addHost("ttthtiuhwoih", new String[0], createHost("blah10"));
@@ -121,14 +120,25 @@ public class TestMapper extends LoggingB
@Test
public void testAddHost() throws Exception {
+ // Try to add duplicates
+ // Duplicate Host name
+ mapper.addHost("iowejoiejfoiew", new String[0], createHost("blah17"));
+ // Alias conflicting with existing Host
+ mapper.addHostAlias("iowejoiejfoiew", "qwigqwiwoih");
+ // Redundancy. Alias name = Host name. No error here.
+ mapper.addHostAlias("qwigqwiwoih", "qwigqwiwoih");
+
// Check we have the right number
- // (added 17 including one host alias but one is a duplicate)
+ // (added 16 including one host alias. Three duplicates do not
increase the count.)
assertEquals(16, mapper.hosts.length);
// Make sure adding a duplicate *does not* overwrite
final int iowPos = 3;
assertEquals("blah7", mapper.hosts[iowPos].object.getName());
+ final int qwigPos = 8;
+ assertEquals("blah14", mapper.hosts[qwigPos].object.getName());
+
// Check for alphabetical order of host names
String previous;
String current = mapper.hosts[0].name;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
