svn commit: r1621929 - in /tomcat/trunk: res/checkstyle/checkstyle.xml test/org/apache/catalina/core/TestStandardContext.java

[markt]

Author: markt
Date: Tue Sep  2 06:26:38 2014
New Revision: 1621929

URL: http://svn.apache.org/r1621929
Log:
Fix unit test for BZ 56903

Modified:
    tomcat/trunk/res/checkstyle/checkstyle.xml
    tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java

Modified: tomcat/trunk/res/checkstyle/checkstyle.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/checkstyle.xml?rev=1621929&r1=1621928&r2=1621929&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/checkstyle.xml (original)
+++ tomcat/trunk/res/checkstyle/checkstyle.xml Tue Sep  2 06:26:38 2014
@@ -61,7 +61,7 @@
         <property name="illegalPkgs" value="sun,junit.framework"/>
     </module>
     <module name="ImportOrder">
-        <property name="groups" 
value="java,javax,async,jsp2,junit,org.junit,org,util"/>
+        <property name="groups" 
value="java,javax,org.hamcrest,org.junit,org,async,jsp2,util"/>
         <property name="ordered" value="true"/>
         <property name="separated" value="true"/>
         <property name="option" value="above"/>

Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java?rev=1621929&r1=1621928&r2=1621929&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java Tue Sep 
 2 06:26:38 2014
@@ -19,6 +19,7 @@ package org.apache.catalina.core;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -42,6 +43,8 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.hamcrest.CoreMatchers;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotSame;
@@ -951,8 +954,8 @@ public class TestStandardContext extends
     public void testBug56903() {
         Context context = new StandardContext();
 
-        String list = "a,b,c";
-        context.setResourceOnlyServlets(list);
-        Assert.assertEquals(list, context.getResourceOnlyServlets());
+        context.setResourceOnlyServlets("a,b,c");
+        
Assert.assertThat(Arrays.asList(context.getResourceOnlyServlets().split(",")),
+                CoreMatchers.hasItems("a", "b", "c"));
     }
 }



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