svn commit: r1609145 - /tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapper.java

[kkolinko]

Author: kkolinko
Date: Wed Jul  9 13:22:49 2014
New Revision: 1609145

URL: http://svn.apache.org/r1609145
Log:
Aligned Tomcat 7 Mapper tests with trunk ones.

Modified:
    tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapper.java

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapper.java?rev=1609145&r1=1609144&r2=1609145&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapper.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapper.java 
Wed Jul  9 13:22:49 2014
@@ -20,6 +20,7 @@ import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
@@ -122,6 +123,9 @@ public class TestMapper extends LoggingB
         final int iowPos = 3;
         assertEquals("blah7", mapper.hosts[iowPos].object);
 
+        final int qwigPos = 8;
+        assertEquals("blah14", mapper.hosts[qwigPos].object);
+
         // Check for alphabetical order of host names
         String previous;
         String current = mapper.hosts[0].name;
@@ -131,15 +135,13 @@ public class TestMapper extends LoggingB
             assertTrue(previous.compareTo(current) < 0);
         }
 
-        final int qwigPos = 8;
-        assertEquals("blah14", mapper.hosts[qwigPos].object);
-
         // Check that host alias has the same data
         Mapper.Host host = mapper.hosts[iowPos];
         Mapper.Host alias = mapper.hosts[iowPos + 1];
         assertEquals("iowejoiejfoiew", host.name);
         assertEquals("iowejoiejfoiew_alias", alias.name);
-        assertEquals(host.contextList, alias.contextList);
+        assertFalse(host.isAlias());
+        assertTrue(alias.isAlias());
         assertEquals(host.object, alias.object);
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org